diff options
Diffstat (limited to 'tests/auto/quick/qquickgridview')
| -rw-r--r-- | tests/auto/quick/qquickgridview/tst_qquickgridview.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp index 9876a36ec3..472b9a0fe1 100644 --- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp @@ -1313,8 +1313,8 @@ void tst_QQuickGridView::moved_defaultLayout(QQuickGridView::Flow flow, for (int i = firstVisibleIndex; i < model.count() && i < items.count(); ++i) { QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i); if (!item && - ( (flow == QQuickGridView::FlowLeftToRight && i >= firstVisibleIndex + (3*6)) - || flow == QQuickGridView::FlowTopToBottom && i >= firstVisibleIndex + (5*3) ) ) { + ( (flow == QQuickGridView::FlowLeftToRight && i >= firstVisibleIndex + (3*6)) + || (flow == QQuickGridView::FlowTopToBottom && i >= firstVisibleIndex + (5*3)) ) ) { continue; // index has moved out of view } QVERIFY2(item, QTest::toString(QString("Item %1 not found").arg(i))); @@ -1559,6 +1559,8 @@ void tst_QQuickGridView::multipleChanges(bool condensed) case ListChange::SetContentY: gridview->setContentY(changes[i].pos); break; + case ListChange::Polish: + break; } if (condensed) { QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false); @@ -5428,6 +5430,7 @@ void tst_QQuickGridView::displacedTransitions() break; case ListChange::SetCurrent: case ListChange::SetContentY: + case ListChange::Polish: break; } @@ -5674,6 +5677,8 @@ void tst_QQuickGridView::multipleTransitions() gridview->setContentY(changes[i].pos); QTRY_COMPARE(QQuickItemPrivate::get(gridview)->polishScheduled, false); break; + case ListChange::Polish: + break; } } QCOMPARE(gridview->count(), model.count()); |