Build tools in release mode if using -debug-and-release option

Change-Id: I2d0f60e2fcba66460f5488c6f66432b76a06f05a
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
index 4c4008e..5eee8e6 100644 (file)
--- a/src/assistant/assistant/assistant.pro
+++ b/src/assistant/assistant/assistant.pro
@@ -10,6 +10,7 @@ DESTDIR = $$QT.help.bins
 CONFIG += qt \
     warn_on \
     help
+!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 QT += widgets network help sql
 !isEmpty(QT.printsupport.name): QT += printsupport
 PROJECTNAME = Assistant

diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
index b9b6a63..33c2529 100644 (file)
--- a/src/assistant/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -3,6 +3,7 @@ TEMPLATE = app
 TARGET = qhelpconverter
 DESTDIR = $$QT.help.bins
 CONFIG += qt warn_on
+!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target

diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro
index 29a0196..b3478c5 100644 (file)
--- a/src/designer/src/designer/designer.pro
+++ b/src/designer/src/designer/designer.pro
@@ -1,11 +1,7 @@
 DESTDIR = $$QT.designer.bins
 QT += core-private widgets xml network designer-private designercomponents
 !isEmpty(QT.printsupport.name): QT += printsupport
-
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
+!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 
 INCLUDEPATH += \
     ../lib/sdk \

diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro
index 5fa4373..7902c95 100644 (file)
--- a/src/designer/src/plugins/activeqt/activeqt.pro
+++ b/src/designer/src/plugins/activeqt/activeqt.pro
@@ -5,10 +5,6 @@ CONFIG     += qaxcontainer qt warn_on plugin designer
 QT         += widgets designer-private
 
 include(../plugins.pri)
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
 
 INCLUDEPATH += $$QT.activeqt.sources/shared/ \
                $$QT.activeqt.sources/container \

diff --git a/src/designer/src/plugins/plugins.pri b/src/designer/src/plugins/plugins.pri
index 2801e5b..c0c7a8f 100644 (file)
--- a/src/designer/src/plugins/plugins.pri
+++ b/src/designer/src/plugins/plugins.pri
@@ -1,5 +1,5 @@
 CONFIG += designer
-win32|mac: CONFIG+= debug_and_release
+!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 DESTDIR = $$QT.designer.plugins/designer
 contains(TEMPLATE, ".*lib"):TARGET = $$qtLibraryTarget($$TARGET)
 

diff --git a/src/designer/src/plugins/qwebview/qwebview.pro b/src/designer/src/plugins/qwebview/qwebview.pro
index 50fc699..f5fe431 100644 (file)
--- a/src/designer/src/plugins/qwebview/qwebview.pro
+++ b/src/designer/src/plugins/qwebview/qwebview.pro
@@ -4,10 +4,6 @@ CONFIG     += qt warn_on plugin
 QT         += widgets webkit
 
 include(../plugins.pri)
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
 
 SOURCES += qwebview_plugin.cpp
 HEADERS += qwebview_plugin.h

diff --git a/src/designer/src/plugins/tools/view3d/view3d.pro b/src/designer/src/plugins/tools/view3d/view3d.pro
index 5c27ea7..82baf47 100644 (file)
--- a/src/designer/src/plugins/tools/view3d/view3d.pro
+++ b/src/designer/src/plugins/tools/view3d/view3d.pro
@@ -5,10 +5,6 @@ CONFIG  += qt warn_on plugin designer
 TARGET = view3d
 
 include(../../plugins.pri)
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
 
 SOURCES += view3d.cpp view3d_tool.cpp view3d_plugin.cpp
 HEADERS += view3d.h view3d_tool.h view3d_plugin.h view3d_global.h

diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index 7b1903f..25bf7e8 100644 (file)
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -8,10 +8,7 @@ QT += core-private widgets xml uitools-private
 CONFIG += qt warn_on
 
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
+!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 
 include(../shared/formats.pri)
 

diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro
index 6624909..2f0d4d7 100644 (file)
--- a/src/pixeltool/pixeltool.pro
+++ b/src/pixeltool/pixeltool.pro
@@ -1,11 +1,7 @@
 CONFIG  += qt warn_on
+!build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 QT += widgets network
 
-build_all:!build_pass {
-    CONFIG -= build_all
-    CONFIG += release
-}
-
 DESTDIR     = $$QT.designer.bins
 
 mac {