aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-10-18 17:12:15 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-25 18:54:39 +0200
commit5bd00073b814c080a70ded90472bd0e4f1d4157b (patch)
treeb2f99c6542cb3911e33b1cc0bc29f4f81a0eddc1
parenta9a306323061ae780631f0ca7d1ada7ac16dd32c (diff)
Explicitly mark subdirs as host_builds in SUBDIRS template
Allows post-processing code to exclude recursing into host_build subdirs. The alternative would be to have the SUBDIRS logic pre-parse the subdir project to check if it's a host_build, but that might have a performance impact, so it's better to leave the information explicit in the subdir project file. Change-Id: I468ceeaedce54b13bf672f82b9dcf04cc19d15e1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/src.pro2
-rw-r--r--tests/auto/auto.pro2
-rw-r--r--tools/tools.pro4
3 files changed, 8 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro
index 758482304f..fb61d49ed9 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,3 +14,5 @@ SUBDIRS += \
plugins \
imports \
qmldevtools
+
+qmldevtools.CONFIG = host_build
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 09ab868367..8809693647 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -6,6 +6,8 @@ SUBDIRS=\
cmake \
installed_cmake
+qmldevtools.CONFIG = host_build
+
!mac {
SUBDIRS += \
quick \
diff --git a/tools/tools.pro b/tools/tools.pro
index c3b1ad94ec..a1b48789b8 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -2,6 +2,10 @@ TEMPLATE = subdirs
SUBDIRS += \
qmlmin \
qmlimportscanner
+
+qmlmin.CONFIG = host_build
+qmlimportscanner.CONFIG = host_build
+
!android|android_app {
SUBDIRS += \
qml \