Short live QtPrivate::{condition_variable,mutex}!

This is a temporary measure to work around an implementation bug on
Integrity: For all other platforms, QtPrivate::condition_variable is
just std::condition_variable. On Integrity, it's a class that wraps
QWaitCondition to provide the interface of std::condition_variable.

This allows the use of std::condition_variable across Qt without
running into the Integrity issue. Once we can depend on an more modern
Integrity toolchain, removing QtPrivate::condition_variable is a
simple mechanical change:

   s/QtPrivate::condition_variable/std::condition_variable/g;
   s/QtPrivate::mutex/std::mutex/g;

Task-number: QTBUG-78450
Change-Id: I293a99d1cdc48691817b926aa51ecd84556e5e90
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index e29897abee..5c87844fcd 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -59,6 +59,7 @@
 #include <QtCore/qtemporarydir.h>
 #include <QtCore/qthread.h>
 #include <QtCore/private/qlocking_p.h>
+#include <QtCore/private/qwaitcondition_p.h>
 
 #include <QtCore/qtestsupport_core.h>
 
@@ -1017,15 +1018,15 @@ class WatchDog : public QThread
         ThreadEnd,
     };
 
-    bool waitFor(std::unique_lock<std::mutex> &m, Expectation e) {
-        auto expectation = [this, e] { return expecting != e; };
+    bool waitFor(std::unique_lock<QtPrivate::mutex> &m, Expectation e) {
+        auto expectationChanged = [this, e] { return expecting != e; };
         switch (e) {
         case TestFunctionEnd:
-            return waitCondition.wait_for(m, defaultTimeout(), expectation);
+            return waitCondition.wait_for(m, defaultTimeout(), expectationChanged);
         case ThreadStart:
         case ThreadEnd:
         case TestFunctionStart:
-            waitCondition.wait(m, expectation);
+            waitCondition.wait(m, expectationChanged);
             return true;
         }
         Q_UNREACHABLE();
@@ -1035,7 +1036,7 @@ class WatchDog : public QThread
 public:
     WatchDog()
     {
-        std::unique_lock<std::mutex> locker(mutex);
+        auto locker = qt_unique_lock(mutex);
         expecting = ThreadStart;
         start();
         waitFor(locker, ThreadStart);
@@ -1062,7 +1063,7 @@ public:
     }
 
     void run() override {
-        std::unique_lock<std::mutex> locker(mutex);
+        auto locker = qt_unique_lock(mutex);
         expecting = TestFunctionStart;
         waitCondition.notify_all();
         while (true) {
@@ -1082,8 +1083,8 @@ public:
     }
 
 private:
-    std::mutex mutex;
-    std::condition_variable waitCondition;
+    QtPrivate::mutex mutex;
+    QtPrivate::condition_variable waitCondition;
     Expectation expecting;
 };