diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-12 10:38:22 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-12 10:38:22 (GMT) |
commit | cc957f4cb1a8dce2fb1eb406f54ccecb4092d238 (patch) | |
tree | 5463704092728f10a58931fba7a2a74fa71f73d0 /src/gui/util/qcompleter.cpp | |
parent | f14620878beed97c85c4b6a03a38f485800328d1 (diff) | |
parent | 8c0cdfdd4772e81164d838b9549e8c554ecf5966 (diff) | |
download | Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.zip Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.gz Qt-cc957f4cb1a8dce2fb1eb406f54ccecb4092d238.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/util/qcompleter.cpp')
-rw-r--r-- | src/gui/util/qcompleter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index a622385..faa4e7b 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -824,7 +824,7 @@ void QCompleterPrivate::_q_complete(QModelIndex index, bool highlighted) Q_Q(QCompleter); QString completion; - if (!index.isValid() || (index.row() >= proxy->engine->matchCount())) { + if (!index.isValid() || (!proxy->showAll && (index.row() >= proxy->engine->matchCount()))) { completion = prefix; } else { QModelIndex si = proxy->mapToSource(index); |