diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-12-21 17:07:59 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-01-16 10:24:09 +0000 |
| commit | 685ce77cb6c696fb062ff4ab967b6ae553821a2d (patch) | |
| tree | a9f19861856da4b8812de6db4d2c365a6cb4e53f | |
| parent | 2620f6baa55dc13d65ea0d4b09a23ddfae580279 (diff) | |
Fix qmake recursive call
Change order of parsing buildtools.pro to avoid
missing toolchain generated files.
Change-Id: I40456cbf38573903c119313d036e4c2aea039b16
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/buildtools/buildtools.pro | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/buildtools/buildtools.pro b/src/buildtools/buildtools.pro index 8985bbb25..1366d18d5 100644 --- a/src/buildtools/buildtools.pro +++ b/src/buildtools/buildtools.pro @@ -1,12 +1,5 @@ TEMPLATE = subdirs -ninja.file = ninja.pro -SUBDIRS += ninja - -gn.file = gn.pro -gn.depends = ninja -SUBDIRS += gn - linux { # configure_host.pro and configure_target.pro are phony pro files that # extract things like compiler and linker from qmake. @@ -18,3 +11,10 @@ linux { SUBDIRS += configure_host configure_target } + +ninja.file = ninja.pro +SUBDIRS += ninja + +gn.file = gn.pro +gn.depends = ninja +SUBDIRS += gn |