diff options
author | Kai Koehne <kai.koehne@qt.io> | 2017-01-25 14:51:16 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2017-02-01 10:44:06 +0000 |
commit | 1380d07b1e60d9a4efec4e15d510271ed210a61a (patch) | |
tree | 7af562e90770a7a66992de69436ff72e58214121 | |
parent | 0ceac04beb105c686855868e88f1971cf41abac4 (diff) |
Fix -no-qmldebug debug build with MSVC
[Platform Specific Changes][Windows] Fixed compilation on MSVC
with -no-qml-debug configure argument.
Task-number: QTBUG-58412
Change-Id: I915ed3d345b3f1e4e5863456522784ab6c9b15cf
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/qml/debugger/qqmldebugserviceinterfaces_p.h | 18 | ||||
-rw-r--r-- | src/qml/debugger/qqmlprofiler_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4debugging_p.h | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4profiling_p.h | 2 |
4 files changed, 15 insertions, 10 deletions
diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h index ca6293c3ec..99ec525f29 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 { diff --git a/src/qml/jsruntime/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h index 3b589a41f1..8e2eec03d2 100644 --- a/src/qml/jsruntime/qv4debugging_p.h +++ b/src/qml/jsruntime/qv4debugging_p.h @@ -61,8 +61,9 @@ namespace Debugging { #ifdef QT_NO_QML_DEBUGGER -struct Debugger +class Debugger { +public: bool pauseAtNextOpportunity() const { return false; } void maybeBreakAtInstruction() {} void enteringFunction() {} diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h index f75ac4d33a..9de597ad0e 100644 --- a/src/qml/jsruntime/qv4profiling_p.h +++ b/src/qml/jsruntime/qv4profiling_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE namespace QV4 { namespace Profiling { -struct Profiler {}; +class Profiler {}; } } |