diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 00:39:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-17 00:39:13 (GMT) |
| commit | 53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9 (patch) | |
| tree | 246c5d0e80a1bf9187e462c767e36fd8d152bb78 /src/gui/dialogs | |
| parent | b83172f8cfb4439f17c96886f0c6046a885370f6 (diff) | |
| parent | 111708e655d66fb0dcbc4f2cbdc2abf14c700cf4 (diff) | |
| download | Qt-53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9.zip Qt-53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9.tar.gz Qt-53fd1e2fd9c75d7d55606d4ac5df75eda96b9cc9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix the QPrintDialog showing a popup with nothing.
Fix OpenGL2 paint engine compilation issue
Speed up various QFontMetrics functions
Avoid using uncompatible vertex shader for non-solid brushes
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qprintdialog_unix.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp index 17283f5..9b4d6e8 100644 --- a/src/gui/dialogs/qprintdialog_unix.cpp +++ b/src/gui/dialogs/qprintdialog_unix.cpp @@ -706,9 +706,7 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p) #ifndef QT_NO_FILESYSTEMMODEL QFileSystemModel *fsm = new QFileSystemModel(widget.filename); fsm->setRootPath(QDir::homePath()); -#if !defined(QT_NO_FSCOMPLETER) && !defined(QT_NO_FILEDIALOG) - widget.filename->setCompleter(new QFSCompleter(fsm, widget.filename)); -#endif + widget.filename->setCompleter(new QCompleter(fsm, widget.filename)); #endif _q_printerChanged(currentPrinterIndex); |