diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-10-07 16:18:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-16 08:33:18 +0200 |
| commit | ff28e3519dedb9bf0b4d1177b205b0b20cbec431 (patch) | |
| tree | 9791d3bc64fb3a11410eafdb264ad647842671b9 /src/qml/debugger | |
| parent | ad7f91c59a87564d2d1d9baad407ba7b07a075a7 (diff) | |
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>
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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) |