Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 39d17e0a24..a4eb2936b5 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -506,17 +506,17 @@ void tst_QtConcurrentRun::recursive()
     int levels = 15;
 
     for (int i = 0; i < QThread::idealThreadCount(); ++i) {
-        count.store(0);
+        count.storeRelaxed(0);
         QThreadPool::globalInstance()->setMaxThreadCount(i);
         recursiveRun(levels);
-        QCOMPARE(count.load(), (int)std::pow(2.0, levels) - 1);
+        QCOMPARE(count.loadRelaxed(), (int)std::pow(2.0, levels) - 1);
     }
 
     for (int i = 0; i < QThread::idealThreadCount(); ++i) {
-        count.store(0);
+        count.storeRelaxed(0);
         QThreadPool::globalInstance()->setMaxThreadCount(i);
         recursiveResult(levels);
-        QCOMPARE(count.load(), (int)std::pow(2.0, levels) - 1);
+        QCOMPARE(count.loadRelaxed(), (int)std::pow(2.0, levels) - 1);
     }
 }
 
@@ -570,7 +570,7 @@ public:
     static QAtomicInt cancel;
     void run() override {
         int iter = 60;
-        while (--iter && !cancel.load())
+        while (--iter && !cancel.loadRelaxed())
             QThread::currentThread()->msleep(25);
     }
 };
@@ -638,7 +638,7 @@ void tst_QtConcurrentRun::exceptions()
         caught = true;
     }
 
-    SlowTask::cancel.store(true);
+    SlowTask::cancel.storeRelaxed(true);
 
     QVERIFY2(caught, "did not get exception");
 }