summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-03-31 13:27:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-04-02 15:05:38 +0200
commit887b236e54354c53cf2714197e017488fc788b7a (patch)
treedb3438329409d4b857aa819844ab80430faf100e
parent3394cde4e89463ba49af379b89863c7731c4b4ac (diff)
Fixup build_all
Don't build both release and debug, when build_all is not requested. Change-Id: I4e0458ba460a9c62b32161ea588955b2f539a37e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--src/core/api/core_api.pro3
-rw-r--r--src/core/gn_run.pro3
-rw-r--r--src/pdf/gn_run.pro3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index 6b4291cb7..d53fb6942 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -14,7 +14,8 @@ CONFIG -= create_prl
# Copy this logic from qt_module.prf so that the intermediate library can be
# created to the same rules as the final module linking in core_module.pro.
!host_build:if(win32|mac):!macx-xcode {
- qtConfig(debug_and_release): CONFIG += debug_and_release build_all
+ qtConfig(debug_and_release): CONFIG += debug_and_release
+ qtConfig(build_all): CONFIG += build_all
}
DEFINES += \
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index 377d8363c..8b16d7c59 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -4,7 +4,8 @@ QT_FOR_CONFIG += buildtools-private webenginecore-private core-private gui-priva
TEMPLATE = aux
-qtConfig(debug_and_release): CONFIG += debug_and_release build_all
+qtConfig(debug_and_release): CONFIG += debug_and_release
+qtConfig(build_all): CONFIG += build_all
qtConfig(webengine-system-ninja) {
QT_TOOL.ninja.binary = ninja
diff --git a/src/pdf/gn_run.pro b/src/pdf/gn_run.pro
index 7fd4d4ffc..87070fd81 100644
--- a/src/pdf/gn_run.pro
+++ b/src/pdf/gn_run.pro
@@ -3,7 +3,8 @@ QT_FOR_CONFIG += buildtools-private
TEMPLATE = aux
-qtConfig(debug_and_release): CONFIG += debug_and_release build_all
+qtConfig(debug_and_release): CONFIG += debug_and_release
+qtConfig(build_all): CONFIG += build_all
qtConfig(webengine-system-ninja) {
QT_TOOL.ninja.binary = ninja