Revert "QReadWriteLock: replace (QWaitCondition, QMutex) with std::(condition_variable, mutex)"

This reverts commit 319c4786036b5f45fc95c683cef5cf5ba2ce2a6d.

Reason for revert: QTBUG-78450

Change-Id: Ifaea83626296508558591d4ff207d4e0c883f841
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/corelib/thread/qreadwritelock_p.h b/src/corelib/thread/qreadwritelock_p.h
index b2e782f9ee..a4d002b7f2 100644
--- a/src/corelib/thread/qreadwritelock_p.h
+++ b/src/corelib/thread/qreadwritelock_p.h
@@ -54,9 +54,7 @@
 
 #include <QtCore/private/qglobal_p.h>
 #include <QtCore/qhash.h>
-
-#include <mutex>
-#include <condition_variable>
+#include <QtCore/qwaitcondition.h>
 
 QT_REQUIRE_CONFIG(thread);
 
@@ -68,9 +66,9 @@ public:
     explicit QReadWriteLockPrivate(bool isRecursive = false)
         : recursive(isRecursive) {}
 
-    std::mutex mutex;
-    std::condition_variable writerCond;
-    std::condition_variable readerCond;
+    QMutex mutex;
+    QWaitCondition writerCond;
+    QWaitCondition readerCond;
     int readerCount = 0;
     int writerCount = 0;
     int waitingReaders = 0;
@@ -78,8 +76,8 @@ public:
     const bool recursive;
 
     //Called with the mutex locked
-    bool lockForWrite(std::unique_lock<std::mutex> &lock, int timeout);
-    bool lockForRead(std::unique_lock<std::mutex> &lock, int timeout);
+    bool lockForWrite(int timeout);
+    bool lockForRead(int timeout);
     void unlock();
 
     //memory management