diff options
| author | Bea Lam <bea.lam@nokia.com> | 2012-01-05 09:36:31 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 02:42:34 +0100 |
| commit | c7723cba1fb833924c5ae63dae549d8d60c14299 (patch) | |
| tree | 9307df3617822c4baef4823e22a28d741a87b725 /tests/auto/qtquick2/qquicklistview | |
| parent | 128fafdf324a02064715e89d1f9450f1bf22bbc0 (diff) | |
Make tst_QQuickListView::margins() more reliable
Change-Id: Ib66f5717316b4c8d71dbef408afbbb9b0698ad7a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qquicklistview')
| -rw-r--r-- | tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp index 73b4d0319d..075c0c4b6c 100644 --- a/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp @@ -3994,8 +3994,9 @@ void tst_QQuickListView::margins() // and yOrigin is updated listview->setContentY(100); model.removeItem(1); - QTest::qWait(100); + QTRY_COMPARE(listview->count(), model.count()); listview->setContentY(-50); + QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false); listview->returnToBounds(); QCOMPARE(listview->yOrigin(), 20.); QTRY_COMPARE(listview->contentY(), -10.); |