1 files changed, 43 insertions, 26 deletions
diff --git a/.gitmodules b/.gitmodules
index 89f0ec17..ea697b07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,34 +1,27 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = wip/cmake
+	branch = dev
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
 	branch = dev
-	status = ignore
+	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
 	branch = dev
-	status = ignore
+	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
 	branch = dev
 	status = ignore
-[submodule "qtscript"]
-	depends = qtbase
-	recommends = qttools
-	path = qtscript
-	url = ../qtscript.git
-	branch = dev
-	status = ignore
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -42,7 +35,7 @@
 	path = qttools
 	url = ../qttools.git
 	branch = dev
-	status = ignore
+	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -69,14 +62,14 @@
 	path = qtrepotools
 	url = ../qtrepotools.git
 	branch = master
-	status = essential
+	status = ignore
 	project = -
 [submodule "qtqa"]
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = master
-	status = ignore
+	branch = dev
+	status = essential
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
@@ -131,26 +124,26 @@
 	path = qtwayland
 	url = ../qtwayland.git
 	branch = dev
-	status = ignore
+	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
 	url = ../qtimageformats.git
 	branch = dev
-	status = ignore
+	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
 	branch = dev
-	status = ignore
+	status = essential
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
@@ -195,14 +188,14 @@
 	path = qtandroidextras
 	url = ../qtandroidextras.git
 	branch = dev
-	status = ignore
+	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
 	branch = dev
-	status = ignore
+	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
@@ -232,12 +225,12 @@
 	branch = dev
 	status = ignore
 [submodule "qtquickcontrols2"]
-	depends = qtgraphicaleffects
-	recommends = qtimageformats
+	depends = qtdeclarative
+	recommends = qtimageformats qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
 	branch = dev
-	status = ignore
+	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
@@ -265,7 +258,7 @@
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
 	branch = dev
-	status = ignore
+	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -291,7 +284,7 @@
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
 	branch = dev
-	status = ignore
+	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -312,3 +305,27 @@
 	url = ../qtlottie.git
 	branch = dev
 	status = ignore
+[submodule "qtquicktimeline"]
+	depends = qtbase qtdeclarative
+	path = qtquicktimeline
+	url = ../qtquicktimeline
+	branch = dev
+	status = ignore
+[submodule "qtquick3d"]
+	depends = qtbase qtdeclarative qtshadertools
+	path = qtquick3d
+	url = ../qtquick3d.git
+	branch = dev
+	status = addon
+[submodule "qtshadertools"]
+	depends = qtbase
+	path = qtshadertools
+	url = ../qtshadertools.git
+	branch = dev
+	status = addon
+[submodule "qt5compat"]
+	depends = qtbase
+	path = qt5compat
+	url = ../qt5compat.git
+	branch = dev
+	status = deprecated