Commit 4d56afd1 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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: default avatarJake Petroules <jake.petroules@qt.io>
parent 4894406d
No related merge requests found
Showing with 2 additions and 6 deletions
......@@ -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 += \
......
......@@ -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 {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment