1 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
index a68f7d5a4e..d4c669cddc 100644
--- a/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
+++ b/tests/auto/concurrent/qtconcurrentthreadengine/tst_qtconcurrentthreadengine.cpp
@@ -28,6 +28,7 @@
 #include <qtconcurrentthreadengine.h>
 #include <qexception.h>
 #include <QThread>
+#include <QElapsedTimer>
 #include <QtTest/QtTest>
 
 using namespace QtConcurrent;
@@ -186,7 +187,7 @@ class ThrottleAlwaysUser : public ThreadEngine<void>
 public:
     ThrottleAlwaysUser()
     {
-        count.store(initialCount = 100);
+        count.storeRelaxed(initialCount = 100);
         finishing = false;
     }
 
@@ -198,7 +199,7 @@ public:
     ThreadFunctionResult threadFunction()
     {
         forever {
-            const int local = count.load();
+            const int local = count.loadRelaxed();
             if (local == 0) {
                 finishing = true;
                 return ThreadFinished;
@@ -223,13 +224,13 @@ void tst_QtConcurrentThreadEngine::throttle()
     for (int i = 0; i < repeats; ++i) {
         QFuture<void> f = (new ThrottleAlwaysUser())->startAsynchronously();
         f.waitForFinished();
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 
     for (int i = 0; i < repeats; ++i) {
         ThrottleAlwaysUser t;
         t.startBlocking();
-        QCOMPARE(count.load(), 0);
+        QCOMPARE(count.loadRelaxed(), 0);
     }
 }
 
@@ -382,7 +383,7 @@ void tst_QtConcurrentThreadEngine::cancelQueuedSlowUser()
 {
     const int times = 100;
 
-    QTime t;
+    QElapsedTimer t;
     t.start();
 
     {