summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/uikit
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2016-09-02 15:42:52 +0200
committerJake Petroules <jake.petroules@qt.io>2016-09-03 09:47:49 +0000
commit4eb2feb29c5078cd3eda19e4d2331c54a35843ce (patch)
tree3f8cf9a6baf4425a8b50c34974187b08e97674c4 /mkspecs/features/uikit
parent7f801ed73a3b9e9098fafed64c21e98ae7d73dff (diff)
Remove the ability to build simulator/device targets from SUBDIRS projects
This is done because a followup patch will cause simulator_and_device builds to no longer use exclusive builds and so this feature could not work, but it is not strictly necessary anyways because users do not need to be able to do this. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: If869fbfea776751553c352c2d652edf745a3638d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/uikit')
-rw-r--r--mkspecs/features/uikit/resolve_config.prf34
1 files changed, 0 insertions, 34 deletions
diff --git a/mkspecs/features/uikit/resolve_config.prf b/mkspecs/features/uikit/resolve_config.prf
index c3ab90f45e..983dca82f4 100644
--- a/mkspecs/features/uikit/resolve_config.prf
+++ b/mkspecs/features/uikit/resolve_config.prf
@@ -32,37 +32,3 @@ macx-xcode {
} else {
addExclusiveBuilds(simulator, device)
}
-
-equals(TEMPLATE, subdirs) {
- # Prevent recursion into host_builds
- for(subdir, SUBDIRS) {
- contains($${subdir}.CONFIG, host_build) {
- $${subdir}.CONFIG += no_$${simulator.target}_target no_$${device.target}_target
-
- # Other targets which we do want to recurse into may depend on this target,
- # for example corelib depends on moc, rcc, bootstrap, etc, and other libs
- # may depend on host-tools that are needed to build the lib, so we resolve
- # the final target name and redirect it to the base target, so that the
- # dependency chain is not broken for the other targets.
-
- !isEmpty($${subdir}.target) {
- target = $$eval($${subdir}.target)
- } else {
- !isEmpty($${subdir}.file): \
- file = $$eval($${subdir}.file)
- else: !isEmpty($${subdir}.subdir): \
- file = $$eval($${subdir}.subdir)
- else: \
- file = $$subdir
-
- target = sub-$$file
- }
-
- target ~= s,[^a-zA-Z0-9_],-,
-
- $${target}-$${simulator.target}.depends = $$target
- $${target}-$${device.target}.depends = $$target
- QMAKE_EXTRA_TARGETS += $${target}-$${simulator.target} $${target}-$${device.target}
- }
- }
-}