summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-08-24 09:12:33 +0200
committerLiang Qi <liang.qi@qt.io>2017-08-24 09:12:33 +0200
commitebf8aa15e67caacab514ea93782ff0783d60af2d (patch)
treeecbaf2c3669d1de878ead56e8b44a83bff65efdc /.gitmodules
parentd18d7aaa40cfd92279bec558e980ff6c58c49340 (diff)
parentdfaabde5dcbdecf24d24dce4172c976687085bb6 (diff)
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .gitmodules coin/platform_configs/qt5.txt coin/provisioning/common/system_updates.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules22
1 files changed, 3 insertions, 19 deletions
diff --git a/.gitmodules b/.gitmodules
index 0def5d8d..b5637093 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,7 +38,7 @@
status = essential
[submodule "qttools"]
depends = qtbase
- recommends = qtdeclarative qtactiveqt qtwebkit
+ recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = dev
@@ -69,21 +69,6 @@
branch = master
status = essential
project = -
-[submodule "qtwebkit"]
- depends = qtbase
- recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
- path = qtwebkit
- url = ../qtwebkit.git
- branch = dev
- status = obsolete
- project = WebKit.pro
- priority = 20
-[submodule "qtwebkit-examples"]
- depends = qtwebkit qttools
- path = qtwebkit-examples
- url = ../qtwebkit-examples.git
- branch = dev
- status = obsolete
[submodule "qtqa"]
depends = qtbase
path = qtqa
@@ -146,8 +131,8 @@
branch = dev
status = addon
[submodule "qt3d"]
- depends = qtdeclarative
- recommends = qtimageformats qtgamepad
+ depends = qtbase
+ recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = dev
@@ -238,7 +223,6 @@
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
- serialize = qtwebkit
path = qtwebengine
url = ../qtwebengine.git
branch = dev