1 files changed, 18 insertions, 27 deletions

diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index c91aba4790..e2bde37a7e 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -84,7 +84,7 @@ void tst_QTimer::zeroTimer()
     // Pass timeout to work round glib issue, see QTBUG-84291.
     QCoreApplication::processEvents(QEventLoop::AllEvents, INT_MAX);
 
-    QCOMPARE(timeoutSpy.count(), 1);
+    QCOMPARE(timeoutSpy.size(), 1);
 }
 
 void tst_QTimer::singleShotTimeout()
@@ -98,9 +98,9 @@ void tst_QTimer::singleShotTimeout()
     timer.start(100);
 
     QVERIFY(timeoutSpy.wait(500));
-    QCOMPARE(timeoutSpy.count(), 1);
+    QCOMPARE(timeoutSpy.size(), 1);
     QTest::qWait(500);
-    QCOMPARE(timeoutSpy.count(), 1);
+    QCOMPARE(timeoutSpy.size(), 1);
 }
 
 #define TIMEOUT_TIMEOUT 200
@@ -111,12 +111,12 @@ void tst_QTimer::timeout()
     QSignalSpy timeoutSpy(&timer, &QTimer::timeout);
     timer.start(100);
 
-    QCOMPARE(timeoutSpy.count(), 0);
+    QCOMPARE(timeoutSpy.size(), 0);
 
-    QTRY_VERIFY_WITH_TIMEOUT(timeoutSpy.count() > 0, TIMEOUT_TIMEOUT);
-    int oldCount = timeoutSpy.count();
+    QTRY_VERIFY_WITH_TIMEOUT(timeoutSpy.size() > 0, TIMEOUT_TIMEOUT);
+    int oldCount = timeoutSpy.size();
 
-    QTRY_VERIFY_WITH_TIMEOUT(timeoutSpy.count() > oldCount, TIMEOUT_TIMEOUT);
+    QTRY_VERIFY_WITH_TIMEOUT(timeoutSpy.size() > oldCount, TIMEOUT_TIMEOUT);
 }
 
 void tst_QTimer::remainingTime()
@@ -240,19 +240,14 @@ void tst_QTimer::remainingTimeDuringActivation()
 
 namespace {
 
-#if __has_include(<chrono>)
     template <typename T>
     std::chrono::milliseconds to_ms(T t)
     { return std::chrono::duration_cast<std::chrono::milliseconds>(t); }
-#endif
 
 } // unnamed namespace
 
 void tst_QTimer::basic_chrono()
 {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires C++11 <chrono> support");
-#else
     // duplicates zeroTimer, singleShotTimeout, interval and remainingTime
     using namespace std::chrono;
     QTimer timer;
@@ -264,24 +259,24 @@ void tst_QTimer::basic_chrono()
 
     QCoreApplication::processEvents();
 
-    QCOMPARE(timeoutSpy.count(), 1);
+    QCOMPARE(timeoutSpy.size(), 1);
 
     timeoutSpy.clear();
     timer.start(milliseconds(100));
-    QCOMPARE(timeoutSpy.count(), 0);
+    QCOMPARE(timeoutSpy.size(), 0);
 
     QVERIFY(timeoutSpy.wait(TIMEOUT_TIMEOUT));
-    QVERIFY(timeoutSpy.count() > 0);
-    int oldCount = timeoutSpy.count();
+    QVERIFY(timeoutSpy.size() > 0);
+    int oldCount = timeoutSpy.size();
 
     QVERIFY(timeoutSpy.wait(TIMEOUT_TIMEOUT));
-    QVERIFY(timeoutSpy.count() > oldCount);
+    QVERIFY(timeoutSpy.size() > oldCount);
 
     timeoutSpy.clear();
     timer.start(to_ms(microseconds(200000)));
     QCOMPARE(timer.intervalAsDuration().count(), milliseconds::rep(200));
     QTest::qWait(50);
-    QCOMPARE(timeoutSpy.count(), 0);
+    QCOMPARE(timeoutSpy.size(), 0);
 
     milliseconds rt = timer.remainingTimeAsDuration();
     QVERIFY2(rt.count() >= 50 && rt.count() <= 200, qPrintable(QString::number(rt.count())));
@@ -290,10 +285,9 @@ void tst_QTimer::basic_chrono()
     timer.setSingleShot(true);
     timer.start(milliseconds(100));
     QVERIFY(timeoutSpy.wait(TIMEOUT_TIMEOUT));
-    QCOMPARE(timeoutSpy.count(), 1);
+    QCOMPARE(timeoutSpy.size(), 1);
     QTest::qWait(500);
-    QCOMPARE(timeoutSpy.count(), 1);
-#endif
+    QCOMPARE(timeoutSpy.size(), 1);
 }
 
 void tst_QTimer::livelock_data()
@@ -518,6 +512,7 @@ void tst_QTimer::moveToThread()
 #endif
     QTimer ti1;
     QTimer ti2;
+    ti1.setSingleShot(true);
     ti1.start(MOVETOTHREAD_TIMEOUT);
     ti2.start(MOVETOTHREAD_TIMEOUT);
     QVERIFY((ti1.timerId() & 0xffffff) != (ti2.timerId() & 0xffffff));
@@ -890,9 +885,6 @@ void tst_QTimer::singleShotToFunctors()
 
 void tst_QTimer::singleShot_chrono()
 {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires C++11 <chrono> support");
-#else
     // duplicates singleShotStaticFunctionZeroTimeout and singleShotToFunctors
     using namespace std::chrono;
     {
@@ -929,7 +921,6 @@ void tst_QTimer::singleShot_chrono()
     QTRY_COMPARE(count, 3);
 
     _e.reset();
-#endif
 }
 
 class DontBlockEvents : public QObject
@@ -1011,7 +1002,7 @@ void tst_QTimer::postedEventsShouldNotStarveTimers()
     timer.start();
     SlotRepeater slotRepeater;
     slotRepeater.repeatThisSlot();
-    QTRY_VERIFY_WITH_TIMEOUT(timeoutSpy.count() > 5, 100);
+    QTRY_VERIFY_WITH_TIMEOUT(timeoutSpy.size() > 5, 100);
 }
 
 struct DummyFunctor {
@@ -1054,7 +1045,7 @@ void tst_QTimer::callOnTimeout()
 
     QTest::qWait(100);
     QCOMPARE(count, 2);
-    QCOMPARE(timeoutSpy.count(), 1);
+    QCOMPARE(timeoutSpy.size(), 1);
 
     // Test that connection is bound to context lifetime
     QVERIFY(connection);