Get rid of Q_COMPILER_CONSTEXPR checks

Is required now.

Change-Id: I62e95929d1649ea1390392230b619bd56d2a0349
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 0 insertions, 14 deletions

diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index db9839d1ed..14d393aede 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -154,18 +154,11 @@ template <bool> inline void booleanHelper()
 template <typename Atomic>
 static void constexprFunctionsHelperTemplate()
 {
-#ifdef Q_COMPILER_CONSTEXPR
     // this is a compile-time test only
     booleanHelper<Atomic::isReferenceCountingWaitFree()>();
     booleanHelper<Atomic::isTestAndSetWaitFree()>();
     booleanHelper<Atomic::isFetchAndStoreWaitFree()>();
     booleanHelper<Atomic::isFetchAndAddWaitFree()>();
-#elif 0 // No longer constexpr
-    booleanHelper<Atomic::isReferenceCountingNative()>();
-    booleanHelper<Atomic::isTestAndSetNative()>();
-    booleanHelper<Atomic::isFetchAndStoreNative()>();
-    booleanHelper<Atomic::isFetchAndAddNative()>();
-#endif
 }
 
 void tst_QAtomicInt::warningFreeHelper()
diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
index 9f03c4c2b7..8da52c95fb 100644
--- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
@@ -196,18 +196,11 @@ void tst_QAtomicIntegerXX::static_checks()
     (void) QAtomicInteger<T>::isFetchAndAddNative();
     (void) QAtomicInteger<T>::isFetchAndAddWaitFree();
 
-#ifdef Q_COMPILER_CONSTEXPR
     // this is a compile-time test only
     booleanHelper<QAtomicInteger<T>::isReferenceCountingWaitFree()>();
     booleanHelper<QAtomicInteger<T>::isTestAndSetWaitFree()>();
     booleanHelper<QAtomicInteger<T>::isFetchAndStoreWaitFree()>();
     booleanHelper<QAtomicInteger<T>::isFetchAndAddWaitFree()>();
-#elif 0 // no longer constexpr
-    booleanHelper<QAtomicInteger<T>::isReferenceCountingNative()>();
-    booleanHelper<QAtomicInteger<T>::isTestAndSetNative()>();
-    booleanHelper<QAtomicInteger<T>::isFetchAndStoreNative()>();
-    booleanHelper<QAtomicInteger<T>::isFetchAndAddNative()>();
-#endif
 }
 
 void tst_QAtomicIntegerXX::addData()