Updated submodules.

Change-Id: Iad4d8ba6850bd7e47c9841268e3e09408a4c9c18
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -74,7 +74,7 @@
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +82,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -96,14 +96,14 @@
 	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -136,130 +136,130 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = preview
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtsvg qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = obsolete
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = preview
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = deprecated
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtquickcontrols
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.6.2
+	branch = 5.6.1
 	status = preview
 [submodule "qtpurchasing"]
 	depends = qtbase

LICENSE.GPLv2

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt Toolkit under the terms of
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
  GNU General Public License version 2, which is displayed below.
 
 -------------------------------------------------------------------------

LICENSE.GPLv3

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt Toolkit under the terms of
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
  GNU Lesser General Public License version 3. That license references
  the General Public License version 3, that is displayed below. Other
  portions of the Qt Toolkit may be licensed directly under this license.

LICENSE.LGPLv21

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt Toolkit under the terms of
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
  GNU Lesser General Public License version 2.1, which is displayed below.
 
 -------------------------------------------------------------------------

LICENSE.LGPLv3

@@ -3,7 +3,7 @@
  The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
  Contact: http://www.qt.io/licensing/
 
- You may use, distribute and copy the Qt Toolkit under the terms of
+ You may use, distribute and copy the Qt GUI Toolkit under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
  This license makes reference to the version 3 of the GNU General
  Public License, which you can find in the LICENSE.GPLv3 file.

README

@@ -16,6 +16,29 @@ HOW TO BUILD QT5
      please see section "Setting up your machine" on:
      http://wiki.qt.io/Get_The_Source
 
+   Optional requirements
+   ---------------------
+
+   - OpenSSL for SSL sockets or HTTPS
+   - Wayland
+
+   New dependencies in Qt 5
+   ------------------------
+
+     Linux: On systems running X11, the XCB libraries are required for
+     the platform plugin to build. qtbase/src/plugins/platforms/xcb/README
+     lists the required packages.
+
+     Qt 5 can make use of the ICU libraries providing Unicode and Globalization
+     support (see http://site.icu-project.org/). They are required for building
+     QtWebKit.
+     On Linux, they will be auto-detected.
+     On Windows, they need to be manually installed and the "include" and "lib"
+     folders of the ICU installation must be appended to the INCLUDE and LIB
+     environment variables after calling the Windows SDK setup script.
+     The "bin" folder of the ICU installation should be appended to the PATH
+     environment variable in order to for the DLLs to be found at run-time.
+
    Licensing:
    ----------
 
@@ -87,11 +110,11 @@ HOW TO BUILD QT5
  default in the build system.
 
  It is possible to build selected modules with their dependencies by doing
- a `make module-<foo>'.  For example, to build only qtdeclarative,
+ a `make module-<foo>'.  For example, to build only qtscript and qtwebkit,
- and the modules it depends on:
+ and the modules they depend on:
 
    ./configure -prefix $PWD/qtbase <license>
-   make -j4 module-qtdeclarative
+   make -j4 module-qtscript module-qtwebkit
 
  This can save a lot of time if you are only interested in a subset of Qt5.
 

coin/README

@@ -6,6 +6,4 @@ This directory contains files used by Qt's Continuous Integration system (Coin).
 provisioning
 ------------
 Contains scripts that apply to different test machines in order to run automatic tests on them.
-For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set.
-(Run as admin in PowerShell)
 

coin/provisioning/common/helpers.ps1

@@ -27,5 +27,5 @@ function Extract-Zip
     $shell = new-object -com shell.application
     $zipfile = $shell.Namespace($Source)
     $destinationFolder = $shell.Namespace($Destination)
-    $destinationFolder.CopyHere($zipfile.Items(), 16)
+    $destinationFolder.CopyHere($zipfile.Items())
 }

coin/provisioning/common/icu.ps1

@@ -1,9 +0,0 @@
-# ICU is already pre-installed on Windows machines, it would be nice to have
-# the installation script, but for now let's just export the right variables
-
-# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
-
-# FIXME: do we really want to use the 4.8.2 ICU build?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")

coin/provisioning/common/jom.ps1

@@ -5,5 +5,3 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip"
 Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip
 Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832"
 Extract-Zip $zip C:\Utils\Jom
-
-[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine")

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh

@@ -1,6 +0,0 @@
-# provides: fix for possible bug in the subscription manager
-# version: provided by RedHat
-# needed for yum to work properly in case there is incorrect data in
-# the sslclientkey repository parameter value
-sudo rm -f /etc/pki/entitlement/*
-sudo subscription-manager refresh

coin/provisioning/qtci-osx-10.10/crashreporter.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.11/crashreporter.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.8/crashreporter.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.9/crashreporter.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-windows-10-x86/icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"

coin/provisioning/qtci-windows-10-x86/jom.ps1

@@ -1 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
+
+Set-ExecutionPolicy Restricted -Force

coin/provisioning/qtci-windows-10-x86_64/icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"

coin/provisioning/qtci-windows-10-x86_64/jom.ps1

@@ -1 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
+
+Set-ExecutionPolicy Restricted -Force

coin/provisioning/qtci-windows-7-x86/icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"

coin/provisioning/qtci-windows-7-x86/jom.ps1

@@ -1 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
+
+Set-ExecutionPolicy Restricted -Force

coin/provisioning/qtci-windows-8-x86/icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"

coin/provisioning/qtci-windows-8-x86/jom.ps1

@@ -1 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
+
+Set-ExecutionPolicy Restricted -Force

coin/provisioning/qtci-windows-8-x86_64/icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"

coin/provisioning/qtci-windows-8-x86_64/jom.ps1

@@ -1 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
 . "$PSScriptRoot\..\common\jom.ps1"
+
+Set-ExecutionPolicy Restricted -Force

init-repository

@@ -155,10 +155,9 @@ EOF
 }
 
 use Carp         qw( confess             );
-use Cwd          qw( getcwd abs_path     );
 use English      qw( -no_match_vars      );
-use File::Spec::Functions qw ( rel2abs   );
 use Getopt::Long qw( GetOptions          );
+use Cwd          qw( getcwd abs_path     );
 
 my $script_path = abs_path($0);
 $script_path =~ s,[/\\][^/\\]+$,,;
@@ -559,25 +558,24 @@ sub git_install_hooks
     my @configresult = qx(git config --list --local);
     foreach my $line (@configresult) {
         next if ($line !~ /submodule\.([^.=]+)\.url=/);
-        my $module = $1;
+        my $module = $1.'/.git';
-        my $module_gitdir = $module.'/.git';
+        if (!-d $module) {
-        if (!-d $module_gitdir) {
+            open GITD, $module or die "Cannot open $module: $!\n";
-            open GITD, $module_gitdir or die "Cannot open $module: $!\n";
             my $gd = <GITD>;
             close GITD;
             chomp($gd);
-            $gd =~ s/^gitdir: // or die "Malformed .git file $module_gitdir\n";
+            $gd =~ s/^gitdir: // or die "Malformed .git file $module\n";
-            $module_gitdir = rel2abs($gd, $module);
+            $module = $gd;  # We expect it to be always absolute.
-            if (open COMD, $module_gitdir.'/commondir') {
+            if (open COMD, $module.'/commondir') {
                 my $cd = <COMD>;
                 chomp($cd);
-                $module_gitdir .= '/'.$cd;
+                $module .= '/'.$cd;
-                $module_gitdir = abs_path($module_gitdir);
+                $module = abs_path($module);
                 close COMD;
             }
         }
-        $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module_gitdir.'/hooks/commit-msg');
+        $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg');
-        $self->ensure_link($hooks.'/git_post_commit_hook', $module_gitdir.'/hooks/post-commit');
+        $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit');
     }
 }