From c7723cba1fb833924c5ae63dae549d8d60c14299 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 5 Jan 2012 09:36:31 +1000
Subject: Make tst_QQuickListView::margins() more reliable

Change-Id: Ib66f5717316b4c8d71dbef408afbbb9b0698ad7a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
---
 tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests')

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.);
-- 
cgit v1.2.3