summaryrefslogtreecommitdiffstats
path: root/.gitmodules
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 /.gitmodules
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 '.gitmodules')
-rw-r--r--.gitmodules2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 4aa42ae3..97a74435 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