diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-05 16:01:51 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 17:21:40 +0200 |
| commit | eb6ff7becd41b145932a0fe9961a33f7d71445f1 (patch) | |
| tree | 969137d980309b2a518f4ed27603e443dfd37752 /tests | |
| parent | 57855fd6a2d3d0d3a1abbafa1000d6a1a7ce3d40 (diff) | |
| parent | acc94a42cd9c31ac68e063edc1caada4251d12b0 (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'tests')
| -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 e805a6b074..274b93e81a 100644 --- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp @@ -1833,7 +1833,7 @@ void tst_QQuickPathView::snapToItem() flick(window.data(), 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())); |