diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-09 10:33:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-14 07:24:32 +0000 |
| commit | d615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch) | |
| tree | 0d809a18ab4cc1295ec473d3819b56d5ff0900df /.gitmodules | |
| parent | bded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff) | |
| parent | bbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules index 139b3d29..0def5d8d 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 @@ -146,8 +146,8 @@ branch = dev status = addon [submodule "qt3d"] - depends = qtdeclarative qtimageformats - recommends = qtgamepad + depends = qtdeclarative + recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = dev @@ -295,33 +295,34 @@ depends = qtbase recommends = qtdeclarative path = qtgamepad - url = ../qtgamepad + url = ../qtgamepad.git branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml - url = ../qtscxml + url = ../qtscxml.git branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech - url = ../qtspeech + url = ../qtspeech.git branch = dev status = addon [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth - url = ../qtnetworkauth + url = ../qtnetworkauth.git branch = dev status = addon [submodule "qtremoteobjects"] depends = qtbase + recommends = qtdeclarative path = qtremoteobjects - url = ../qtremoteobjects + url = ../qtremoteobjects.git branch = dev status = preview [submodule "qtwebglplugin"] |