summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorNoah White-Hamerslough <noah@pcc.com>2009-07-13 16:58:48 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-07-13 17:02:54 (GMT)
commitc549bda8cd38a099118f3cf4c7e5462010cb7259 (patch)
tree9367d950e5f05109de759bff1cc08751cfdc35b5 /src/gui/util
parent1cea2ed930377b1bb0d1ce583eacae87d999fc16 (diff)
downloadQt-c549bda8cd38a099118f3cf4c7e5462010cb7259.zip
Qt-c549bda8cd38a099118f3cf4c7e5462010cb7259.tar.gz
Qt-c549bda8cd38a099118f3cf4c7e5462010cb7259.tar.bz2
Fixes: The keyboard navigation of QComboBox don't work with the completion
Merge-request: 653 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Task-number: 247560
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qcompleter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index f4adcea..d68e309 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -1182,7 +1182,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
case Qt::Key_Up:
if (!curIndex.isValid()) {
int rowCount = d->proxy->rowCount();
- QModelIndex lastIndex = d->proxy->index(rowCount - 1, 0);
+ QModelIndex lastIndex = d->proxy->index(rowCount - 1, d->column);
d->setCurrentIndex(lastIndex);
return true;
} else if (curIndex.row() == 0) {
@@ -1194,7 +1194,7 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e)
case Qt::Key_Down:
if (!curIndex.isValid()) {
- QModelIndex firstIndex = d->proxy->index(0, 0);
+ QModelIndex firstIndex = d->proxy->index(0, d->column);
d->setCurrentIndex(firstIndex);
return true;
} else if (curIndex.row() == d->proxy->rowCount() - 1) {