1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: Put qml-debug option into QT_CONFIG

Browse Source 
This way we can exclude the connection plugins from being compiled
if it's off.

Change-Id: Ic5ea1d35ea9f5929420268a1aefebf0464d8520b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Ulf Hermann 2015-07-02 17:33:08 +02:00
parent 49403ef7a2
commit 2ca151a8d1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -6463,7 +6463,7 @@ fi
# ### Vestige # ### Vestige
if [ "$CFG_QML_DEBUG" = "no" ]; then if [ "$CFG_QML_DEBUG" = "no" ]; then
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QML_DEBUGGER" QT_CONFIG="$QT_CONFIG no-qml-debug"
fi fi
case "$QMAKE_CONF_COMPILER" in case "$QMAKE_CONF_COMPILER" in

4
tools/configure/configureapp.cpp
View File

@ -2909,6 +2909,9 @@ void Configure::generateOutputVars()
if (dictionary["AUDIO_BACKEND"] == "yes") if (dictionary["AUDIO_BACKEND"] == "yes")
qtConfig += "audio-backend"; qtConfig += "audio-backend";
if (dictionary["QML_DEBUG"] == "no")
qtConfig += "no-qml-debug";
if (dictionary["WMF_BACKEND"] == "yes") if (dictionary["WMF_BACKEND"] == "yes")
qtConfig += "wmf-backend"; qtConfig += "wmf-backend";
@ -3623,7 +3626,6 @@ void Configure::generateConfigfiles()
if (dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL"; if (dictionary["OPENSSL"] == "no") qconfigList += "QT_NO_OPENSSL";
if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL";
if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; 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["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE";
if (dictionary["HARFBUZZ"] == "no") qconfigList += "QT_NO_HARFBUZZ"; if (dictionary["HARFBUZZ"] == "no") qconfigList += "QT_NO_HARFBUZZ";
if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES";