QListview: PageDown/Up infinite loop

When item.height > viewport.height, the next item is not found
correctly, resulting in an infinite loop.

In this case, move directly to the next item.

Pick-to: 6.4 6.3 6.2
Change-Id: I67a40a079ca9dd9189bf84ae550758c685b83d75
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index c2410d684a..ad52e40254 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -88,6 +88,7 @@ private slots:
     void moveCursor2();
     void moveCursor3();
     void moveCursor4();
+    void moveCursor5();
     void indexAt();
     void clicked();
     void singleSelectionRemoveRow();
@@ -608,6 +609,26 @@ void tst_QListView::moveCursor4()
     QTRY_COMPARE(idx, model.index(actualIndex - 2, 0));
 }
 
+void tst_QListView::moveCursor5()
+{
+    PublicListView listView;;
+    QStandardItemModel model;
+    QIcon icon(QPixmap(300,300));
+    model.appendRow(new QStandardItem(icon,"11"));
+    model.appendRow(new QStandardItem(icon,"22"));
+    model.appendRow(new QStandardItem(icon,"33"));
+    listView.setModel(&model);
+    listView.setGeometry(10,10,200,200);
+    listView.setIconSize(QSize(300,300));
+    listView.setViewMode(QListView::IconMode);
+    listView.setCurrentIndex(model.index(0, 0));
+
+    QModelIndex idx = listView.moveCursor(PublicListView::MovePageDown, Qt::NoModifier);
+    QTRY_COMPARE(idx, model.index(1, 0));
+    idx = listView.moveCursor(PublicListView::MovePageUp, Qt::NoModifier);
+    QTRY_COMPARE(idx, model.index(0, 0));
+}
+
 class QListViewShowEventListener : public QListView
 {
     Q_OBJECT