From 118c82b0988c671045de448ffabc7ba95f015a69 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Wed, 5 Aug 2009 10:42:46 +0200
Subject: Fixes  hangup when pressing key in QListWidget

If there is severals matching items but all of them are disabled, it
would have produced an infinite loop.
Block the loop once we reach an already matched item.

Task-number: 258949
Reviewed-by: Thierry
---
 src/gui/itemviews/qabstractitemview.cpp    |  7 +++++++
 tests/auto/qlistwidget/tst_qlistwidget.cpp | 23 ++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 8594968..f7d5f1b 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -2666,6 +2666,7 @@ void QAbstractItemView::keyboardSearch(const QString &search)
     QModelIndex current = start;
     QModelIndexList match;
     QModelIndex firstMatch;
+    QModelIndex startMatch;
     QModelIndexList previous;
     do {
         match = d->model->match(current, Qt::DisplayRole, searchString);
@@ -2682,6 +2683,12 @@ void QAbstractItemView::keyboardSearch(const QString &search)
 	    if (row >= d->model->rowCount(firstMatch.parent()))
 	        row = 0;
             current = firstMatch.sibling(row, firstMatch.column());
+
+            //avoid infinite loop if all the matching items are disabled.
+            if (!startMatch.isValid())
+                startMatch = firstMatch;
+            else if (startMatch == firstMatch)
+                break;
         }
     } while (current != start && firstMatch.isValid());
 }
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index a56a470..e38ef20 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -128,6 +128,8 @@ private slots:
     void setSortingEnabled();
     void task199503_crashWhenCleared();
     void task217070_scrollbarsAdjusted();
+    void task258949_keypressHangup();
+
 
 protected slots:
     void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last)
@@ -994,7 +996,7 @@ void tst_QListWidget::sortHiddenItems()
 
     for (int k = 0; k < tw->count(); ++k)
         QCOMPARE(persistent.at(k).row(), expectedRows.at(k));
-        
+
     delete tw;
 }
 
@@ -1498,5 +1500,24 @@ void tst_QListWidget::task217070_scrollbarsAdjusted()
     }
 }
 
+void tst_QListWidget::task258949_keypressHangup()
+{
+    QListWidget lw;
+    for (int y = 0; y < 5; y++) {
+        QListWidgetItem *lwi = new QListWidgetItem(&lw);
+        lwi->setText(y ? "1" : "0");
+        if (y)
+            lwi->setFlags(Qt::ItemIsSelectable);
+    }
+
+    lw.show();
+    lw.setCurrentIndex(lw.model()->index(0,0));
+    QCOMPARE(lw.currentIndex(), lw.model()->index(0,0));
+    QTest::qWait(30);
+    QTest::keyPress(&lw, '1'); //this used to freeze
+    QTest::qWait(30);
+    QCOMPARE(lw.currentIndex(), lw.model()->index(0,0));
+}
+
 QTEST_MAIN(tst_QListWidget)
 #include "tst_qlistwidget.moc"
-- 
cgit v0.12