diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-10 06:40:26 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-10 06:50:31 (GMT) |
| commit | 6da8c83d8b5465cf9b767f288d3ebfa0727085c2 (patch) | |
| tree | 2afb91b9df8da989bb4af15d4fbdf7f7ac4ef0c0 /src/src.pro | |
| parent | 5d6d088bd777c429f691c53b0310952e39a66e83 (diff) | |
| download | Qt-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/src.pro')
| -rw-r--r-- | src/src.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro index 7cab6c9..8dec49b 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 |