aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-05-17 15:15:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-24 15:04:26 +0200
commit2653e79f1822dfa3c1516f518df77e94adf8bf82 (patch)
tree3e6e5897f8832f571561c87f0871dec56c51846f /src/qml
parent745621a90bde2b01de144cb288302f7d4944a682 (diff)
Debugger: Make sure client list is protected by mutex
So far we didn't protect this access. Change-Id: Id738453db5e655371fa2fbf88f81cab6c0af466f Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r--src/qml/debugger/qqmldebugserver.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index dcb553912d..53ad15775c 100644
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -417,10 +417,13 @@ void QQmlDebugServer::receiveMessage(const QByteArray &message)
if (s_dataStreamVersion > QDataStream().version())
s_dataStreamVersion = QDataStream().version();
}
+
// Send the hello answer immediately, since it needs to arrive before
// the plugins below start sending messages.
+
QByteArray helloAnswer;
{
+ QReadLocker readPluginsLock(&d->pluginsLock);
QQmlDebugStream out(&helloAnswer, QIODevice::WriteOnly);
QStringList pluginNames;
QList<float> pluginVersions;