aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/debugger/qqmldebugservice_p.h
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-04-24 14:39:38 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-25 14:26:42 +0200
commit0d284ae2d62707e6c35c8d97ca73e974d35c4167 (patch)
treed41e0e0c64486a43c45db2c6a8ad3e1a9fba6ec9 /src/qml/debugger/qqmldebugservice_p.h
parente1583664fd8a9eb66e37bdd2e1476bbf90383a4c (diff)
Debugger: Fix race conditions in block mode
Using waitForMessage() in the constructor after registerService() is _not_ safe: You might get the first message already after the registerService() and before the waitForMessage() call. Instead, use QMutex/QWaitCondition to block the initialization. Also make the use of the block mode explicit, since the service might already be enabled also for non-blocking modes ... Change-Id: I387bfe0627c80e2029acff71f86d12cd9ab58de1 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugservice_p.h')
-rw-r--r--src/qml/debugger/qqmldebugservice_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index f19b64f42b..abd9c1be73 100644
--- a/src/qml/debugger/qqmldebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -81,7 +81,6 @@ public:
void sendMessage(const QByteArray &);
void sendMessages(const QList<QByteArray> &);
- bool waitForMessage();
static int idForObject(QObject *);
static QObject *objectForId(int);
@@ -90,6 +89,7 @@ public:
static bool isDebuggingEnabled();
static bool hasDebuggingClient();
+ static bool blockingMode();
protected:
QQmlDebugService(QQmlDebugServicePrivate &dd, const QString &name, float version, QObject *parent = 0);