summaryrefslogtreecommitdiffstats
path: root/qt.pro
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-05-07 22:11:10 +0200
committerLiang Qi <liang.qi@qt.io>2017-05-08 08:35:30 +0200
commit41379a50c7b99987842cb6467c37bcc63cf0f0c8 (patch)
treebe195057400aef094d01cf77758b287c32822fb9 /qt.pro
parentf5754fd722c981ca157e7c650ecd271c9077b7cc (diff)
parenta4a7f71f37843d6f0809855ba443541faa3cdc87 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
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 373b60c9..b4730fba 100644
--- a/qt.pro
+++ b/qt.pro
@@ -46,7 +46,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 +61,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()