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>
This commit is contained in:
parent
789d487cb0
commit
aa5f2bf836
@ -161,10 +161,6 @@ bool QWaitCondition::wait(QMutex *mutex, unsigned long time)
|
|||||||
{
|
{
|
||||||
if (!mutex)
|
if (!mutex)
|
||||||
return false;
|
return false;
|
||||||
if (mutex->isRecursive()) {
|
|
||||||
qWarning("QWaitCondition::wait: Cannot wait on recursive mutexes");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
QWaitConditionEvent *wce = d->pre();
|
QWaitConditionEvent *wce = d->pre();
|
||||||
mutex->unlock();
|
mutex->unlock();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user