Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 70 insertions, 3 deletions

diff --git a/.gitmodules b/.gitmodules
index 66b86f89..a184119b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,108 +1,175 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
+	branch = 5.4
+	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
+	branch = 5.4
+	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
+	branch = master
+	initrepo = true
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
 	url = ../qtqa.git
+	branch = master
+	initrepo = true
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
 	url = ../qtsystems.git
+	branch = dev
 [submodule "qtfeedback"]
 	path = qtfeedback
 	url = ../qtfeedback.git
+	branch = master
 [submodule "qtdocgallery"]
 	path = qtdocgallery
 	url = ../qtdocgallery.git
+	branch = master
 [submodule "qtpim"]
 	path = qtpim
 	url = ../qtpim.git
+	branch = dev
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-[submodule "qtjsondb"]
-	path = qtjsondb
-	url = ../qtjsondb.git
+	branch = 5.4
+	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
+	branch = dev
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
+	branch = 1.1
+	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
+	branch = 5.4
+	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
+	branch = 5.4
+	initrepo = true
+[submodule "qtwebengine"]
+	path = qtwebengine
+	url = ../qtwebengine.git
+	branch = 5.4
+	initrepo = true