summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2010-03-16 23:11:55 (GMT)
committerAlexis Menard <alexis.menard@nokia.com>2010-03-16 23:15:33 (GMT)
commit111708e655d66fb0dcbc4f2cbdc2abf14c700cf4 (patch)
tree246c5d0e80a1bf9187e462c767e36fd8d152bb78 /src/gui/util
parentd99a6792fb4b4ce14f588e7f2c63841dcb28e56f (diff)
downloadQt-111708e655d66fb0dcbc4f2cbdc2abf14c700cf4.zip
Qt-111708e655d66fb0dcbc4f2cbdc2abf14c700cf4.tar.gz
Qt-111708e655d66fb0dcbc4f2cbdc2abf14c700cf4.tar.bz2
Fix the QPrintDialog showing a popup with nothing.
QPrintDialog uses QFileSystemModel with QCompleter. In that case with the 4.7 version of QCompleter it was trying to complete stuff even if the prefix was empty. I also fixed QPrintDialog, it was using QFSCompleter which didn't work in QPrintDialog (QFSCompleter is designed for QFileDialog). Now it uses a regular QCompleter. Task-number:QTBUG-8556 Reviewed-by:trond
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qcompleter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index b7be967..387bf87 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -907,7 +907,7 @@ void QCompleterPrivate::_q_fileSystemModelDirectoryLoaded(const QString &path)
{
Q_Q(QCompleter);
//the path given by QFileSystemModel does not end with /
- if (q->completionPrefix() != path + QLatin1Char('/'))
+ if (!q->completionPrefix().isEmpty() && q->completionPrefix() != path + QLatin1Char('/'))
q->complete();
}