Commit ff28e351 authored by Kai Koehne's avatar Kai Koehne Committed by The Qt Project
Browse files

Fix deadlocks in debugger infrastructure on Mac


Set QReadWriteLocker to recursive. This is needed e.g. to allow
_q_changeServiceState to get a read lock when called from inside
receiveMessage.

Change-Id: I287a7c7f44e94005c0458825f8f6d1877ee914dd
Reviewed-by: default avatarAurindam Jana <aurindam.jana@digia.com>
parent ad7f91c5
No related merge requests found
Showing with 1 addition and 0 deletions
...@@ -141,6 +141,7 @@ private: ...@@ -141,6 +141,7 @@ private:
QQmlDebugServerPrivate::QQmlDebugServerPrivate() : QQmlDebugServerPrivate::QQmlDebugServerPrivate() :
connection(0), connection(0),
pluginsLock(QReadWriteLock::Recursive),
gotHello(false), gotHello(false),
blockingMode(false), blockingMode(false),
thread(0) thread(0)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment