Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4

14 files changed, 66 insertions, 38 deletions

diff --git a/README b/README
index ff169fe2..7781f47b 100644
--- a/README
+++ b/README
@@ -16,29 +16,6 @@ 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:
    ----------
 
@@ -110,11 +87,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 qtscript and qtwebkit,
- and the modules they depend on:
+ a `make module-<foo>'.  For example, to build only qtdeclarative,
+ and the modules it depends on:
 
    ./configure -prefix $PWD/qtbase <license>
-   make -j4 module-qtscript module-qtwebkit
+   make -j4 module-qtdeclarative
 
  This can save a lot of time if you are only interested in a subset of Qt5.
 
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index f517e94d..d7b957f3 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/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())
+    $destinationFolder.CopyHere($zipfile.Items(), 16)
 }
diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1
new file mode 100644
index 00000000..4be185e5
--- /dev/null
+++ b/coin/provisioning/common/icu.ps1
@@ -0,0 +1,9 @@
+# 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")
diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1
index c233ee6e..ef012b64 100644
--- a/coin/provisioning/common/jom.ps1
+++ b/coin/provisioning/common/jom.ps1
@@ -5,3 +5,5 @@ $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")
diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.11/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.8/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9/crashreporter.sh
new file mode 100644
index 00000000..ba8dbdd3
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.9/crashreporter.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server
diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
new file mode 100644
index 00000000..7756bd0f
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
@@ -0,0 +1,6 @@
+Set-ExecutionPolicy RemoteSigned -Force
+
+# install jom
+. "$PSScriptRoot\..\common\icu.ps1"
+
+Set-ExecutionPolicy Restricted -Force
diff --git a/init-repository b/init-repository
index 2580b0f6..954237d0 100755
--- a/init-repository
+++ b/init-repository
@@ -155,9 +155,10 @@ 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,[/\\][^/\\]+$,,;
@@ -558,24 +559,25 @@ sub git_install_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 $module = $1;
+        my $module_gitdir = $module.'/.git';
+        if (!-d $module_gitdir) {
+            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\n";
-            $module = $gd;  # We expect it to be always absolute.
-            if (open COMD, $module.'/commondir') {
+            $gd =~ s/^gitdir: // or die "Malformed .git file $module_gitdir\n";
+            $module_gitdir = rel2abs($gd, $module);
+            if (open COMD, $module_gitdir.'/commondir') {
                 my $cd = <COMD>;
                 chomp($cd);
-                $module .= '/'.$cd;
-                $module = abs_path($module);
+                $module_gitdir .= '/'.$cd;
+                $module_gitdir = abs_path($module_gitdir);
                 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');
+        $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module_gitdir.'/hooks/commit-msg');
+        $self->ensure_link($hooks.'/git_post_commit_hook', $module_gitdir.'/hooks/post-commit');
     }
 }