summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-10-17 10:56:11 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-10-21 09:27:41 +0000
commit4d56afd1c98c1778818a0b6abdab21cf2970afb4 (patch)
treea1d8787b6b6682d3f40cbd1f1f953cd609bc7f39 /src/core/gyp_run.pro
parent4894406d111d7c7c0fb06b56e52706a20b35d0b3 (diff)
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>
Diffstat (limited to 'src/core/gyp_run.pro')
-rw-r--r--src/core/gyp_run.pro4
1 files changed, 1 insertions, 3 deletions
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 {