From 83cae7c9e3c12434046f2124b4d0c345157ffcb2 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 24 Sep 2020 16:40:35 +0200
Subject: Drop constexpr from QAtomicTraits::isLockFree()

As requested by a ### Qt 6 comment. This then implied a few other
functions weren't constexpr, which broke some tests.

Task-number: QTBUG-85700
Change-Id: I6522a9b2d7a74e117442121400a1d7198d323967
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tests/auto/corelib/thread/qatomicinteger')

diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
index a56a3f645f..9f03c4c2b7 100644
--- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
@@ -198,14 +198,15 @@ void tst_QAtomicIntegerXX::static_checks()
 
 #ifdef Q_COMPILER_CONSTEXPR
     // this is a compile-time test only
-    booleanHelper<QAtomicInteger<T>::isReferenceCountingNative()>();
     booleanHelper<QAtomicInteger<T>::isReferenceCountingWaitFree()>();
-    booleanHelper<QAtomicInteger<T>::isTestAndSetNative()>();
     booleanHelper<QAtomicInteger<T>::isTestAndSetWaitFree()>();
-    booleanHelper<QAtomicInteger<T>::isFetchAndStoreNative()>();
     booleanHelper<QAtomicInteger<T>::isFetchAndStoreWaitFree()>();
-    booleanHelper<QAtomicInteger<T>::isFetchAndAddNative()>();
     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
 }
 
-- 
cgit v1.2.3