aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
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