From 3c6a960b5bdce834faa9b1f580ea44a1f6e36542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Wed, 17 Dec 2014 11:57:42 +0200 Subject: [PATCH] Rename QML debug macro to Qt naming style With change macro is in line with QT_NO_ 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 --- configure | 2 +- tools/configure/configureapp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 43be7223c6a..32a2e5abdef 100755 --- a/configure +++ b/configure @@ -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 1b48e0f21ea..f75917ca0c4 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";