Updated submodules.

Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a

.commit-template

@@ -4,17 +4,14 @@
 # ==[ Details: Describe what changed and explain why it changed ]======|
 
 
-# ==[ Footers: Uncomment and edit where applicable ]===================|
-#
 # Change log entry (see below for instructions).
 #[ChangeLog][][]
+
+# ==[ Footers: Uncomment and edit where applicable ]===================|
 #
 # One task per entry. Remember space after colon.
 #Task-number: 
 #
-# Solicit reviewers. They still need to use the Gerrit frontend.
-#Reviewed-by: 
-#
 # ==[ Please wrap at 72 characters ]===================================|
 #
 # Remember to read http://wiki.qt-project.org/Commit_Policy
@@ -22,7 +19,8 @@
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,
 # add a change log entry. It can be multiple lines long and ends with an
-# empty newline.
+# empty newline. Try to integrate it into the flow of the commit message
+# to avoid redundancy.
 # Use the module name to indicate the area of the change e.g. [QtCore].
 # Optionally specify a class or subtopic [QtNetwork][QSslSocket].
 # Other common tags are: [General], [Important Behavior Changes],

.gitmodules

@@ -28,9 +28,6 @@
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-[submodule "qlalr"]
-	path = qlalr
-	url = ../qlalr.git
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
@@ -100,3 +97,9 @@
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
+[submodule "qtenginio"]
+	path = qtenginio
+	url = ../qtenginio.git
+[submodule "qtwebsockets"]
+	path = qtwebsockets
+	url = ../qtwebsockets.git

init-repository

@@ -200,7 +200,6 @@ my %PROTOCOLS = (
 my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt3d
     qt5
-    qlalr
     qtactiveqt
     qtandroidextras
     qtbase
@@ -208,6 +207,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtdeclarative
     qtdoc
     qtdocgallery
+    qtenginio
     qtfeedback
     qtgraphicaleffects
     qtimageformats
@@ -230,6 +230,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
+    qtwebsockets
     qtwinextras
     qtx11extras
     qtxmlpatterns
@@ -257,6 +258,7 @@ my @DEFAULT_REPOS = qw(
     qtsvg
     qttools
     qttranslations
+    qtwebsockets
     qtwebkit
     qtwebkit-examples
     qtwinextras

qt.pro

@@ -3,6 +3,7 @@ cache(, super)
 
 CONFIG += build_pass   # hack to disable the .qmake.super auto-add
 load(qt_build_config)
+CONFIG -= build_pass   # unhack, as it confuses Qt Creator
 
 TEMPLATE      = subdirs
 
@@ -53,11 +54,13 @@ defineTest(addModule) {
 # users responsibility to ensure that all needed dependencies exist, or
 # it may not build.
 
+ANDROID_EXTRAS =
+android: ANDROID_EXTRAS = qtandroidextras
+
 addModule(qtbase)
 addModule(qtandroidextras, qtbase)
 addModule(qtmacextras, qtbase)
 addModule(qtx11extras, qtbase)
-addModule(qlalr, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
@@ -70,19 +73,21 @@ addModule(qtjsondb, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
 addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtbase, qtdeclarative)
+addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
-addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro)
+addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
 addModule(qtgraphicaleffects, qtdeclarative)
-addModule(qtscript, qtbase)
-addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools)
+addModule(qtscript, qtbase, qttools)
+addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
 addModule(qtdocgallery, qtdeclarative, qtjsondb)
 !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative)
 addModule(qtserialport, qtbase)
+addModule(qtenginio, qtdeclarative)
+addModule(qtwebsockets, qtbase, qtdeclarative)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)