summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--qt.pro4
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index b4d74220..9e391985 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,7 +68,7 @@
url = ../qtrepotools.git
branch = master
status = essential
- qt = false
+ project = -
[submodule "qtwebkit"]
depends = qtbase
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
diff --git a/qt.pro b/qt.pro
index bf510fab..825e6b51 100644
--- a/qt.pro
+++ b/qt.pro
@@ -29,7 +29,8 @@ QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
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)
@@ -43,7 +44,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()