summaryrefslogtreecommitdiffstats
path: root/src/tools/tools.pro
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-10 06:40:26 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-10 06:50:31 (GMT)
commit6da8c83d8b5465cf9b767f288d3ebfa0727085c2 (patch)
tree2afb91b9df8da989bb4af15d4fbdf7f7ac4ef0c0 /src/tools/tools.pro
parent5d6d088bd777c429f691c53b0310952e39a66e83 (diff)
downloadQt-6da8c83d8b5465cf9b767f288d3ebfa0727085c2.zip
Qt-6da8c83d8b5465cf9b767f288d3ebfa0727085c2.tar.gz
Qt-6da8c83d8b5465cf9b767f288d3ebfa0727085c2.tar.bz2
Fix failing sub-src target
sub-src was iterating over SRC_SUBDIRS and not SUBDIRS. So, when the tools were refactored out to handle distributed builds of host tools with Electric Cloud, these tools were not included in the iteration. Adding $$TOOLS_SUBDIRS to the recurse fixes this. Also avoid setting dependencies for non-ordered builds Reviewed-by: Jason McDonald
Diffstat (limited to 'src/tools/tools.pro')
-rw-r--r--src/tools/tools.pro10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 7c8fb47..25527e3 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -20,10 +20,12 @@ src_tools_uic3.target = sub-uic3
src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc
src_tools_idc.target = sub-idc
-# Set dependencies for each subdir
-src_tools_moc.depends = src_tools_bootstrap
-src_tools_rcc.depends = src_tools_bootstrap
-src_tools_uic.depends = src_tools_bootstrap
+!wince*:!symbian:!ordered {
+ # Set dependencies for each subdir
+ src_tools_moc.depends = src_tools_bootstrap
+ src_tools_rcc.depends = src_tools_bootstrap
+ src_tools_uic.depends = src_tools_bootstrap
+}
# Special handling, depending on type of project, if it used debug/release or only has one configuration
EXTRA_DEBUG_TARGETS =