diff options
author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-11 15:03:50 (GMT) |
---|---|---|
committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-05-11 15:03:50 (GMT) |
commit | 13f8c2f8772a3fda37f6608e7400398ed88ee1d5 (patch) | |
tree | 512cdcbb78e8832cfab05b22b796769c31ca1c5f /src/gui/util/qcompleter.cpp | |
parent | 54906e67f05e733f363a30dc35ec3a2624cc743d (diff) | |
parent | 8e95dc0968c7660410db954c13545667dbea8ad7 (diff) | |
download | Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.zip Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.tar.gz Qt-13f8c2f8772a3fda37f6608e7400398ed88ee1d5.tar.bz2 |
Merge branches 'master' and '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); |