Updated submodules.

Change-Id: Ib5594043bc3bcf735aedfaa1871de2c116bbe715
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

.commit-template

@@ -4,14 +4,17 @@
 # ==[ 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
@@ -19,8 +22,7 @@
 # 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. Try to integrate it into the flow of the commit message
-# to avoid redundancy.
+# empty newline.
 # 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,6 +28,9 @@
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
+[submodule "qlalr"]
+	path = qlalr
+	url = ../qlalr.git
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
@@ -100,6 +103,3 @@
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-[submodule "qtwebsockets"]
-	path = qtwebsockets
-	url = ../qtwebsockets.git

init-repository

@@ -200,6 +200,7 @@ my %PROTOCOLS = (
 my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt3d
     qt5
+    qlalr
     qtactiveqt
     qtandroidextras
     qtbase
@@ -230,7 +231,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
-    qtwebsockets
     qtwinextras
     qtx11extras
     qtxmlpatterns
@@ -258,7 +258,6 @@ my @DEFAULT_REPOS = qw(
     qtsvg
     qttools
     qttranslations
-    qtwebsockets
     qtwebkit
     qtwebkit-examples
     qtwinextras

qt.pro

@@ -3,7 +3,6 @@ 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
 
@@ -54,13 +53,11 @@ 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)
@@ -73,7 +70,7 @@ addModule(qtjsondb, qtdeclarative)
 addModule(qtsystems, qtbase, qtdeclarative)
 addModule(qtlocation, qtbase, qt3d qtsystems qtmultimedia)
 addModule(qtsensors, qtbase, qtdeclarative)
-addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
+addModule(qtconnectivity, qtbase, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative, qtjsondb)
 addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro)
@@ -87,7 +84,6 @@ 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)