2 files changed, 20 insertions, 9 deletions
diff --git a/tests/auto/corelib/tools/qtimeline/qtimeline.pro b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
index cac8074038..3a6c120b5a 100644
--- a/tests/auto/corelib/tools/qtimeline/qtimeline.pro
+++ b/tests/auto/corelib/tools/qtimeline/qtimeline.pro
@@ -2,4 +2,3 @@ CONFIG += testcase parallel_test
 TARGET = tst_qtimeline
 QT = core testlib
 SOURCES = tst_qtimeline.cpp
-win32:CONFIG+=insignificant_test    # unstable, QTBUG-24796
diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
index f05497d7a2..b15de5c1df 100644
--- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
@@ -184,9 +184,10 @@ void tst_QTimeLine::duration()
     timeLine.start();
     QTest::qWait(999);
     QCOMPARE(timeLine.state(), QTimeLine::Running);
-    QVERIFY(timeLine.currentTime() > 0.9);
-    QTest::qWait(50);
+    QVERIFY(timeLine.currentTime() > 900);
+    QTest::qWait(100);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
+    QCOMPARE(timeLine.currentTime(), 1000);
     // The duration shouldn't change
     QCOMPARE(timeLine.duration(), 1000);
 }
@@ -368,6 +369,8 @@ void tst_QTimeLine::interpolation()
     QCOMPARE(timeLine.state(), QTimeLine::Running);
 
     // Smooth accellerates slowly so in the beginning so it is farther behind
+    if (firstValue >= timeLine.currentFrame())
+        QEXPECT_FAIL("", "QTBUG-24796: QTimeLine exhibits inconsistent timing behaviour", Abort);
     QVERIFY(firstValue < timeLine.currentFrame());
     QTest::qWait(200);
     QVERIFY(endValue > timeLine.currentFrame());
@@ -456,24 +459,33 @@ void tst_QTimeLine::toggleDirection()
 void tst_QTimeLine::frameChanged()
 {
     QTimeLine timeLine;
+    timeLine.setCurveShape(QTimeLine::LinearCurve);
     timeLine.setFrameRange(0,9);
-    timeLine.setUpdateInterval(1000);
+    timeLine.setUpdateInterval(800);
     QSignalSpy spy(&timeLine, SIGNAL(frameChanged(int)));
     QVERIFY(spy.isValid());
+
+    // Test what happens when duration expires before all frames are emitted.
     timeLine.start();
-    QTest::qWait(timeLine.duration()*2);
+    QTest::qWait(timeLine.duration()/2);
+    QCOMPARE(timeLine.state(), QTimeLine::Running);
+    QCOMPARE(spy.count(), 0);
+    QTest::qWait(timeLine.duration());
+    if (timeLine.state() != QTimeLine::NotRunning)
+        QEXPECT_FAIL("", "QTBUG-24796: QTimeLine runs slower than it should", Abort);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
-    // Probably 10
-    QVERIFY(spy.count() <= 10 && spy.count() > 0);
+    if (spy.count() != 1)
+        QEXPECT_FAIL("", "QTBUG-24796: QTimeLine runs slower than it should", Abort);
+    QCOMPARE(spy.count(), 1);
 
+    // Test what happens when the frames are all emitted well before duration expires.
     timeLine.setUpdateInterval(5);
     spy.clear();
     timeLine.setCurrentTime(0);
     timeLine.start();
     QTest::qWait(timeLine.duration()*2);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
-    // Probably 1
-    QVERIFY(spy.count() <= 10 && spy.count() > 0);
+    QCOMPARE(spy.count(), 10);
 }
 
 void tst_QTimeLine::stopped()