diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-03-16 16:44:24 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 15:58:25 +0200 |
| commit | 05e57b7736f8c370476e197fc9d4f77f2cb01605 (patch) | |
| tree | 5198341ca5e694ecada4e176eb44915684920517 /src/qml/debugger/qqmldebugserver_p.h | |
| parent | bacc47f5a42f7da05ead35c4c4f2adf427ced786 (diff) | |
Debugger: Make sure stateChanged is called from debugger thread
Make sure stateAboutToBeChanged(), stateChanged() is always called
from the debugger thread. This matches how messageReceived()
is called. On exit, run an event loop until all stateAboutToBeChanged
calls have returned.
Change-Id: I9cd6199cc80552ad97e4b7d504ea91aa116a6a34
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugserver_p.h')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmldebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h index 9c6b5435c8..5de7e73706 100644 --- a/src/qml/debugger/qqmldebugserver_p.h +++ b/src/qml/debugger/qqmldebugserver_p.h @@ -44,6 +44,7 @@ #include <QtQml/qtqmlglobal.h> #include <private/qqmldebugserverconnection_p.h> +#include <private/qqmldebugservice_p.h> // // W A R N I N G @@ -61,8 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -class QQmlDebugService; - class QQmlDebugServerPrivate; class Q_QML_EXPORT QQmlDebugServer : public QObject { @@ -95,6 +94,8 @@ private: friend class QQmlDebugServicePrivate; friend class QQmlDebugServerThread; QQmlDebugServer(); + Q_PRIVATE_SLOT(d_func(), void _q_changeServiceState(const QString &serviceName, + QQmlDebugService::State state)) Q_PRIVATE_SLOT(d_func(), void _q_sendMessages(QList<QByteArray>)) }; |