diff options
Diffstat (limited to 'src/qml/debugger')
-rw-r--r-- | src/qml/debugger/debugger.pri | 13 | ||||
-rw-r--r-- | src/qml/debugger/qqmlabstractprofileradapter_p.h | 4 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebug.cpp | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebug.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugconnector_p.h | 4 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugpluginmanager_p.h | 6 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugservice_p.h | 6 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugserviceinterfaces_p.h | 6 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugstatesdelegate_p.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmlmemoryprofiler_p.h | 2 | ||||
-rw-r--r-- | src/qml/debugger/qqmlprofiler_p.h | 6 | ||||
-rw-r--r-- | src/qml/debugger/qqmlprofilerdefinitions_p.h | 6 |
12 files changed, 29 insertions, 30 deletions
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index b8d2347b17..202a46e550 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -1,13 +1,13 @@ -contains(QT_CONFIG, no-qml-debug) { - DEFINES += QT_NO_QML_DEBUGGER - MODULE_DEFINES += QT_NO_QML_DEBUGGER -} else { +qtConfig(qml-debug) { HEADERS += \ + $$PWD/qqmlabstractprofileradapter_p.h \ $$PWD/qqmlconfigurabledebugservice_p.h \ $$PWD/qqmldebugpluginmanager_p.h \ + $$PWD/qqmldebugservice_p.h \ $$PWD/qqmldebugservicefactory_p.h \ $$PWD/qqmldebugserver_p.h \ - $$PWD/qqmldebugserverconnection_p.h + $$PWD/qqmldebugserverconnection_p.h \ + $$PWD/qqmlprofilerdefinitions_p.h SOURCES += \ $$PWD/qqmldebug.cpp \ @@ -21,13 +21,10 @@ contains(QT_CONFIG, no-qml-debug) { HEADERS += \ $$PWD/qqmldebugconnector_p.h \ - $$PWD/qqmldebugservice_p.h \ $$PWD/qqmldebugserviceinterfaces_p.h \ $$PWD/qqmldebugstatesdelegate_p.h \ $$PWD/qqmldebug.h \ $$PWD/qqmlmemoryprofiler_p.h \ - $$PWD/qqmlprofilerdefinitions_p.h \ - $$PWD/qqmlabstractprofileradapter_p.h \ $$PWD/qqmlprofiler_p.h INCLUDEPATH += $$PWD diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h index 6a05a80f37..5d1b339324 100644 --- a/src/qml/debugger/qqmlabstractprofileradapter_p.h +++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_QML_DEBUGGER +QT_REQUIRE_CONFIG(qml_debug); class QQmlProfilerService; class Q_QML_PRIVATE_EXPORT QQmlAbstractProfilerAdapter : public QObject, public QQmlProfilerDefinitions { @@ -116,8 +116,6 @@ public: #define QQmlAbstractProfilerAdapterFactory_iid "org.qt-project.Qt.QQmlAbstractProfilerAdapterFactory" -#endif // QT_NO_QML_DEBUGGER - QT_END_NAMESPACE #endif // QQMLABSTRACTPROFILERADAPTER_P_H diff --git a/src/qml/debugger/qqmldebug.cpp b/src/qml/debugger/qqmldebug.cpp index 681dc06215..6246fb4207 100644 --- a/src/qml/debugger/qqmldebug.cpp +++ b/src/qml/debugger/qqmldebug.cpp @@ -44,6 +44,8 @@ #include <private/qqmlengine_p.h> #include <private/qv4compileddata_p.h> +QT_REQUIRE_CONFIG(qml_debug); + QT_BEGIN_NAMESPACE QQmlDebuggingEnabler::QQmlDebuggingEnabler(bool printWarning) diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index 6a0cfdc709..d0ceb28cdc 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_QML_DEBUGGER +#if QT_CONFIG(qml_debug) struct Q_QML_EXPORT QQmlDebuggingEnabler { diff --git a/src/qml/debugger/qqmldebugconnector_p.h b/src/qml/debugger/qqmldebugconnector_p.h index 0d3e2e2e47..a2a6f5047d 100644 --- a/src/qml/debugger/qqmldebugconnector_p.h +++ b/src/qml/debugger/qqmldebugconnector_p.h @@ -44,7 +44,9 @@ #include <QtQml/qjsengine.h> #include <QtCore/QVariantList> +#if QT_CONFIG(qml_debug) #include <private/qqmldebugservice_p.h> +#endif // // W A R N I N G @@ -59,7 +61,7 @@ QT_BEGIN_NAMESPACE -#ifdef QT_NO_QML_DEBUGGER +#if !QT_CONFIG(qml_debug) class Q_QML_PRIVATE_EXPORT QQmlDebugConnector { diff --git a/src/qml/debugger/qqmldebugpluginmanager_p.h b/src/qml/debugger/qqmldebugpluginmanager_p.h index 8f52b65b17..2575cbb96a 100644 --- a/src/qml/debugger/qqmldebugpluginmanager_p.h +++ b/src/qml/debugger/qqmldebugpluginmanager_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -#if defined(QT_NO_QML_DEBUGGER) +#if !QT_CONFIG(qml_debug) #define Q_QML_DEBUG_PLUGIN_LOADER(interfaceName)\ interfaceName *load##interfaceName(const QString &key)\ @@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE } #define Q_QML_IMPORT_DEBUG_PLUGIN(className) -#else // QT_NO_QML_DEBUGGER +#else // QT_CONFIG(qml_debug) #define Q_QML_DEBUG_PLUGIN_LOADER(interfaceName)\ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, interfaceName##Loader,\ @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE return interfaceName##Loader()->metaData();\ } -#endif // QT_NO_QML_DEBUGGER +#endif // QT_CONFIG(qml_debug) QT_END_NAMESPACE #endif // QQMLDEBUGPLUGINMANAGER_P_H diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index 42a57a39f2..34bbd631ec 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -56,9 +56,9 @@ // We mean it. // -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(qml_debug); -#ifndef QT_NO_QML_DEBUGGER +QT_BEGIN_NAMESPACE class QJSEngine; @@ -103,8 +103,6 @@ signals: void messagesToClient(const QString &name, const QList<QByteArray> &messages); }; -#endif - QT_END_NAMESPACE #endif // QQMLDEBUGSERVICE_H diff --git a/src/qml/debugger/qqmldebugserviceinterfaces_p.h b/src/qml/debugger/qqmldebugserviceinterfaces_p.h index 12965ff383..01693aee24 100644 --- a/src/qml/debugger/qqmldebugserviceinterfaces_p.h +++ b/src/qml/debugger/qqmldebugserviceinterfaces_p.h @@ -53,9 +53,10 @@ #include <QtCore/qstring.h> #include <private/qtqmlglobal_p.h> +#if QT_CONFIG(qml_debug) #include <private/qqmldebugservice_p.h> +#endif #include <private/qqmldebugstatesdelegate_p.h> -#include <private/qqmlabstractprofileradapter_p.h> #include <private/qqmlboundsignal_p.h> #include <limits> @@ -65,7 +66,7 @@ QT_BEGIN_NAMESPACE class QWindow; class QQuickWindow; -#ifdef QT_NO_QML_DEBUGGER +#if !QT_CONFIG(qml_debug) class QV4DebugService { @@ -120,6 +121,7 @@ protected: QQmlDebugService(s_key, version, parent) {} }; +class QQmlAbstractProfilerAdapter; class Q_QML_PRIVATE_EXPORT QQmlProfilerService : public QQmlDebugService { Q_OBJECT diff --git a/src/qml/debugger/qqmldebugstatesdelegate_p.h b/src/qml/debugger/qqmldebugstatesdelegate_p.h index 95f727fb2d..b2e14873dc 100644 --- a/src/qml/debugger/qqmldebugstatesdelegate_p.h +++ b/src/qml/debugger/qqmldebugstatesdelegate_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -#ifdef QT_NO_QML_DEBUGGER +#if !QT_CONFIG(qml_debug) class QQmlDebugStatesDelegate {}; diff --git a/src/qml/debugger/qqmlmemoryprofiler_p.h b/src/qml/debugger/qqmlmemoryprofiler_p.h index fb71c999c3..12a31a851f 100644 --- a/src/qml/debugger/qqmlmemoryprofiler_p.h +++ b/src/qml/debugger/qqmlmemoryprofiler_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -#ifdef QT_NO_QML_DEBUGGER +#if !QT_CONFIG(qml_debug) #define QML_MEMORY_SCOPE_URL(url) #define QML_MEMORY_SCOPE_STRING(s) diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index 88f8e94f25..9ffe6ff247 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -55,15 +55,17 @@ #include <private/qqmlboundsignal_p.h> #include <private/qfinitestack_p.h> #include <private/qqmlbinding_p.h> +#if QT_CONFIG(qml_debug) #include "qqmlprofilerdefinitions_p.h" #include "qqmlabstractprofileradapter_p.h" +#endif #include <QUrl> #include <QString> QT_BEGIN_NAMESPACE -#ifdef QT_NO_QML_DEBUGGER +#if !QT_CONFIG(qml_debug) #define Q_QML_PROFILE_IF_ENABLED(feature, profiler, Code) #define Q_QML_PROFILE(feature, profiler, Method) @@ -450,6 +452,6 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QVector<QQmlProfilerData>) Q_DECLARE_METATYPE(QQmlProfiler::LocationHash) -#endif // QT_NO_QML_DEBUGGER +#endif // QT_CONFIG(qml_debug) #endif // QQMLPROFILER_P_H diff --git a/src/qml/debugger/qqmlprofilerdefinitions_p.h b/src/qml/debugger/qqmlprofilerdefinitions_p.h index c6ae4593a9..91d0376837 100644 --- a/src/qml/debugger/qqmlprofilerdefinitions_p.h +++ b/src/qml/debugger/qqmlprofilerdefinitions_p.h @@ -43,6 +43,8 @@ #include <private/qtqmlglobal_p.h> #include <private/qv4profiling_p.h> +QT_REQUIRE_CONFIG(qml_debug); + // // W A R N I N G // ------------- @@ -56,8 +58,6 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_QML_DEBUGGER - struct QQmlProfilerDefinitions { enum Message { Event, @@ -163,8 +163,6 @@ struct QQmlProfilerDefinitions { }; }; -#endif // QT_NO_QML_DEBUGGER - QT_END_NAMESPACE #endif |