summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-06-17 00:07:55 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-06-17 00:07:55 (GMT)
commit8e68084e44b54dc73f41c5d379f0b614248978d7 (patch)
tree63d65b6fcbe03cb66aab63cae133a9e6ffcd2000
parente3ed9652e7dc492d89b30fbaef6b2f175cb9ff4b (diff)
downloadQt-8e68084e44b54dc73f41c5d379f0b614248978d7.zip
Qt-8e68084e44b54dc73f41c5d379f0b614248978d7.tar.gz
Qt-8e68084e44b54dc73f41c5d379f0b614248978d7.tar.bz2
Attempt to stabilize tst_qtimeline::value
Use the "slow" delays in all cases, not just on WinCE.
-rw-r--r--tests/auto/qtimeline/tst_qtimeline.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/qtimeline/tst_qtimeline.cpp b/tests/auto/qtimeline/tst_qtimeline.cpp
index b15d2a4..47d0550 100644
--- a/tests/auto/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/qtimeline/tst_qtimeline.cpp
@@ -247,11 +247,7 @@ void tst_QTimeLine::frameRate()
void tst_QTimeLine::value()
{
-#ifdef Q_OS_WINCE //On WinCE timer resolution is bad - use longer times
QTimeLine timeLine(2000);
-#else
- QTimeLine timeLine(200);
-#endif
QVERIFY(timeLine.currentValue() == 0.0);
// Default speed
@@ -270,19 +266,11 @@ void tst_QTimeLine::value()
timeLine.setCurrentTime(100);
timeLine.start();
// Let it update on its own
-#ifdef Q_OS_WINCE
QTest::qWait(500);
-#else
- QTest::qWait(50);
-#endif
QCOMPARE(timeLine.state(), QTimeLine::Running);
qreal value = timeLine.currentValue();
timeLine.setDirection(QTimeLine::Backward);
-#ifdef Q_OS_WINCE
QTest::qWait(1000);
-#else
- QTest::qWait(100);
-#endif
QVERIFY(timeLine.currentValue() < value);
timeLine.stop();
}