From 2ca151a8d1de925e16ab9010f3c69b806326a923 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 2 Jul 2015 17:33:08 +0200 Subject: configure: Put qml-debug option into QT_CONFIG This way we can exclude the connection plugins from being compiled if it's off. Change-Id: Ic5ea1d35ea9f5929420268a1aefebf0464d8520b Reviewed-by: Oswald Buddenhagen --- configure | 2 +- tools/configure/configureapp.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index bef47d29f1..d824b9cfbc 100755 --- a/configure +++ b/configure @@ -6463,7 +6463,7 @@ fi # ### Vestige if [ "$CFG_QML_DEBUG" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QML_DEBUGGER" + QT_CONFIG="$QT_CONFIG no-qml-debug" fi case "$QMAKE_CONF_COMPILER" in diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 756703d1bd..c4e915b936 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2909,6 +2909,9 @@ void Configure::generateOutputVars() if (dictionary["AUDIO_BACKEND"] == "yes") qtConfig += "audio-backend"; + if (dictionary["QML_DEBUG"] == "no") + qtConfig += "no-qml-debug"; + if (dictionary["WMF_BACKEND"] == "yes") qtConfig += "wmf-backend"; @@ -3623,7 +3626,6 @@ 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_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"; -- cgit v1.2.3