summaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-08-08 13:49:40 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-15 19:01:35 +0000
commit5a0dc401fad4adccbd975392295d2c77d936900f (patch)
treefd8fc28ab6916fd2eae8eac855841c4086414330 /.gitmodules
parentd5967be09493384ce517a2307fec916b54820b0a (diff)
Remove QtWebKit and QtWebKit examples from Qt 5
They are subject to a separate release. Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules18
1 files changed, 1 insertions, 17 deletions
diff --git a/.gitmodules b/.gitmodules
index 9ea5c3b2..b4988927 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 = 5.9
@@ -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 = 5.9
- status = obsolete
- project = WebKit.pro
- priority = 20
-[submodule "qtwebkit-examples"]
- depends = qtwebkit qttools
- path = qtwebkit-examples
- url = ../qtwebkit-examples.git
- branch = 5.9
- status = obsolete
[submodule "qtqa"]
depends = qtbase
path = qtqa
@@ -238,7 +223,6 @@
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
- serialize = qtwebkit
path = qtwebengine
url = ../qtwebengine.git
branch = 5.9