diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-05 17:26:42 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-15 08:26:50 +0000 |
commit | 3baff0304e5936d2a6ef8288b14758a914bacdc4 (patch) | |
tree | 7b7c0696b835b887eb1a3f40d3813ca4918aac52 /src/qml | |
parent | 483d5256c0a06e52430364d033db1f305bf167f8 (diff) |
Make keys of all debug services public
Change-Id: I4af1c351b92f35c11559f68fe9ab60063a665724
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/debugger/qqmldebugserviceinterfaces.cpp | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugserviceinterfaces_p.h | 39 |
2 files changed, 35 insertions, 6 deletions
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces.cpp b/src/qml/debugger/qqmldebugserviceinterfaces.cpp index 2bf9f2785c..992b007e86 100644 --- a/src/qml/debugger/qqmldebugserviceinterfaces.cpp +++ b/src/qml/debugger/qqmldebugserviceinterfaces.cpp @@ -39,5 +39,7 @@ const QString QV4DebugService::s_key = QStringLiteral("V8Debugger"); const QString QQmlEngineDebugService::s_key = QStringLiteral("QmlDebugger"); const QString QQmlInspectorService::s_key = QStringLiteral("QmlInspector"); const QString QQmlProfilerService::s_key = QStringLiteral("CanvasFrameRate"); +const QString QDebugMessageService::s_key = QStringLiteral("DebugMessages"); +const QString QQmlEngineControlService::s_key = QStringLiteral("EngineControl"); QT_END_NAMESPACE diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h index a2ba670608..54f9114159 100644 --- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h +++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h @@ -60,6 +60,8 @@ class Q_QML_PRIVATE_EXPORT QV4DebugService : protected QQmlDebugService { Q_OBJECT public: + static const QString s_key; + virtual void signalEmitted(const QString &signal) = 0; protected: @@ -67,14 +69,14 @@ protected: QV4DebugService(float version, QObject *parent = 0) : QQmlDebugService(s_key, version, parent) {} - - static const QString s_key; }; class Q_QML_PRIVATE_EXPORT QQmlProfilerService : protected QQmlDebugService { Q_OBJECT public: + static const QString s_key; + virtual void addGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) = 0; virtual void removeGlobalProfiler(QQmlAbstractProfilerAdapter *profiler) = 0; @@ -89,14 +91,14 @@ protected: QQmlProfilerService(float version, QObject *parent = 0) : QQmlDebugService(s_key, version, parent) {} - - static const QString s_key; }; class Q_QML_PRIVATE_EXPORT QQmlEngineDebugService : protected QQmlDebugService { Q_OBJECT public: + static const QString s_key; + virtual void objectCreated(QQmlEngine *engine, QObject *object) = 0; virtual void setStatesDelegate(QQmlDebugStatesDelegate *) = 0; @@ -107,14 +109,14 @@ protected: QQmlDebugService(s_key, version, parent) {} QQmlBoundSignal *nextSignal(QQmlBoundSignal *prev) { return prev->m_nextSignal; } - - static const QString s_key; }; class Q_QML_PRIVATE_EXPORT QQmlInspectorService : protected QQmlDebugService { Q_OBJECT public: + static const QString s_key; + virtual void addView(QObject *) = 0; virtual void removeView(QObject *) = 0; @@ -123,8 +125,33 @@ protected: QQmlInspectorService(float version, QObject *parent = 0) : QQmlDebugService(s_key, version, parent) {} +}; +class Q_QML_PRIVATE_EXPORT QDebugMessageService : protected QQmlDebugService +{ + Q_OBJECT +public: static const QString s_key; + +protected: + friend class QQmlDebugConnector; + + QDebugMessageService(float version, QObject *parent = 0) : + QQmlDebugService(s_key, version, parent) {} +}; + +class Q_QML_PRIVATE_EXPORT QQmlEngineControlService : protected QQmlDebugService +{ + Q_OBJECT +public: + static const QString s_key; + +protected: + friend class QQmlDebugConnector; + + QQmlEngineControlService(float version, QObject *parent = 0) : + QQmlDebugService(s_key, version, parent) {} + }; QT_END_NAMESPACE |