diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:22:54 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-05 11:22:54 +0200 |
| commit | 8d2f6c17f9c1baca42c115ce85ea1a6cb90a0517 (patch) | |
| tree | 1c858055a5f795da4ac9d11bdde26f456c147788 /.gitmodules | |
| parent | 8325f2bde99910c26077ab4321046f42489261bb (diff) | |
| parent | 4f4de8aa1614cc6fc8d924c13509de869b4471fe (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
.gitmodules
Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index 4756d07d..4aa42ae3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -146,8 +146,8 @@ branch = 5.9.0 status = addon [submodule "qt3d"] - depends = qtdeclarative qtimageformats - recommends = qtgamepad + depends = qtdeclarative + recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = 5.9.0 @@ -295,32 +295,32 @@ depends = qtbase recommends = qtdeclarative path = qtgamepad - url = ../qtgamepad + url = ../qtgamepad.git branch = 5.9.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml - url = ../qtscxml + url = ../qtscxml.git branch = 5.9.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech - url = ../qtspeech + url = ../qtspeech.git branch = 5.9.0 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth - url = ../qtnetworkauth + url = ../qtnetworkauth.git branch = 5.9.0 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects - url = ../qtremoteobjects + url = ../qtremoteobjects.git branch = 5.9.0 status = preview |