diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-03 00:09:37 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-03 00:09:37 (GMT) |
| commit | c9e07d69ec084a75fc083baecd46d0b8b422d1c4 (patch) | |
| tree | 408a2dbfb5d29b3882022f45ad099d422b62578c /tests/auto | |
| parent | 398f97c90f52a8927ac1efe3d7e272da900d6be3 (diff) | |
| parent | eaf436568b2e6870a72e97baf2837d320f5d8ec8 (diff) | |
| download | Qt-c9e07d69ec084a75fc083baecd46d0b8b422d1c4.zip Qt-c9e07d69ec084a75fc083baecd46d0b8b422d1c4.tar.gz Qt-c9e07d69ec084a75fc083baecd46d0b8b422d1c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 0c166df..f5e15fb 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -217,11 +217,11 @@ void tst_qdeclarativeanimations::resume() animation.setProperty("x"); animation.setFrom(10); animation.setTo(200); - animation.setDuration(500); + animation.setDuration(1000); QVERIFY(animation.from() == 10); animation.start(); - QTest::qWait(200); + QTest::qWait(400); animation.pause(); qreal x = rect.x(); QVERIFY(x != qreal(200) && x != qreal(10)); @@ -231,7 +231,7 @@ void tst_qdeclarativeanimations::resume() animation.resume(); QVERIFY(animation.isRunning()); QVERIFY(!animation.isPaused()); - QTest::qWait(200); + QTest::qWait(400); animation.stop(); QVERIFY(rect.x() > x); } |