Merge remote-tracking branch 'gerrit/stable' into release

33 files changed, 54 insertions, 10 deletions

diff --git a/.commit-template b/.commit-template
index 813ca689..3edc08db 100644
--- a/.commit-template
+++ b/.commit-template
@@ -12,9 +12,6 @@
 # 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
diff --git a/.gitmodules b/.gitmodules
index 4a1c3d05..0d6fb1aa 100644
--- a/.gitmodules
+++ b/.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
@@ -103,3 +100,6 @@
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
+[submodule "qtwebsockets"]
+	path = qtwebsockets
+	url = ../qtwebsockets.git
diff --git a/init-repository b/init-repository
index 272193d8..b38a07e9 100755
--- a/init-repository
+++ b/init-repository
@@ -70,6 +70,12 @@ 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.
@@ -200,7 +206,6 @@ my %PROTOCOLS = (
 my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qt3d
     qt5
-    qlalr
     qtactiveqt
     qtandroidextras
     qtbase
@@ -231,6 +236,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
     qtwayland
     qtwebkit
     qtwebkit-examples
+    qtwebsockets
     qtwinextras
     qtx11extras
     qtxmlpatterns
@@ -243,6 +249,7 @@ my @DEFAULT_REPOS = qw(
     qtconnectivity
     qtdeclarative
     qtdoc
+    qtenginio
     qtgraphicaleffects
     qtimageformats
     qtmacextras
@@ -258,6 +265,7 @@ my @DEFAULT_REPOS = qw(
     qtsvg
     qttools
     qttranslations
+    qtwebsockets
     qtwebkit
     qtwebkit-examples
     qtwinextras
@@ -310,6 +318,7 @@ sub parse_arguments
         'codereview-username' => "",
         'detach-alternates'   => 0 ,
         'force'               => 0 ,
+        'force-hooks'         => 0 ,
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
         'protocol'            => "",
@@ -322,7 +331,8 @@ sub parse_arguments
         'alternates=s'      =>  \$self->{qw{ alternates        }},
         'codereview-username=s' => \$self->{qw{ codereview-username }},
         'copy-objects'      =>  \$self->{qw{ detach-alternates }},
-        'force'             =>  \$self->{qw{ force             }},
+        'force|f'           =>  \$self->{qw{ force             }},
+        'force-hooks'       =>  \$self->{qw{ force-hooks       }},
         'ignore-submodules' =>  \$self->{qw{ ignore-submodules }},
         'mirror=s'          =>  \$self->{qw{ mirror-url        }},
         'quiet'             =>  \$self->{qw{ quiet             }},
@@ -574,6 +584,38 @@ 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) = @_;
@@ -595,6 +637,8 @@ sub run
 
     $self->git_add_remotes('qt5');
 
+    $self->git_install_hooks;
+
     return;
 }
 
diff --git a/qlalr b/qlalr
deleted file mode 160000
-Subproject a803a5c2142cd93a33ab5d3e549d794b1096bf0
diff --git a/qt.pro b/qt.pro
index f9344690..0711e3e3 100644
--- a/qt.pro
+++ b/qt.pro
@@ -54,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)
@@ -71,7 +73,7 @@ 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 qtmultimedia qtsensors, WebKit.pro)
@@ -85,6 +87,7 @@ 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)
diff --git a/qtactiveqt b/qtactiveqt
-Subproject b21d397336d52d034ab6db699c26bf3918fe81e
+Subproject eaf2383f13aa4f7aea25b4be86096f0fa945461
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 09c0570ce76576074fa0dd98276d959fe028731
+Subproject 743ca4560fc99b91044f8ab01941dc89edeb00f
diff --git a/qtbase b/qtbase
-Subproject 2b0f02aa5cc0f7d1b460d2d324d5d08c6f6d61b
+Subproject c92fead4333683f7b13fc730203c67834aa478e
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 9902dfdbc44934ce2e8072bc237ca8cdbfb3402
+Subproject 2e0f7adbe4257cc3914db0b4a9e6f42cb12f948
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 60d66bea87b72e66e7c466e1c27f966762e1fd5
+Subproject fc5314f96990148a7c32b988caf53c5db92b2b4
diff --git a/qtdoc b/qtdoc
-Subproject 19245e88bae96a8f3757c8db8e5f3104eae12db
+Subproject bd11d74a66db4e72e8f1266c7eae833a4fcd5f4
diff --git a/qtenginio b/qtenginio
-Subproject 136ee0aa5dc2276699018bc743e758ea9ffda12
+Subproject 85f3fd0456ebb5f16820f1c88647064f24106e5
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 1fbbe87e6d5dc84bff70bd90b71d07f9982a8bc
+Subproject 9b1883d2e90dd6ef92374d21e490a3de1c8330b
diff --git a/qtimageformats b/qtimageformats
-Subproject dde6daeccdf0a3f8d49fe1777b49046576b1221
+Subproject 554d617762c86964dfa074074304993ccdfbe2c
diff --git a/qtlocation b/qtlocation
-Subproject 2ba9fd5550eb7766c20b3a61679e88ec4a6c8a5
+Subproject 400c7fa8e767c65aab4b8a1d5161b5259080cec
diff --git a/qtmacextras b/qtmacextras
-Subproject 39ccd598cd36b01e3b876f55030c639a9bc3968
+Subproject 3d7f132db4f91eccce1987c2860834a0b88d392
diff --git a/qtmultimedia b/qtmultimedia
-Subproject db7f7cc5654ddec60297259bc9f86f5f777749c
+Subproject a7b8872cd5de1908bb2daa08a32afb5bff879ac
diff --git a/qtqa b/qtqa
-Subproject afafbfafd97dadc1433ec132e8891dc453720d4
+Subproject e4fe8a254c29cbf2ed657aee86ca9440e15f533
diff --git a/qtquick1 b/qtquick1
-Subproject 07d8ce32b1112dcb590c793ee51cb713e514011
+Subproject c56f5d8848ce03cc6667804f815de47d2d8221f
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 1c54d411ad6e98c3779a412750aec8b93d58787
+Subproject 59a6cb0b5ebdd5eae0152a9b34c1504006a7cce
diff --git a/qtrepotools b/qtrepotools
-Subproject 0f80e8a8fa001d0e36b313ae4b8696eadd594a5
+Subproject dc282c7db73967f37fe970dddc4beee926c3227
diff --git a/qtscript b/qtscript
-Subproject f89d64ca722acf4a1a38c5e136bb01eff252597
+Subproject 08d9ef715265d33f4cf04693b0787fd75994dc4
diff --git a/qtsensors b/qtsensors
-Subproject 9a8319a39a06d6cf3163978301d650b8f3558c6
+Subproject 2a503c28e4b9c9c05ee69e115f3530bb764844e
diff --git a/qtserialport b/qtserialport
-Subproject 336fbee2e34c7eaf48550105d542cad1979c668
+Subproject 4a634dde17361f41b83c92f562714daf8aa5124
diff --git a/qtsvg b/qtsvg
-Subproject ae68091e0d6023410bc657cf54e7fa9b6c8bbcc
+Subproject bacf4858ce11074d4be94aab45c67c467613419
diff --git a/qttools b/qttools
-Subproject 80c6a5ea7f827647cc58037e1d1cf4bbf30e1fb
+Subproject 8e55ee3f610315f8fc346020f40211e0030bceb
diff --git a/qttranslations b/qttranslations
-Subproject b26b3e6c713b6f3b6f5b9b6a010763724c69b0e
+Subproject df32d9208644adb3a7ef55c3ff8461a4fe15602
diff --git a/qtwebkit b/qtwebkit
-Subproject a1b801fc98ccda988df41e08dc70fdbd50ecb51
+Subproject 0546c8656a3728bf4375da39027e096beba4f11
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject cb8ed9694b850a429a93490beaa6462d9f3b8ea
+Subproject c9d13139b65818785f218cc96d136d33591ca2f
diff --git a/qtwebsockets b/qtwebsockets
new file mode 160000
+Subproject a69877e8c675c0ad69b6fcfa00c57433e9b0c94
diff --git a/qtwinextras b/qtwinextras
-Subproject 8e497a7fc6fc66f480a78dee705ada67c24ac49
+Subproject d33a4550847deb5217e6fb9fb66c47d2a50780a
diff --git a/qtx11extras b/qtx11extras
-Subproject dd7eec92e7a5f4383783cc161f638867572dc20
+Subproject 947361a7dc8db093d0b8e1ec5ac953470a18025
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db
+Subproject d25091bb8b52455e415f8147a9100094c489a04