diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-19 00:29:51 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-19 00:29:51 (GMT) |
| commit | e5893ababec6c58207c8066908e21bff3d746356 (patch) | |
| tree | b4800e3a1fd5fa209b39e2f2d627081ed72bed38 /src/gui/util/qcompleter.cpp | |
| parent | 2abbc5fc400dfa8ad26397cc39f49f9b3a4304c9 (diff) | |
| parent | ceb068261e326f38b4049becd75c7160a6b84f87 (diff) | |
| download | Qt-e5893ababec6c58207c8066908e21bff3d746356.zip Qt-e5893ababec6c58207c8066908e21bff3d746356.tar.gz Qt-e5893ababec6c58207c8066908e21bff3d746356.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/util/qcompleter.cpp')
| -rw-r--r-- | src/gui/util/qcompleter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index 04d6de9..e718212 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -921,10 +921,12 @@ void QCompleterPrivate::showPopup(const QRect& rect) void QCompleterPrivate::_q_fileSystemModelDirectoryLoaded(const QString &path) { Q_Q(QCompleter); +#ifndef QT_NO_LINEEDIT QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget); //the path given by QFileSystemModel does not end with / if (lineEdit && !lineEdit->text().isEmpty() && !q->completionPrefix().isEmpty() && q->completionPrefix() != path + QLatin1Char('/')) q->complete(); +#endif } /*! |