diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-24 09:14:01 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-25 04:40:13 +0000 |
| commit | aa5f2bf8366913a6b88b401a6dfebcb7e6ad7c59 (patch) | |
| tree | 2b71bc84bc653dc88c89adb5714ea9200277e6fd /src/corelib/thread/qwaitcondition_win.cpp | |
| parent | 789d487cb0f4ef6f9d3e7c6ab5c5283dfe8dd350 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/thread/qwaitcondition_win.cpp')
| -rw-r--r-- | src/corelib/thread/qwaitcondition_win.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/thread/qwaitcondition_win.cpp b/src/corelib/thread/qwaitcondition_win.cpp index ba34129b7f..04cfe16576 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(); |