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

@@ -70,12 +70,6 @@ B<Global options:>
 Force initialization (even if the submodules are already checked out).
 
 
-=item --force-hooks
-
-Force initialization of hooks (even if there are already hooks in checked out
-submodules).
-
-
 =item --quiet, -q
 
 Be quiet.  Will exit cleanly if the repository is already initialized.
@@ -206,6 +200,7 @@ my %PROTOCOLS = (
 my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt3d
     qt5
+    qlalr
     qtactiveqt
     qtandroidextras
     qtbase
@@ -236,7 +231,6 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
-    qtwebsockets
     qtwinextras
     qtx11extras
     qtxmlpatterns
@@ -249,7 +243,6 @@ my @DEFAULT_REPOS = qw(
     qtconnectivity
     qtdeclarative
     qtdoc
-    qtenginio
     qtgraphicaleffects
     qtimageformats
     qtmacextras
@@ -265,7 +258,6 @@ my @DEFAULT_REPOS = qw(
     qtsvg
     qttools
     qttranslations
-    qtwebsockets
     qtwebkit
     qtwebkit-examples
     qtwinextras
@@ -318,7 +310,6 @@ sub parse_arguments
         'codereview-username' => "",
         'detach-alternates'   => 0 ,
         'force'               => 0 ,
-        'force-hooks'         => 0 ,
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
         'protocol'            => "",
@@ -331,8 +322,7 @@ sub parse_arguments
         'alternates=s'      =>  \$self->{qw{ alternates        }},
         'codereview-username=s' => \$self->{qw{ codereview-username }},
         'copy-objects'      =>  \$self->{qw{ detach-alternates }},
-        'force|f'           =>  \$self->{qw{ force             }},
-        'force-hooks'       =>  \$self->{qw{ force-hooks       }},
+        'force'             =>  \$self->{qw{ force             }},
         'ignore-submodules' =>  \$self->{qw{ ignore-submodules }},
         'mirror=s'          =>  \$self->{qw{ mirror-url        }},
         'quiet'             =>  \$self->{qw{ quiet             }},
@@ -584,38 +574,6 @@ sub git_clone_one_submodule
     return;
 }
 
-sub ensure_link
-{
-    my ($self, $src, $tgt) = @_;
-    return if (!$self->{'force-hooks'} and -f $tgt);
-    unlink($tgt); # In case we have a dead symlink or pre-existing hook
-    print "Aliasing $src\n      as $tgt ...\n" if (!$self->{quiet});
-    return if eval { symlink($src, $tgt) };
-    # Windows doesn't do (proper) symlinks. As the post_commit script needs
-    # them to locate itself, we write a forwarding script instead.
-    open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n";
-    print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n";
-    close SCRIPT;
-}
-
-sub git_install_hooks
-{
-    my ($self) = @_;
-
-    return if (!-d 'qtrepotools/git-hooks');
-
-    chomp(my @modules = `git submodule foreach :`);
-    push @modules, "";
-    for my $module (@modules) {
-        $module =~ s,^Entering \'([^\']+)\'$,$1/,;
-        my $rel = $module;
-        $rel =~ s,[^/]+,..,g;
-        $rel .= "../../qtrepotools/git-hooks/";
-        $self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg');
-        $self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit');
-    }
-}
-
 sub run
 {
     my ($self) = @_;
@@ -637,8 +595,6 @@ sub run
 
     $self->git_add_remotes('qt5');
 
-    $self->git_install_hooks;
-
     return;
 }
 

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,18 +53,16 @@ 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)
 addModule(qtquickcontrols, qtdeclarative)
-addModule(qtmultimedia, qtbase, qtdeclarative)
+addModule(qtmultimedia, qtdeclarative)
 addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
 addModule(qt3d, qtdeclarative)
@@ -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)