From fc15cdb4d0a50f8bf021a93d97435bddee351d0f Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Thu, 11 Jul 2019 03:33:34 +0900 Subject: [PATCH] return value in QOrderedMutexLocker::relock when thread is disabled Change-Id: Ic96e777491cc8d304be056a3476a4de4c4700a0f Reviewed-by: Volker Hilsheimer --- src/corelib/thread/qorderedmutexlocker_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h index e0a67388d49..570c5262257 100644 --- a/src/corelib/thread/qorderedmutexlocker_p.h +++ b/src/corelib/thread/qorderedmutexlocker_p.h @@ -159,7 +159,7 @@ public: void relock() {} void unlock() {} - static bool relock(QBasicMutex *, QBasicMutex *) {} + static bool relock(QBasicMutex *, QBasicMutex *) { return false; } }; using QBasicMutexLocker = QMutexLocker;