diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2014-12-17 11:57:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-01-16 12:08:37 +0100 |
| commit | 3c6a960b5bdce834faa9b1f580ea44a1f6e36542 (patch) | |
| tree | 26ab0b435852d2880e3b6d21fc60fcc58afbc5af | |
| parent | ba7653fb74a288fbb0c7df3c24001b7170e087ae (diff) | |
Rename QML debug macro to Qt naming style
With change macro is in line with QT_NO_<feature> style of naming
macros. This way it will also be automatically added to file
mkspecs/qmodule.pri in QT_NO_DEFINES value.
Change-Id: I111d07fd015994290c54e00e8aac2d6dbdb7de9e
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -6202,7 +6202,7 @@ fi # ### Vestige if [ "$CFG_QML_DEBUG" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QML_NO_DEBUGGER" + QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QML_DEBUGGER" fi case "$QMAKE_CONF_COMPILER" in diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 1b48e0f21e..f75917ca0c 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3548,7 +3548,7 @@ void Configure::generateConfigfiles() if (dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL"; if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; - if (dictionary["QML_DEBUG"] == "no") qconfigList += "QT_QML_NO_DEBUGGER"; + if (dictionary["QML_DEBUG"] == "no") qconfigList += "QT_NO_QML_DEBUGGER"; if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if (dictionary["HARFBUZZ"] == "no") qconfigList += "QT_NO_HARFBUZZ"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; |