diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-25 16:08:30 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-03-25 16:08:30 (GMT) |
| commit | 5dcf29ec09bd9741bb48449a07831987a75bf42a (patch) | |
| tree | cd0c3ecdc33bb93075e3a7d9b2593382e2768948 /src/gui/util | |
| parent | 9b40f0275043566a6e1f1471e1f608dd66929b81 (diff) | |
| parent | 2ab5d8db650118312bfe9b1e60c4ac60229b229f (diff) | |
| download | Qt-5dcf29ec09bd9741bb48449a07831987a75bf42a.zip Qt-5dcf29ec09bd9741bb48449a07831987a75bf42a.tar.gz Qt-5dcf29ec09bd9741bb48449a07831987a75bf42a.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qcompleter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index 8b07163..aeb7e91 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -824,9 +824,9 @@ void QCompleterPrivate::_q_complete(QModelIndex index, bool highlighted) Q_Q(QCompleter); QString completion; - if (!index.isValid()) + if (!index.isValid() || (index.row() >= proxy->engine->matchCount())) { completion = prefix; - else { + } else { QModelIndex si = proxy->mapToSource(index); si = si.sibling(si.row(), column); // for clicked() completion = q->pathFromIndex(si); |