diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-09 10:33:56 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-14 07:24:32 +0000 |
commit | d615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch) | |
tree | 0d809a18ab4cc1295ec473d3819b56d5ff0900df /qt.pro | |
parent | bded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff) | |
parent | bbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
Diffstat (limited to 'qt.pro')
-rw-r--r-- | qt.pro | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -28,6 +28,8 @@ QT_SKIP_MODULES = # This is a bit hacky, but a proper implementation is not worth it. args = $$QMAKE_EXTRA_ARGS +contains(args, -redo): \ + args += $$cat($$OUT_PWD/config.opt, lines) for (ever) { isEmpty(args): break() a = $$take_first(args) @@ -46,7 +48,8 @@ for (ever) { modules = $$sort_depends(modules, module., .depends .recommends .serialize) modules = $$reverse(modules) for (mod, modules) { - equals(module.$${mod}.qt, false): \ + project = $$eval(module.$${mod}.project) + equals(project, -): \ next() deps = $$eval(module.$${mod}.depends) @@ -60,7 +63,6 @@ for (mod, modules) { !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \ next() - project = $$eval(module.$${mod}.project) isEmpty(project) { !exists($$mod/$${mod}.pro): \ next() |