1 files changed, 4 insertions, 29 deletions
diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
index e78ebbed2e..e4f98608ae 100644
--- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
@@ -67,9 +67,7 @@ enum {
     waitTime = 100
 };
 
-#if __has_include(<chrono>)
 static constexpr std::chrono::milliseconds waitTimeAsDuration(waitTime);
-#endif
 
 void tst_QMutex::convertToMilliseconds_data()
 {
@@ -78,10 +76,6 @@ void tst_QMutex::convertToMilliseconds_data()
     QTest::addColumn<qint64>("intValue");
     QTest::addColumn<qint64>("expected");
 
-#if !__has_include(<chrono>)
-    QSKIP("This test requires <chrono>");
-#endif
-
     auto add = [](TimeUnit unit, double d, long long i, qint64 expected) {
         const QScopedArrayPointer<char> enumName(QTest::toString(unit));
         QTest::addRow("%s:%f:%lld", enumName.data(), d, i)
@@ -134,9 +128,6 @@ void tst_QMutex::convertToMilliseconds_data()
 
 void tst_QMutex::convertToMilliseconds()
 {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires <chrono>");
-#else
     QFETCH(TimeUnit, unit);
     QFETCH(double, doubleValue);
     QFETCH(qint64, intValue);
@@ -174,7 +165,6 @@ void tst_QMutex::convertToMilliseconds()
 #undef DO
 #undef CASE
     }
-#endif
 }
 
 void tst_QMutex::tryLock_non_recursive()
@@ -302,10 +292,8 @@ void tst_QMutex::tryLock_non_recursive()
     thread.wait();
 }
 
-void tst_QMutex::try_lock_for_non_recursive() {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires <chrono>");
-#else
+void tst_QMutex::try_lock_for_non_recursive()
+{
     class Thread : public QThread
     {
     public:
@@ -427,14 +415,10 @@ void tst_QMutex::try_lock_for_non_recursive() {
     testsTurn.acquire();
     threadsTurn.release();
     thread.wait();
-#endif
 }
 
 void tst_QMutex::try_lock_until_non_recursive()
 {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires <chrono>");
-#else
     class Thread : public QThread
     {
     public:
@@ -556,7 +540,6 @@ void tst_QMutex::try_lock_until_non_recursive()
     testsTurn.acquire();
     threadsTurn.release();
     thread.wait();
-#endif
 }
 
 void tst_QMutex::tryLock_recursive()
@@ -685,9 +668,6 @@ void tst_QMutex::tryLock_recursive()
 
 void tst_QMutex::try_lock_for_recursive()
 {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires <chrono>");
-#else
     class Thread : public QThread
     {
     public:
@@ -808,14 +788,10 @@ void tst_QMutex::try_lock_for_recursive()
     testsTurn.acquire();
     threadsTurn.release();
     thread.wait();
-#endif
 }
 
 void tst_QMutex::try_lock_until_recursive()
 {
-#if !__has_include(<chrono>)
-    QSKIP("This test requires <chrono>");
-#else
     class Thread : public QThread
     {
     public:
@@ -937,7 +913,6 @@ void tst_QMutex::try_lock_until_recursive()
     testsTurn.acquire();
     threadsTurn.release();
     thread.wait();
-#endif
 }
 
 class mutex_Thread : public QThread
@@ -1063,8 +1038,8 @@ void tst_QMutex::lock_unlock_locked_tryLock()
     }
 }
 
-enum { one_minute = 6 * 1000, //not really one minute, but else it is too long.
-       threadCount = 10 };
+constexpr int one_minute = 6 * 1000; // not really one minute, but else it is too long.
+constexpr int threadCount = 10;
 
 class StressTestThread : public QThread
 {