Merge remote-tracking branch 'origin/5.4.2' into 5.4

Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19

.commit-template

@@ -14,7 +14,7 @@
 #
 # ==[ Please wrap at 72 characters ]===================================|
 #
-# Remember to read http://wiki.qt-project.org/Commit_Policy
+# Remember to read http://wiki.qt.io/Commit_Policy
 #
 # Change log entry: If this commit adds a significant feature, fixes an
 # issue or contains a behavior change that is relevant to others,

.gitmodules

@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,12 +56,12 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
@@ -71,12 +71,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -97,12 +97,12 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
@@ -111,65 +111,65 @@
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 1.1.0
+	branch = 1.1
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.4.0
+	branch = 5.4
 	initrepo = true

README

@@ -14,7 +14,7 @@ HOW TO BUILD QT5
 
      For other platform specific requirements,
      please see section "Setting up your machine" on:
-     http://qt-project.org/wiki/Get_The_Source
+     http://wiki.qt.io/Get_The_Source
 
    Optional requirements
    ---------------------
@@ -119,9 +119,9 @@ HOW TO BUILD QT5
 
  Building Qt5 from git
  =====================
- See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
+ See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
  for more information.
- See http://qt-project.org/wiki/Qt-5 for the reference platforms.
+ See http://wiki.qt.io/Qt_5 for the reference platforms.
 
 
  Documentation
@@ -139,6 +139,6 @@ HOW TO BUILD QT5
  Running "qmake -query" will list the value of QT_INSTALL_DOCS.
 
  Information about Qt 5's documentation is located in qtbase/doc/README
- or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject
+ or in the following page: http://wiki.qt.io/Qt5DocumentationProject
 
  Note: Building the documentation is only tested on desktop platforms.

README.git

@@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT
  ========
 
  For a more in-depth description on how to build Qt5 from git,
- please see: http://qt-project.org/wiki/Building-Qt-5-from-Git
+ please see: http://wiki.qt.io/Building_Qt_5_from_Git
 
 
  Get The Submodules
@@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT
  ================================
 
  For more information on how to develop and contribute to Qt, please see:
- http://qt-project.org/wiki/Category:Developing_Qt
+ http://wiki.qt.io/Category:Developing_Qt

init-repository

@@ -383,21 +383,10 @@ sub git_clone_all_submodules
     }
 
     foreach my $module (@modules) {
-        $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module});
+        $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $subbranches{$module});
     }
 
-    if ($self->{update}) {
-        $self->exe('git', 'submodule', 'update', ($co_branch ? ('--remote', '--rebase') : ()));
-
-        foreach my $module (@modules) {
-            if (-f $module.'/.gitmodules') {
-                my $orig_cwd = getcwd();
-                chdir($module) or confess "chdir $module: $OS_ERROR";
-                $self->git_clone_all_submodules($subbases{$module}, 0, "all");
-                chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
-            }
-        }
-    } elsif ($co_branch) {
+    if ($co_branch) {
         foreach my $module (@modules) {
             my $branch = $subbranches{$module};
             die("No branch defined for submodule $module.\n") if (!defined($branch));
@@ -412,6 +401,20 @@ sub git_clone_all_submodules
             chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
         }
     }
+    if ($self->{update}) {
+        my @cmd = ('git', 'submodule', 'update', '--no-fetch');
+        push @cmd, '--remote', '--rebase' if ($co_branch);
+        $self->exe(@cmd);
+
+        foreach my $module (@modules) {
+            if (-f $module.'/.gitmodules') {
+                my $orig_cwd = getcwd();
+                chdir($module) or confess "chdir $module: $OS_ERROR";
+                $self->git_clone_all_submodules($subbases{$module}, 0, "all");
+                chdir("$orig_cwd") or confess "chdir $orig_cwd: $OS_ERROR";
+            }
+        }
+    }
 
     return;
 }
@@ -437,7 +440,7 @@ sub git_add_remotes
 
 sub git_clone_one_submodule
 {
-    my ($self, $submodule, $repo_basename) = @_;
+    my ($self, $submodule, $repo_basename, $branch) = @_;
 
     my $alternates            = $self->{ 'alternates'        };
     my $mirror_url            = $self->{ 'mirror-url'        };
@@ -473,20 +476,31 @@ sub git_clone_one_submodule
 
     my $do_clone = (! -e "$submodule/.git");
     if ($do_clone) {
-        $self->exe('git', 'clone', @reference_args, ($mirror ? $mirror : $url), $submodule);
+        push @reference_args, '--branch', $branch if ($branch);
+        $self->exe('git', 'clone', @reference_args,
+                   ($mirror ? $mirror : $url), $submodule);
     }
 
     my $orig_cwd = getcwd();
     chdir($submodule) or confess "chdir $submodule: $OS_ERROR";
 
-    $self->exe('git', 'config', 'remote.origin.url', $url);
     if ($mirror) {
+        # This is only for the user's convenience - we make no use of it.
         $self->exe('git', 'config', 'remote.mirror.url', $mirror);
         $self->exe('git', 'config', 'remote.mirror.fetch', '+refs/heads/*:refs/remotes/mirror/*');
     }
 
     if (!$do_clone && $self->{update}) {
-        $self->exe('git', 'fetch', ($mirror ? $mirror : $url));
+        # If we didn't clone, fetch from the right location. We always update
+        # the origin remote, so that submodule update --remote works.
+        $self->exe('git', 'config', 'remote.origin.url', ($mirror ? $mirror : $url));
+        $self->exe('git', 'fetch', 'origin');
+    }
+
+    if (!($do_clone || $self->{update}) || $mirror) {
+        # Leave the origin configured to the canonical URL. It's already correct
+        # if we cloned/fetched without a mirror; otherwise it may be anything.
+        $self->exe('git', 'config', 'remote.origin.url', $url);
     }
 
     my $template = getcwd()."/../.commit-template";