diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-09 16:04:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-09 16:04:21 (GMT) |
| commit | bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c (patch) | |
| tree | 063b724a9b17c814c49b2ead876d795e0f559db7 /tests/auto/declarative/qdeclarativeflickable | |
| parent | 1e9b107b082282d4aadcffedcd67cb7e5e56aef8 (diff) | |
| parent | dc6b5702e0c488bf51ca029290eb65604bfb1dd5 (diff) | |
| download | Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.zip Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.gz Qt-bb7b62f3cb7aca178a9e5e65263d0a4a8d40829c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeflickable')
| -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))); |