diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 04:44:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 04:44:41 (GMT) |
| commit | 9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2 (patch) | |
| tree | c4f103b6c83d1008b00e21e330df2c6b780a8c33 /tests | |
| parent | b36e357b982ba01cbf905fb1d0340e87030b0a95 (diff) | |
| parent | 0d6451ec1f1042dbf8c8cd7f2759e2a385d29696 (diff) | |
| download | Qt-9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2.zip Qt-9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2.tar.gz Qt-9b3bda409d152b14e99cd3f83ca0bfc9b837ccf2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Introduced new class QAnimationDriver for plugging in what drives animations
Use correct font for menu item shortcuts
Fix text rendering offset for raster engine on Mac
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpauseanimation/tst_qpauseanimation.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp index 605cee6..378eb1c 100644 --- a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp @@ -394,7 +394,10 @@ void tst_QPauseAnimation::multipleSequentialGroups() QVERIFY(subgroup3.state() == QAbstractAnimation::Running); QVERIFY(subgroup4.state() == QAbstractAnimation::Running); - QTest::qWait(group.totalDuration() + 100); + // This is a pretty long animation so it tends to get rather out of sync + // when using the consistent timer, so run for an extra half second for good + // measure... + QTest::qWait(group.totalDuration() + 500); #ifdef Q_OS_WIN if (group.state() != QAbstractAnimation::Stopped) |