diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 11:27:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 11:27:37 (GMT) |
| commit | a98bda4b42b068c9c3220ae2aded41a263387ac2 (patch) | |
| tree | bc52cc0ffc0e6277c390c2af8e4a7ec6e1e17291 | |
| parent | f49e7fd8e13b6eb1844994a5368d0b1aa2ea6b22 (diff) | |
| parent | 943bd1af642651b5f600cacf237627058d38bccf (diff) | |
| download | Qt-a98bda4b42b068c9c3220ae2aded41a263387ac2.zip Qt-a98bda4b42b068c9c3220ae2aded41a263387ac2.tar.gz Qt-a98bda4b42b068c9c3220ae2aded41a263387ac2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Ensure that the view loses its selection when typing in the lineedit
| -rw-r--r-- | src/gui/dialogs/qfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index cb74a3c..a0dca5d 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -2209,9 +2209,9 @@ void QFileDialogPrivate::createWidgets() #ifndef QT_NO_FSCOMPLETER completer = new QFSCompleter(model, q); qFileDialogUi->fileNameEdit->setCompleter(completer); +#endif // QT_NO_FSCOMPLETER QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)), q, SLOT(_q_autoCompleteFileName(QString))); -#endif // QT_NO_FSCOMPLETER QObject::connect(qFileDialogUi->fileNameEdit, SIGNAL(textChanged(QString)), q, SLOT(_q_updateOkButton())); |