diff options
Diffstat (limited to 'src/qml/debugger')
-rw-r--r-- | src/qml/debugger/qqmldebug.cpp | 10 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugserviceinterfaces_p.h | 18 | ||||
-rw-r--r-- | src/qml/debugger/qqmlprofiler_p.h | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/src/qml/debugger/qqmldebug.cpp b/src/qml/debugger/qqmldebug.cpp index 15230d75a5..681dc06215 100644 --- a/src/qml/debugger/qqmldebug.cpp +++ b/src/qml/debugger/qqmldebug.cpp @@ -42,6 +42,7 @@ #include "qqmldebugserviceinterfaces_p.h" #include <private/qqmlengine_p.h> +#include <private/qv4compileddata_p.h> QT_BEGIN_NAMESPACE @@ -181,12 +182,12 @@ bool QQmlDebuggingEnabler::startDebugConnector(const QString &pluginName, return connector ? connector->open(configuration) : false; } -enum { HookCount = 3 }; +enum { HookCount = 4 }; // Only add to the end, and bump version if you do. quintptr Q_QML_EXPORT qtDeclarativeHookData[] = { // Version of this Array. Bump if you add to end. - 1, + 2, // Number of entries in this array. HookCount, @@ -194,7 +195,10 @@ quintptr Q_QML_EXPORT qtDeclarativeHookData[] = { // TypeInformationVersion, an integral value, bumped whenever private // object sizes or member offsets that are used in Qt Creator's // data structure "pretty printing" change. - 2 + 3, + + // Version of the cache data. + QV4_DATA_STRUCTURE_VERSION }; Q_STATIC_ASSERT(HookCount == sizeof(qtDeclarativeHookData) / sizeof(qtDeclarativeHookData[0])); diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h index 2fe3a588c3..707ef1a937 100644 --- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h +++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h @@ -67,13 +67,15 @@ class QQuickWindow; #ifdef QT_NO_QML_DEBUGGER -struct QV4DebugService +class QV4DebugService { +public: void signalEmitted(const QString &) {} }; -struct QQmlProfilerService +class QQmlProfilerService { +public: void startProfiling(QJSEngine *engine, quint64 features = std::numeric_limits<quint64>::max()) { Q_UNUSED(engine); @@ -83,21 +85,23 @@ struct QQmlProfilerService void stopProfiling(QJSEngine *) {} }; -struct QQmlEngineDebugService +class QQmlEngineDebugService { +public: void objectCreated(QJSEngine *, QObject *) {} virtual void setStatesDelegate(QQmlDebugStatesDelegate *) {} }; -struct QQmlInspectorService { +class QQmlInspectorService { +public: void addWindow(QQuickWindow *) {} void setParentWindow(QQuickWindow *, QWindow *) {} void removeWindow(QQuickWindow *) {} }; -struct QDebugMessageService {}; -struct QQmlEngineControlService {}; -struct QQmlNativeDebugService {}; +class QDebugMessageService {}; +class QQmlEngineControlService {}; +class QQmlNativeDebugService {}; #else diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index 41fb2c5b7b..88f8e94f25 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE #define Q_QML_PROFILE(feature, profiler, Method) #define Q_QML_OC_PROFILE(member, Code) -struct QQmlProfiler {}; +class QQmlProfiler {}; struct QQmlBindingProfiler { |