Merge remote-tracking branch 'origin/5.6.0' into 5.6

Conflicts:
	.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03

1 files changed, 42 insertions, 33 deletions

diff --git a/.gitmodules b/.gitmodules
index 49c27df9..2b223c8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,72 +2,72 @@
 	path = qtbase
 	url = ../qtbase.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 	priority = 40
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
 	branch = master
-	initrepo = true
+	status = essential
 	qt = false
 [submodule "qtwebkit"]
 	depends = qtbase
@@ -75,6 +75,7 @@
 	path = qtwebkit
 	url = ../qtwebkit.git
 	branch = 5.6
+	status = obsolete
 	project = WebKit.pro
 	priority = 20
 [submodule "qtwebkit-examples"]
@@ -82,12 +83,13 @@
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
 	branch = 5.6
+	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
 	branch = master
-	initrepo = true
+	status = essential
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
@@ -95,167 +97,174 @@
 	path = qtlocation
 	url = ../qtlocation.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsystems
 	url = ../qtsystems.git
 	branch = dev
+	status = ignore
 [submodule "qtfeedback"]
 	depends = qtdeclarative
 	recommends = qtmultimedia
 	path = qtfeedback
 	url = ../qtfeedback.git
 	branch = master
+	status = ignore
 [submodule "qtdocgallery"]
 	depends = qtdeclarative
 	path = qtdocgallery
 	url = ../qtdocgallery.git
 	branch = master
+	status = ignore
 [submodule "qtpim"]
 	depends = qtdeclarative
 	path = qtpim
 	url = ../qtpim.git
 	branch = dev
+	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
 	branch = 5.6
-	initrepo = true
+	status = preview
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
 	path = qt3d
 	url = ../qt3d.git
 	branch = 5.6
-	initrepo = true
+	status = preview
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtsvg qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
 	branch = 5.6
+	status = obsolete
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
 	branch = 5.6
-	initrepo = true
+	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
 	branch = 5.6
+	status = preview
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
 	branch = 5.6
-	initrepo = true
+	status = obsolete
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
 	branch = 5.6
-	initrepo = true
+	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtquickcontrols
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
 	branch = 5.6
-	initrepo = true
+	status = preview
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.6
+	branch = dev
+	status = ignore