summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-05-26 10:29:43 +0200
committerLiang Qi <liang.qi@qt.io>2017-05-26 10:29:43 +0200
commit1f15ce005f9e7649203e0021efe39e29c4554623 (patch)
tree948db2faf06056140745d51c740364c018a3f275 /qt.pro
parent613242b2bfd0da4afae134615c18fef76c5b54ac (diff)
parent4d6b04db3c1711e5f60b3d2421ed27eb5ffcb85f (diff)
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Conflicts: .gitmodules Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
Diffstat (limited to 'qt.pro')
-rw-r--r--qt.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/qt.pro b/qt.pro
index fad0bcf7..af16c6df 100644
--- a/qt.pro
+++ b/qt.pro
@@ -48,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)
@@ -62,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()