From 4d56afd1c98c1778818a0b6abdab21cf2970afb4 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 17 Oct 2016 10:56:11 +0200
Subject: [PATCH] simplify setup of exclusive builds
the simulator_and_device CONFIG flag is now gone. this also implies that
we can set the debug_and_release and build_all flags based on the same
condition.
Change-Id: Ib16d05213e738a961c9e0b232829985b8ad64a50
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
src/core/api/core_api.pro | 4 +---
src/core/gyp_run.pro | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro
index cb9d33087..37f8885bb 100644
--- a/src/core/api/core_api.pro
+++ b/src/core/api/core_api.pro
@@ -15,9 +15,7 @@ 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(simulator_and_device): CONFIG += simulator_and_device
- qtConfig(debug_and_release): CONFIG += debug_and_release
- qtConfig(build_all): CONFIG += build_all
+ qtConfig(debug_and_release): CONFIG += debug_and_release build_all
}
DEFINES += \
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 1c62c0cfd..233737751 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -36,9 +36,7 @@ force_debug_info {
# Copy this logic from qt_module.prf so that ninja can run according
# to the same rules as the final module linking in core_module.pro.
!host_build:if(win32|mac):!macx-xcode {
- qtConfig(simulator_and_device): CONFIG += simulator_and_device
- qtConfig(debug_and_release): CONFIG += debug_and_release
- qtConfig(build_all): CONFIG += build_all
+ qtConfig(debug_and_release): CONFIG += debug_and_release build_all
}
cross_compile {
--
GitLab