diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-10 07:40:26 +0100 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-10 07:50:31 +0100 |
| commit | 6da8c83d8b5465cf9b767f288d3ebfa0727085c2 (patch) | |
| tree | 2afb91b9df8da989bb4af15d4fbdf7f7ac4ef0c0 | |
| parent | 5d6d088bd777c429f691c53b0310952e39a66e83 (diff) | |
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
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | src/tools/tools.pro | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/src.pro b/src/src.pro index 7cab6c9d64..8dec49bbb0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -120,7 +120,7 @@ src_declarative.target = sub-declarative !symbian { # This creates a sub-src rule sub_src_target.CONFIG = recursive -sub_src_target.recurse = $$SRC_SUBDIRS +sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS sub_src_target.target = sub-src sub_src_target.recurse_target = QMAKE_EXTRA_TARGETS += sub_src_target diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 7c8fb47adb..25527e3101 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 = |