summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-06 19:21:59 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-07 19:40:36 +0100
commitf65308d3713a49278d28281a4065c0b84b49df7c (patch)
tree80d840e43940ba2641b6eb7c22253a25253b57c6 /.gitmodules
parent82cea365312698b0aae777b8affaa99544b4bc05 (diff)
parentad3c5195259321ab8420df0dee1a9b14cfc4811b (diff)
Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects and qtwebengine. Conflicts: .gitmodules qtremoteobjects qtwebengine Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules16
1 files changed, 11 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index 625289c3..9fbe0308 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,7 +11,7 @@
status = addon
[submodule "qtdeclarative"]
depends = qtbase
- recommends = qtxmlpatterns
+ recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = dev
@@ -100,7 +100,7 @@
status = addon
[submodule "qtsensors"]
depends = qtbase
- recommends = qtdeclarative qtsvg
+ recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = dev
@@ -160,7 +160,7 @@
status = addon
[submodule "qtquick1"]
depends = qtscript
- recommends = qtxmlpatterns
+ recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev
@@ -237,7 +237,7 @@
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
- recommends = qtlocation
+ recommends = qtlocation qttools
path = qtwebengine
url = ../qtwebengine.git
branch = dev
@@ -296,7 +296,7 @@
path = qtgamepad
url = ../qtgamepad
branch = dev
- status = preview
+ status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
@@ -317,3 +317,9 @@
url = ../qtnetworkauth
branch = dev
status = preview
+[submodule "qtremoteobjects"]
+ depends = qtbase
+ path = qtremoteobjects
+ url = ../qtremoteobjects
+ branch = dev
+ status = preview