diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-01-30 12:19:13 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-30 14:17:46 +0100 |
| commit | 539d5376bb3ef18d0c819ab9a1c195ee6e56ed79 (patch) | |
| tree | a2945d95c92561e1dfa11c578ceff793b3b1fe60 /src/qml/debugger/qqmldebugserver_p.h | |
| parent | 80fdecb3a548f1afbb3000ef62fed6d3f942f7ea (diff) | |
Make the QML debug server thread safe
Previously, if instance() was accessed concurrently we could run into
various problems as the initialization wasn't synchronized. By putting
most of the initialization into the constructor, wrapping it into a
Q_GLOBAL_STATIC and discerning between accesses that need to wait for
the initial "hello" packet and ones that don't the situation is
improved.
Change-Id: I182e8e6abf054b851ef7ea5f897d4a197a9da4bf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugserver_p.h')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h index e285d7cfe7..6ee6dd2d46 100644 --- a/src/qml/debugger/qqmldebugserver_p.h +++ b/src/qml/debugger/qqmldebugserver_p.h @@ -89,6 +89,7 @@ private: friend class QQmlDebugService; friend class QQmlDebugServicePrivate; friend class QQmlDebugServerThread; + friend struct QQmlDebugServerInstanceWrapper; QQmlDebugServer(); Q_PRIVATE_SLOT(d_func(), void _q_changeServiceState(const QString &serviceName, QQmlDebugService::State state)) |