diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/debugger/debugger.pri | 1 | ||||
-rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 6 | ||||
-rw-r--r-- | src/quick/util/util.pri | 6 | ||||
-rw-r--r-- | src/quickwidgets/quickwidgets.pro | 1 |
4 files changed, 3 insertions, 11 deletions
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index 74dcb250a8..da1ab867d4 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -1,5 +1,6 @@ contains(QT_CONFIG, no-qml-debug) { DEFINES += QT_NO_QML_DEBUGGER + MODULE_DEFINES += QT_NO_QML_DEBUGGER } else { HEADERS += \ $$PWD/qqmldebugpluginmanager_p.h \ diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri index cf434ee2ed..e72b06359e 100644 --- a/src/qml/jsruntime/jsruntime.pri +++ b/src/qml/jsruntime/jsruntime.pri @@ -43,11 +43,7 @@ SOURCES += \ $$PWD/qv4typedarray.cpp \ $$PWD/qv4dataview.cpp -!contains(QT_CONFIG, no-qml-debug) { - SOURCES += $$PWD/qv4profiling.cpp -} else { - DEFINES += QT_NO_QML_DEBUGGER -} +!contains(QT_CONFIG, no-qml-debug): SOURCES += $$PWD/qv4profiling.cpp HEADERS += \ $$PWD/qv4global_p.h \ diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri index 2c31f6feed..66792536d7 100644 --- a/src/quick/util/util.pri +++ b/src/quick/util/util.pri @@ -31,11 +31,7 @@ SOURCES += \ $$PWD/qquickshortcut.cpp \ $$PWD/qquickvalidator.cpp -contains(QT_CONFIG, no-qml-debug) { - DEFINES += QT_NO_QML_DEBUGGER -} else { - SOURCES += $$PWD/qquickprofiler.cpp -} +!contains(QT_CONFIG, no-qml-debug): SOURCES += $$PWD/qquickprofiler.cpp HEADERS += \ $$PWD/qquickapplication_p.h\ diff --git a/src/quickwidgets/quickwidgets.pro b/src/quickwidgets/quickwidgets.pro index 0e45e63307..87409e31c5 100644 --- a/src/quickwidgets/quickwidgets.pro +++ b/src/quickwidgets/quickwidgets.pro @@ -3,7 +3,6 @@ TARGET = QtQuickWidgets QT = core-private gui-private qml-private quick-private widgets-private DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES -contains(QT_CONFIG, no-qml-debug): DEFINES += QT_NO_QML_DEBUGGER HEADERS += \ qquickwidget.h \ |