From ff28e3519dedb9bf0b4d1177b205b0b20cbec431 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 7 Oct 2013 16:18:23 +0200
Subject: 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: Aurindam Jana <aurindam.jana@digia.com>
---
 src/qml/debugger/qqmldebugserver.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index 53ad15775c..5286d3e694 100644
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -141,6 +141,7 @@ private:
 
 QQmlDebugServerPrivate::QQmlDebugServerPrivate() :
     connection(0),
+    pluginsLock(QReadWriteLock::Recursive),
     gotHello(false),
     blockingMode(false),
     thread(0)
-- 
cgit v1.2.3