Update submodules on '5.8' in qt5

Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.7.0
+	branch = 5.8
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.7.0
+	branch = 5.8
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.7.0
+	branch = 5.8
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.7.0
+	branch = 5.8
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.7.0
+	branch = 5.8
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.7.0
+	branch = 5.8
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.7.0
+	branch = 5.8
 	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.0
+	branch = 5.8
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +82,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.7.0
+	branch = 5.8
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -93,24 +93,24 @@
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
+	recommends = qtdeclarative qtquickcontrols qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.7.0
+	branch = 5.8
 	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,184 +129,191 @@
 	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.0
+	branch = 5.8
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
 	recommends = qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtsvg qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.7.0
+	branch = dev
 	status = ignore
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.7.0
+	branch = 5.8
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.7.0
-	status = preview
+	branch = 5.8
+	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.7.0
+	branch = dev
 	status = ignore
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.7.0
+	branch = 5.8
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad
-	branch = 5.7.0
+	branch = 5.8
 	status = preview
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml
-	branch = 5.7.0
-	status = preview
+	branch = 5.8
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech
-	branch = dev
-	status = ignore
+	branch = 5.8
+	status = preview
+[submodule "qtnetworkauth"]
+	depends = qtbase
+	recommends = qtwebview
+	path = qtnetworkauth
+	url = ../qtnetworkauth
+	branch = 5.8
+	status = preview

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 GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt 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 GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt 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 GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt 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 GUI Toolkit under the terms of
+ You may use, distribute and copy the Qt 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

@@ -10,35 +10,12 @@ HOW TO BUILD QT5
 
     - Perl 5.8 or later
     - Python 2.7 or later
-    - C++ compiler supporting the C++98 standard
+    - C++ compiler supporting the C++11 standard
 
      For other platform specific requirements,
      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:
    ----------
 
@@ -62,8 +39,10 @@ HOW TO BUILD QT5
    Windows:
    --------
 
-     Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
-     following tools can be found in the path:
+     Open a command prompt.
+     Ensure that the following tools can be found in the path:
+     * Supported compiler (Visual Studio 2012 or later,
+        MinGW-builds gcc 4.9 or later)
      * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
      * Python version 2.7 or later  [http://www.activestate.com/activepython/]
      * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
@@ -110,11 +89,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.
 

coin/README

@@ -6,4 +6,6 @@ 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())
+    $destinationFolder.CopyHere($zipfile.Items(), 16)
 }

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")

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")

coin/provisioning/common/patch_qnx.ps1

@@ -0,0 +1,51 @@
+#############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
+
+
+. "$PSScriptRoot\helpers.ps1"
+
+$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
+$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
+$tempDir = "C:\temp\qnx_path"
+
+Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
+Verify-Checksum $zip $sha1
+Extract-Zip $zip $tempDir
+Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
+Remove-Item $tempDir -recurse

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

@@ -0,0 +1,6 @@
+# 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-linux-RHEL-6.6-x86_64/patch_qnx.sh

@@ -0,0 +1,64 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# Patch QNX SDK due to issues in the standard library.
+# The patches are available here:
+# http://www.qnx.com/download/feature.html?programid=27555
+# A copy of the patch must be in the root of the Coin path in
+# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
+
+set -e
+sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
+
+function InstallZipPackageFromURL {
+    url=$1
+    expectedSha1=$2
+    targetDirectory=$3
+
+    targetFile=`mktemp` || echo "Failed to create temporary file"
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
+    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+
+    tempDir=`mktemp -d` || echo "Failed to create temporary directory"
+    /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive"
+    trap "sudo rm -fr $targetFile $tempDir" EXIT
+
+    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
+}
+
+echo "Patching QNX"
+
+baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip"
+InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

init-repository

@@ -155,9 +155,10 @@ EOF
 }
 
 use Carp         qw( confess             );
-use English      qw( -no_match_vars      );
-use Getopt::Long qw( GetOptions          );
 use Cwd          qw( getcwd abs_path     );
+use English      qw( -no_match_vars      );
+use File::Spec::Functions qw ( rel2abs   );
+use Getopt::Long qw( GetOptions          );
 
 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');
     }
 }