diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-08 23:48:47 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-08 23:48:47 (GMT) |
| commit | bd24b4363239e23979695cb765918bdb1c865868 (patch) | |
| tree | ba8b0bb3fa0168fa3c73292e7acb1f37dcdf335b /tests | |
| parent | 6a0221d77ec768273a093268a86e30e82fcab934 (diff) | |
| download | Qt-bd24b4363239e23979695cb765918bdb1c865868.zip Qt-bd24b4363239e23979695cb765918bdb1c865868.tar.gz Qt-bd24b4363239e23979695cb765918bdb1c865868.tar.bz2 | |
Fix unstable qdeclarativeflickable test.
Change-Id: I81b02147f88e948e3f3a663de0390893f8349fd9
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp index 736f8f4..65ba316 100644 --- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp +++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp @@ -267,8 +267,8 @@ void tst_qdeclarativeflickable::nestedPressDelay() QVERIFY(outer->property("pressed").toBool() == false); // The outer pressDelay will prevail (50ms, vs. 10sec) - QTest::qWait(300); - QVERIFY(outer->property("pressed").toBool() == true); + // QTRY_VERIFY() has 5sec timeout, so will timeout well within 10sec. + QTRY_VERIFY(outer->property("pressed").toBool() == true); QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(150, 150))); |