diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 10:35:53 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-11 10:35:53 (GMT) |
commit | a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc (patch) | |
tree | 55a19156916f0668770edcec8a479609963d1779 /src/gui/util | |
parent | 540092f4cc35238c258bb6422912d3eb18b26f33 (diff) | |
parent | 5299240db14579960358edeebfc72fcef905af13 (diff) | |
download | Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.zip Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.gz Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.bz2 |
Merge branch '4.5'
Diffstat (limited to 'src/gui/util')
-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); |