diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-02 17:01:13 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-02 17:01:13 (GMT) |
| commit | 20cfe1e790295254370cf472df39813f864de7ea (patch) | |
| tree | 98ac008f7c468ed37a61c051870810db2bbf2360 /tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp | |
| parent | 83e497fdae56e11c79d913cdc665e78615291e9c (diff) | |
| parent | 2ed925753cb194970712330edca4da8e91fa8f28 (diff) | |
| download | Qt-20cfe1e790295254370cf472df39813f864de7ea.zip Qt-20cfe1e790295254370cf472df39813f864de7ea.tar.gz Qt-20cfe1e790295254370cf472df39813f864de7ea.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp')
| -rw-r--r-- | tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index aa6801a..f6afc5b 100644 --- a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -929,16 +929,13 @@ void tst_QSequentialAnimationGroup::startDelay() group.addPause(125); QCOMPARE(group.totalDuration(), 375); - QEventLoop loop; - QObject::connect(&group, SIGNAL(finished()), &loop, SLOT(quit())); - - QTime time; - time.start(); group.start(); - loop.exec(); + QCOMPARE(group.state(), QAnimationGroup::Running); - QVERIFY(time.elapsed() >= 375); - QVERIFY(time.elapsed() < 1000); + QTest::qWait(500); + + QVERIFY(group.currentTime() == 375); + QCOMPARE(group.state(), QAnimationGroup::Stopped); } void tst_QSequentialAnimationGroup::clearGroup() |