From aa5f2bf8366913a6b88b401a6dfebcb7e6ad7c59 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 24 Sep 2020 09:14:01 +0200 Subject: [PATCH] qwaitcondition_win.cpp: Fix deprecation warning about QMutex::isRecursive() Remove the check since a QMutex can no longer be recursive, fixing: qwaitcondition_win.cpp:164:28: warning: 'bool QMutex::isRecursive() const' is deprecated: Use QRecursiveMutex instead of a recursive QMutex [-Wdeprecated-declarations] Task-number: QTBUG-85700 Change-Id: Ic1631c1e671cf3234b5823d6d20121d746304c8e Reviewed-by: Lars Knoll --- src/corelib/thread/qwaitcondition_win.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/corelib/thread/qwaitcondition_win.cpp b/src/corelib/thread/qwaitcondition_win.cpp index ba34129b7ff..04cfe165769 100644 --- a/src/corelib/thread/qwaitcondition_win.cpp +++ b/src/corelib/thread/qwaitcondition_win.cpp @@ -161,10 +161,6 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time) { if (!mutex) return false; - if (mutex->isRecursive()) { - qWarning("QWaitCondition::wait: Cannot wait on recursive mutexes"); - return false; - } QWaitConditionEvent *wce = d->pre(); mutex->unlock();