diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-08-31 15:51:46 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-09-01 06:38:05 +0000 |
| commit | 60935a502b5d4cf07e49be99f91c19a1c7644fd5 (patch) | |
| tree | 72adbbfd2f6eae5154a41f98c67294ee1c490d03 /src/core/core.pro | |
| parent | 1df4983268673e514d700cc4491310da7dd26a26 (diff) | |
Workaround for broken recursive qmake call
Running qmake recursively does not take .depends into account and goes
through the SUBDIRS in the order they were added. Because of this, the
qmake_extras.gypi is generated in wrong order and is not used by ninja
later on. This causes cross compilation to fail.
Task-number: QTBUG-45706
Change-Id: I476930233824d5414e35151e6b9a2695abb4e9dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/core.pro')
| -rw-r--r-- | src/core/core.pro | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 7f19a48ce..7ddad4ed6 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -15,10 +15,7 @@ core_api.depends = gyp_run core_module.file = core_module.pro core_module.depends = core_api -SUBDIRS += core_gyp_generator \ - gyp_run \ - core_api \ - core_module +SUBDIRS += core_gyp_generator !win32 { # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that @@ -32,3 +29,7 @@ SUBDIRS += core_gyp_generator \ gyp_run.depends += gyp_configure_host gyp_configure_target SUBDIRS += gyp_configure_host gyp_configure_target } + +SUBDIRS += gyp_run \ + core_api \ + core_module |