diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:34:58 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:04:04 +0200 |
commit | 1088aabe6ad770041f038d9eee9da11b9227d36e (patch) | |
tree | 693bf3350f113419564aed75e482741eb7e7336a /tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | |
parent | 99eac6e3fb53dc1ca6f8136a02f93c33be3ef52f (diff) | |
parent | 2223f1ae293c2aedf4759564185f74b782395459 (diff) |
Merge branch 'release' into old/5.0old/5.0
Change-Id: I6e6f2ed367f89bab2114025478c873cfb132fe02
Diffstat (limited to 'tests/auto/quick/qquickpathview/tst_qquickpathview.cpp')
-rw-r--r-- | tests/auto/quick/qquickpathview/tst_qquickpathview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp index 8821203902..77c4f806ae 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -1860,7 +1860,7 @@ void tst_QQuickPathView::snapToItem() flick(window, QPoint(200,10), QPoint(10,10), 180); QVERIFY(pathview->isMoving()); - QTRY_VERIFY(!pathview->isMoving()); + QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000); QVERIFY(pathview->offset() == qFloor(pathview->offset())); |