Updated submodules.

Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -74,7 +74,7 @@
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.7
+	branch = 5.6.0
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +82,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.7
+	branch = 5.6.0
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -96,21 +96,21 @@
 	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsystems
 	url = ../qtsystems.git
-	branch = 5.7
+	branch = dev
 	status = ignore
 [submodule "qtfeedback"]
 	depends = qtdeclarative
@@ -129,183 +129,142 @@
 	depends = qtdeclarative
 	path = qtpim
 	url = ../qtpim.git
-	branch = 5.7
+	branch = dev
 	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.7
-	status = addon
+	branch = 5.6.0
+	status = preview
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
-	recommends = qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.7
+	branch = 5.6.0
 	status = preview
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtsvg qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.7
+	branch = 5.6.0
 	status = obsolete
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.7
+	branch = 5.6.0
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.7
+	branch = 5.6.0
 	status = preview
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.7
+	branch = 5.6.0
 	status = obsolete
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.7
+	branch = 5.6.0
 	status = addon
 [submodule "qtquickcontrols2"]
-	depends = qtgraphicaleffects
+	depends = qtquickcontrols
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.7
+	branch = 5.6.0
 	status = preview
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.7
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 5.7
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 5.7
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 5.7
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad
-	branch = 5.7
-	status = preview
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml
-	branch = 5.7
-	status = preview
-[submodule "qtspeech"]
-	depends = qtbase
-	path = qtspeech
-	url = ../qtspeech
 	branch = dev
 	status = ignore

init-repository

@@ -156,10 +156,7 @@ EOF
 use Carp         qw( confess             );
 use English      qw( -no_match_vars      );
 use Getopt::Long qw( GetOptions          );
-use Cwd          qw( getcwd abs_path     );
-
-my $script_path = abs_path($0);
-$script_path =~ s,[/\\][^/\\]+$,,;
+use Cwd          qw( getcwd              );
 
 my $GERRIT_SSH_BASE
     = 'ssh://@USER@codereview.qt-project.org@PORT@/';
@@ -519,16 +516,11 @@ sub ensure_link
     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});
-    if ($^O ne "msys" && $^O ne "MSWin32") {
-        return if eval { symlink($src, $tgt) };
-    }
+    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";
-    # Make the path palatable for MSYS.
-    $src =~ s,\\,/,g;
-    $src =~ s,^(.):/,/$1/,g;
-    print SCRIPT "#!/bin/sh\nexec $src \"\$\@\"\n";
+    print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n";
     close SCRIPT;
 }
 
@@ -536,30 +528,19 @@ sub git_install_hooks
 {
     my ($self) = @_;
 
-    my $hooks = $script_path.'/qtrepotools/git-hooks';
-    return if (!-d $hooks);
+    return if (!-d 'qtrepotools/git-hooks');
 
-    my @configresult = qx(git config --list --local);
-    foreach my $line (@configresult) {
-        next if ($line !~ /submodule\.([^.=]+)\.url=/);
-        my $module = $1.'/.git';
-        if (!-d $module) {
-            open GITD, $module or die "Cannot open $module: $!\n";
-            my $gd = <GITD>;
-            close GITD;
-            chomp($gd);
-            $gd =~ s/^gitdir: // or die "Malformed .git file $module\n";
-            $module = $gd;  # We expect it to be always absolute.
-            if (open COMD, $module.'/commondir') {
-                my $cd = <COMD>;
-                chomp($cd);
-                $module .= '/'.$cd;
-                $module = abs_path($module);
-                close COMD;
-            }
-        }
-        $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg');
-        $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit');
+    # Force C locale as git submodule returns the localized string "Entering"
+    local $ENV{LC_ALL} = 'C';
+    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');
     }
 }