aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index d98947bf..ea697b07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -68,8 +68,8 @@
depends = qtbase
path = qtqa
url = ../qtqa.git
- branch = master
- status = ignore
+ branch = dev
+ status = essential
priority = 50
[submodule "qtlocation"]
depends = qtbase
@@ -127,11 +127,11 @@
status = addon
[submodule "qt3d"]
depends = qtbase
- recommends = qtdeclarative qtimageformats qtgamepad
+ recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats