diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-02-06 14:43:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-10 14:28:17 +0100 |
| commit | 4cc230ade4df3919fbb9688b60e6e8f7f3cc8144 (patch) | |
| tree | a6240d82988ec658d18be30e2ebf19bed2fc272d /src/qml/debugger/qqmlprofilerservice_p.h | |
| parent | 77686f3b94dfd572778eb8dfa77717114e3abb93 (diff) | |
Unify initial waiting of debug services
The debug services generally behave in one of two ways when initializing:
Either they block the initializing thread until some configuration is
passed over the network or they just go on. By introducing a generalized
configurable debug service the various ways of waiting on initialization
are cleaned up. The API defined for it also allows for engine-specific
initialization.
Change-Id: Id5685ef17d2a7eb1222629f7caa5ec53076d47b2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/qml/debugger/qqmlprofilerservice_p.h')
| -rw-r--r-- | src/qml/debugger/qqmlprofilerservice_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h index cdc49f2ea7..b688141730 100644 --- a/src/qml/debugger/qqmlprofilerservice_p.h +++ b/src/qml/debugger/qqmlprofilerservice_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qqmldebugservice_p.h> +#include "qqmlconfigurabledebugservice_p.h" #include <private/qqmlboundsignal_p.h> // this contains QUnifiedTimer #include <private/qabstractanimation_p.h> @@ -163,7 +163,7 @@ class QUrl; class QQmlEngine; -class Q_QML_PRIVATE_EXPORT QQmlProfilerService : public QQmlDebugService +class Q_QML_PRIVATE_EXPORT QQmlProfilerService : public QQmlConfigurableDebugService { public: enum Message { @@ -372,8 +372,6 @@ private: QElapsedTimer m_timer; QVector<QQmlProfilerData> m_data; QMutex m_dataMutex; - QMutex m_initializeMutex; - QWaitCondition m_initializeCondition; static QQmlProfilerService *m_instance; |