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

Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277

1 files changed, 4 insertions, 4 deletions

diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h
index 89fd3d2592..3095c9ff52 100644
--- a/src/concurrent/qtconcurrentiteratekernel.h
+++ b/src/concurrent/qtconcurrentiteratekernel.h
@@ -206,9 +206,9 @@ public:
     bool shouldStartThread() override
     {
         if (forIteration)
-            return (currentIndex.load() < iterationCount) && !this->shouldThrottleThread();
+            return (currentIndex.loadRelaxed() < iterationCount) && !this->shouldThrottleThread();
         else // whileIteration
-            return (iteratorThreads.load() == 0);
+            return (iteratorThreads.loadRelaxed() == 0);
     }
 
     ThreadFunctionResult threadFunction() override
@@ -230,7 +230,7 @@ public:
 
             const int currentBlockSize = blockSizeManager.blockSize();
 
-            if (currentIndex.load() >= iterationCount)
+            if (currentIndex.loadRelaxed() >= iterationCount)
                 break;
 
             // Atomically reserve a block of iterationCount for this thread.
@@ -261,7 +261,7 @@ public:
             // Report progress if progress reporting enabled.
             if (progressReportingEnabled) {
                 completed.fetchAndAddAcquire(finalBlockSize);
-                this->setProgressValue(this->completed.load());
+                this->setProgressValue(this->completed.loadRelaxed());
             }
 
             if (this->shouldThrottleThread())