Set the list of submodules to those needed for Qbs

Change-Id: I8b4dc36d4b0a3af7eb393a4c7fd28b7db29989f2
Update submodules on '5.6' in qt5
2026-01-22 06:46:01 +08:00 · 2017-11-14 13:55:12 -08:00 · 2017-09-23 07:28:32 +00:00 · 2017-09-18 09:42:25 +02:00 · 2017-09-15 10:38:24 +00:00 · 2017-09-14 12:08:39 +00:00
102 changed files with 516 additions and 428 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,269 +3,9 @@
 	url = ../qtbase.git
 	branch = 5.6
 	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 5.6
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtsvg qtxmlpatterns
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 5.6
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 5.6
-	status = addon
 [submodule "qtscript"]
 	depends = qtbase
-	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
 	branch = 5.6
-	status = deprecated
-[submodule "qtmultimedia"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 5.6
 	status = essential
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt qtwebkit
-	path = qttools
-	url = ../qttools.git
-	branch = 5.6
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 5.6
-	status = addon
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 5.6
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 5.6
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtwebkit"]
-	depends = qtbase
-	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
-	serialize = qtwebengine
-	path = qtwebkit
-	url = ../qtwebkit.git
-	branch = 5.6
-	status = obsolete
-	project = WebKit.pro
-	priority = 20
-[submodule "qtwebkit-examples"]
-	depends = qtwebkit qttools
-	path = qtwebkit-examples
-	url = ../qtwebkit-examples.git
-	branch = 5.6
-	status = obsolete
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = master
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 5.6
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 5.6
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 5.6
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 5.6
-	status = addon
-[submodule "qt3d"]
-	depends = qtdeclarative qtimageformats
-	path = qt3d
-	url = ../qt3d.git
-	branch = 5.6
-	status = preview
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 5.6
-	status = addon
-[submodule "qtquick1"]
-	depends = qtscript
-	recommends = qtsvg qtxmlpatterns
-	path = qtquick1
-	url = ../qtquick1.git
-	branch = 5.6
-	status = obsolete
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 5.6
-	status = addon
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 5.6
-	status = essential
-[submodule "qtserialbus"]
-	depends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.6
-	status = preview
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 5.6
-	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = 5.6
-	status = addon
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = 5.6
-	status = addon
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = 5.6
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = 5.6
-	status = addon
-[submodule "qtenginio"]
-	depends = qtdeclarative
-	path = qtenginio
-	url = ../qtenginio.git
-	branch = 5.6
-	status = deprecated
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 5.6
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 5.6
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtquickcontrols qtwebchannel
-	recommends = qtlocation
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 5.6
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = 5.6
-	status = addon
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.6
-	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtquickcontrols
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.6
-	status = preview
-[submodule "qtpurchasing"]
-	depends = qtbase qtandroidextras
-	recommends = qtdeclarative
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = dev
-	status = ignore
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,26 +1,10 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-8.1-x86_64                                             MSVC2012    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8.1-x86_64                                             MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-7-x86-2                                                MSVC2010    Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
-qtci-windows-7-x86-2                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-6                                               MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64-7                                            MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
-qtci-windows-8.1-x86_64             Windows_Phone_8_1   armv4       MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-windows-8.1-x86_64             WinRT_8_1                       MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-linux-OpenSuSE-13.01-x86_64                                    GCC         DeveloperBuild NoPch
+qtci-windows-7-x86-2                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-10-x86_64-8                                x86         MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-10-x86_64-8                                            MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Packaging Release NoUseGoldLinker
 qtci-osx-10.11-x86_64                                               Clang       Packaging DebugAndRelease Release
 qtci-osx-10.10-x86_64                                               Clang       DebugAndRelease Release DisableTests
 qtci-osx-10.9-x86_64                                                Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.8-x86_64                                                Clang       Release NoFramework
-qtci-osx-10.11-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
-qtci-linux-RHEL-6.6-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64-1    Boot2Qt_Fido        armv7       GCC         DisableTests
-qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         TestOnly LicenseCheck
-qtci-windows-7-x86-2                Windows_7_Embedded  armv4       MSVC2008    DeveloperBuild Release DisableTests OpenGLES2
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,15 +1,2 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64     Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64-7    WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
-qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2        Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2        Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2
-qtci-osx-10.11-x86_64       Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-osx-10.11-x86_64       Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
-qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-# target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
-
-qtci-osx-10.11-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
--- a/coin/provisioning/common/DownloadURL.sh
+++ b/coin/provisioning/common/DownloadURL.sh
@@ -70,7 +70,8 @@ function DownloadURL {
            esac
        }
        echo "Checking SHA1 on PKG '$targetFile'"
-        echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
+        echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+        shasum --check $targetFile.sha1 || throw $ExceptionSHA1
    )

    catch || {
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -53,5 +53,7 @@ if((Test-Path -Path "C:\CMake" )){
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
 Rename-Item $defaultinstallfolder C:\CMake

+Add-Path "C:\CMake\bin"
+
 echo "CMake = $version" >> ~\versions.txt

--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -69,6 +69,7 @@ function Download
        [string] $CachedUrl   = $(BadParam("the locally cached URL")),
        [string] $Destination = $(BadParam("a download target location"))
    )
+    $ProgressPreference = 'SilentlyContinue'
    try {
        if ($CachedUrl.StartsWith("http")) {
            Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
@@ -86,5 +87,17 @@ function Add-Path
        [string]$Path
    )
    echo "Adding $Path to Path"
-    [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
+
+    $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+    [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
+}
+
+function is64bitWinHost
+{
+    if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
+        return 1
+    }
+    else {
+        return 0
+    }
 }
--- a/coin/provisioning/common/icu.ps1
+++ b/coin/provisioning/common/icu.ps1
@@ -1,5 +1,78 @@
-# 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
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts 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$
+##
+############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script installs ICU.
+
+$version = "53_1"
+
+if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
+
+   $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z"
+   $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
+   $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
+
+   $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
+   $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
+   $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
+
+   $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
+   $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
+      echo "Fetching from URL ..."
+      Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64
+      Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012
+      Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""}
+
+      echo "Cleaning $icuPackage_msvc2012_64..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2012_64
+
+      echo "ICU MSVC2012 = $version" >> ~\versions.txt
+   }
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
+      echo "Fetching from URL ..."
+      Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
+      Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013
+      Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""}
+
+      echo "Cleaning $icuPackage_msvc2013_64..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2013_64
+
+      echo "ICU MSVC2013 = $version" >> ~\versions.txt
+   }

 # 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")
@@ -7,3 +80,46 @@

 # 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")
+
+} else {
+
+   $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z"
+   $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
+   $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
+
+   $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
+   $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
+   $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
+
+   $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
+   $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
+      echo "Fetching from URL ..."
+      Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32
+      Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32
+      Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""}
+
+      echo "Cleaning $icuPackage_msvc2012_32..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2012_32
+
+      echo "ICU MSVC2012 = $version" >> ~\versions.txt
+   }
+
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
+      echo "Fetching from URL ..."
+      Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
+      Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32
+      Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""}
+
+      echo "Cleaning $icuPackage_msvc2013_32..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2013_32
+
+      echo "ICU MSVC2013 = $version" >> ~\versions.txt
+   }
+
+# 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_32_devel\\icu53_1", "Machine")
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
+
+}
--- a/coin/provisioning/common/install-dependencywalker.ps1
+++ b/coin/provisioning/common/install-dependencywalker.ps1
@@ -36,10 +36,17 @@
 # This script will install Dependency Walker 2.2.6000

 $version = "2.2.6000"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip"
-$url_official = "http://www.dependencywalker.com/depends22_x64.zip"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "_x64"
+    $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
+}
+else {
+    $arch = "_x86"
+    $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22" + $arch + ".zip"
+$url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip"
 $dependsPackage = "C:\Windows\Temp\depends-$version.zip"
-$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"

 $TARGETDIR = "C:\Utils\dependencywalker"
 if(!(Test-Path -Path $TARGETDIR )){
--- a/coin/provisioning/common/install-git.ps1
+++ b/coin/provisioning/common/install-git.ps1
@@ -35,10 +35,17 @@
 # Install Git version 2.13.0

 $version = "2.13.0"
-$gitPackage = "C:\Windows\Temp\Git-" + $version + "-64-bit.exe"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + "-64-bit.exe"
-$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + "-64-bit.exe"
-$sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-64-bit"
+    $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
+}
+else {
+    $arch = "-32-bit"
+    $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec"
+}
+$gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe"
+$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe"

 echo "Fetching Git $version..."
 Download $url_official $url_cache $gitPackage
--- a/coin/provisioning/common/install-java.ps1
+++ b/coin/provisioning/common/install-java.ps1
@@ -33,14 +33,24 @@

 . "$PSScriptRoot\..\common\helpers.ps1"

-# This script will install Java
+# This script will install Java RE
+# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.

 $version = "7u7"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "x64"
+    $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3"
+}
+else {
+    $arch = "i586"
+    $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219"
+}
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe"
 $javaPackage = "C:\Windows\Temp\java-$version.exe"

 Copy-Item $url_cache $javaPackage
 cmd /c "$javaPackage /s SPONSORS=0"
 echo "Cleaning $javaPackage.."
 Remove-Item -Recurse -Force "$javaPackage"
-echo "Java = $version" >> ~\versions.txt
+echo "Java = $version $arch" >> ~\versions.txt
--- a/coin/provisioning/common/install-mingw.ps1
+++ b/coin/provisioning/common/install-mingw.ps1
@@ -0,0 +1,26 @@
+function InstallMinGW
+{
+    Param (
+        [string] $version     = $(BadParam("the version being printed to versions.txt")),
+        [string] $release     = $(BadParam("release part of the file name"))
+    )
+
+    $envvar = "MINGW$version"
+    $envvar = $envvar -replace '["."]'
+    $targetdir = "C:\$envvar"
+    $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z"
+
+    $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
+    Copy-Item $url_cache $mingwPackage
+
+    Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
+
+    echo "Adding MinGW environment variable."
+    [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
+
+    echo "Cleaning $mingwPackage.."
+    Remove-Item -Recurse -Force "$mingwPackage"
+
+    echo "MinGW = $version $release" >> ~\versions.txt
+
+}
--- a/coin/provisioning/common/install-notepad++.ps1
+++ b/coin/provisioning/common/install-notepad++.ps1
@@ -36,9 +36,16 @@
 # This script will install Notepad++

 $version = "7.3"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer.x64.exe"
-$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer.x64.exe"
-$sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = ".x64"
+    $sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA"
+}
+else {
+    $arch = ""
+    $sha1 = "d4c403675a21cc381f640b92e596bae3ef958dc6"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer" + $arch + ".exe"
+$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer" + $arch + ".exe"
 $nppPackage = "C:\Windows\Temp\npp-$version.exe"

 Download $url_official $url_cache $nppPackage
@@ -50,5 +57,11 @@ Remove-Item -Recurse -Force "$nppPackage"

 echo "Notepad++ = $version" >> ~\versions.txt

-Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
+if( (is64bitWinHost) -eq 1 ) {
+    Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
+}
+else {
+    Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
+}
+
 echo "Auto-updating disabled."
--- a/coin/provisioning/common/install-qnx660.ps1
+++ b/coin/provisioning/common/install-qnx660.ps1
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts 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$
+##
+#############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install QNX 6.6.0
+
+$version = "6.6.0"
+$nondottedversion = $version -replace '[.]',''
+$targetFolder = "c:"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip"
+
+Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"}
+
+[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine")
+echo "QNX = $version" >> ~\versions.txt
--- a/coin/provisioning/common/install-ruby.ps1
+++ b/coin/provisioning/common/install-ruby.ps1
@@ -36,10 +36,17 @@
 # This script will install Ruby

 $version = "2.2.6"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + "-x64.exe"
-$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + "-x64.exe"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-x64"
+    $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
+}
+else {
+    $arch = ""
+    $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
+$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
 $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
-$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"

 Download $url_official $url_cache $rubyPackage
 Verify-Checksum $rubyPackage $sha1
@@ -48,7 +55,6 @@ cmd /c "$rubyPackage /silent"
 echo "Cleaning $rubyPackage.."
 Remove-Item -Recurse -Force "$rubyPackage"

-$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
-[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine)
+Add-Path "C:\Ruby22-x64\bin"

 echo "Ruby = $version" >> ~\versions.txt
--- a/coin/provisioning/common/install-sevenzip.ps1
+++ b/coin/provisioning/common/install-sevenzip.ps1
@@ -36,10 +36,19 @@
 # This script installs 7-Zip

 $version = "1604"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + "-x64.exe"
-$url_official = "http://www.7-zip.org/a/7z" + $version + "-x64.exe"
+
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-x64"
+    $sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"
+}
+else {
+    $arch = ""
+    $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4"
+}
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe"
+$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe"
 $7zPackage = "C:\Windows\Temp\7zip-$version.exe"
-$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"

 Download $url_official $url_cache $7zPackage
 Verify-Checksum $7zPackage $sha1
--- a/coin/provisioning/common/install-strawberry-perl.ps1
+++ b/coin/provisioning/common/install-strawberry-perl.ps1
@@ -36,10 +36,17 @@
 # This script installs Strawberry Perl

 $version = "5.26.0.1"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + "-64bit.msi"
-$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" +$version+ "-64bit.msi"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-64bit"
+    $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
+}
+else {
+    $arch = "-32bit"
+    $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + $arch + ".msi"
+$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" + $version + $arch + ".msi"
 $strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi"
-$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"

 Download $url_official $url_cache $strawberryPackage
 Verify-Checksum $strawberryPackage $sha1
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/mysql.ps1
@@ -62,21 +62,28 @@ try {
    Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
 } catch {}

-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\Utils\my_sql\my_sql"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
+if( (is64bitWinHost) -eq 1 ) {
+    # Install x64 bit version
+    $architecture = "x64"
+    $installFolder = "C:\Utils\my_sql\my_sql"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"

-DownloadAndInstall $internalUrl $packagex64 $installFolder
+    DownloadAndInstall $internalUrl $packagex64 $installFolder

-echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+    echo "Set environment variables ..."
+    [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+    [Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+}

 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\my_sql\my_sql$architecture"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
+if( (is64bitWinHost) -eq 1 ) {
+    $installFolder = "C:\Utils\my_sql\my_sql$architecture"
+}
+else {
+    $installFolder = "C:\Utils\my_sql\my_sql"
+}

 DownloadAndInstall $internalUrl $packagex86 $installFolder

--- a/coin/provisioning/common/openssl.ps1
+++ b/coin/provisioning/common/openssl.ps1
@@ -40,30 +40,39 @@ $version = "1_0_2j"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"

-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\openssl"
-$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
+if( (is64bitWinHost) -eq 1 ) {

-echo "Fetching from URL ..."
-Download $externalUrl $internalUrl $packagex64
-Verify-Checksum $packagex64 $sha1
-echo "Installing $packagex64 ..."
-cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
+    # Install x64 bit version
+    $architecture = "x64"
+    $installFolder = "C:\openssl"
+    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
+    $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"

-echo "Remove downloaded $packagex64 ..."
-Remove-Item $packagex64
+    echo "Fetching from URL ..."
+    Download $externalUrl $internalUrl $packagex64
+    Verify-Checksum $packagex64 $sha1
+    echo "Installing $packagex64 ..."
+    cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"

-echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine")
-[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine")
+    echo "Remove downloaded $packagex64 ..."
+    Remove-Item $packagex64
+
+    echo "Set $architecture environment variables ..."
+    [Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine")
+    [Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine")
+    [Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine")
+}

 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\openssl$architecture"
+
+if( (is64bitWinHost) -eq 1 ) {
+    $installFolder = "C:\openssl$architecture"
+} else {
+    $installFolder = "C:\openssl"
+}
+
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
--- a/coin/provisioning/common/postgresql.ps1
+++ b/coin/provisioning/common/postgresql.ps1
@@ -40,37 +40,45 @@ $version = "9.1.9-1"
 $packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip"
 $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"

-# Install x64 bit versions
-$architecture = "x64"
-$installFolder = "C:\Utils\postgresql\pgsql"
-$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
-$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
+if( (is64bitWinHost) -eq 1 ) {
+    # Install x64 bit versions
+    $architecture = "x64"
+    $installFolder = "C:\Utils\postgresql\pgsql"
+    $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
+    $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"

-# Delete any leftovers
-try {
-    Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
-} catch {}
+    # Delete any leftovers
+    try {
+        Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
+    } catch {}

-echo "Fetching from URL ..."
-Download $externalUrl $internalUrl $packagex64
-Verify-Checksum $packagex64 $sha1
-echo "Installing $packagex64 ..."
-Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
+    echo "Fetching from URL ..."
+    Download $externalUrl $internalUrl $packagex64
+    Verify-Checksum $packagex64 $sha1
+    echo "Installing $packagex64 ..."
+    Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder

-echo "Remove downloaded $packagex64 ..."
-Remove-Item $packagex64
+    echo "Remove downloaded $packagex64 ..."
+    Remove-Item $packagex64

-echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
+    echo "Set $architecture environment variables ..."
+    [Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
+    [Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
+}

 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\postgresql$architecture\pgsql"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip"
 $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
+if( (is64bitWinHost) -eq 1 ) {
+    $installFolder = "C:\Utils\postgresql$architecture\pgsql"
+}
+else {
+    $installFolder = "C:\Utils\postgresql\pgsql"
+}
+

 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $packagex86
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -30,27 +30,23 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-param([Int32]$archVer=32)
 . "$PSScriptRoot\helpers.ps1"

 # This script installs Python $version.
 # Python is required for building Qt 5 from source.

 $version = "2.7.13"
-$package = "C:\Windows\temp\python-$version.msi"
-
-# check bit version
-if ( $archVer -eq 64 ) {
-    echo "Running in 64 bit system"
-    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
-    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = ".amd64"
    $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 }
 else {
-    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
-    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi"
+    $arch = ""
    $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
 }
+$package = "C:\Windows\temp\python-$version.msi"
+$externalUrl = "https://www.python.org/ftp/python/$version/python-$version" + $arch + ".msi"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version" + $arch + ".msi"

 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $package
@@ -63,8 +59,7 @@ echo "Chancing allowZip64 value to 'True'..."
 echo "Remove $package..."
 del $package

-$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
-[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine)
+Add-Path "C:\Python27;C:\Python27\Scripts"

 C:\Python27\python.exe -m ensurepip
 # Install python virtual env
--- a/coin/provisioning/common/vc_redist.ps1
+++ b/coin/provisioning/common/vc_redist.ps1
@@ -59,6 +59,6 @@ echo "Fetching from URL..."
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 echo "Installing $package..."
-cmd /c "$package /q"
+Start-Process -FilePath $package -ArgumentList "/q" -Wait
 echo "Remove $package..."
 del $package
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh
@@ -87,7 +87,13 @@ function InstallAndroidPackage {
    sudo rm -fr "$targetFolder"/"$version"
 }

-sudo mkdir "$targetFolder"
+if [ -d "$targetFolder" ]; then
+    echo "Removing old Android installation"
+    sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
+fi
+
+sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
+
 # Install Android SDK
 echo "Installing Android SDK version $sdkPackage..."
 InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
--- a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-sleep.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-notepad++.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-sevenzip.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-qnx660.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-git.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-java.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 5.3.0
+
+$version = "5.3.0"
+$release = "release-posix-dwarf-rt_v4-rev0"
+
+InstallMinGW $version $release
+
+
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
@@ -0,0 +1,8 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 6.3.0
+
+$version = "6.3.0"
+$release = "release-posix-dwarf-rt_v5-rev2"
+
+InstallMinGW $version $release
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-ruby.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
--- a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\set-network-test-server.ps1"
--- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
--- a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1
@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
--- a/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled
--- a/coin/provisioning/qtci-windows-8-x86/06-python.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/06-python.ps1
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
--- a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-uac.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\set-network-test-server.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-sleep.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-notepad++.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-sevenzip.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1" 64
--- a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/07-vc_redist.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-git.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-java.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-ruby.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mysql.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\postgresql.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts 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$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# Install Visual Studio 2013 update 5
+
+$version = "2013 Update 5 (KB2829760)"
+$package = "C:\Windows\Temp\vs12-kb2829760.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
+
+echo "Fetching patch for Visual Studio $version..."
+Copy-Item $url_cache $package
+$commandLine = $package
+
+echo "Installing Update 5 for Visual Studio $version..."
+. $commandLine /norestart /passive
+
+echo "Removing $package ..."
+remove-item $package
+
+echo "Visual Studio = $version" >> ~\versions.txt
--- a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\openssl.ps1"
--- a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/python3.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-vc_redist.ps1
--- a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jake Petroules	a458d0f819	Set the list of submodules to those needed for Qbs Change-Id: I8b4dc36d4b0a3af7eb393a4c7fd28b7db29989f2	2017-11-14 13:55:12 -08:00
Qt Submodule Update Bot	deb627054c	Update submodules on '5.6' in qt5 Change-Id: Ibafa1abb3f6dae7532892444618490f835ba78cb Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-23 07:28:32 +00:00
Liang Qi	e7472f4308	Merge remote-tracking branch 'origin/5.6.3' into 5.6 Conflicts: .gitmodules Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c	2017-09-18 09:42:25 +02:00
Heikki Halmet	12fd0d5b9b	Ensure 'clean' android Installation Remove old android installation and make sure new 'clean' android folder is created. Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-09-15 10:38:24 +00:00
Tony Sarajärvi	b0a9259c6e	Provision and build QNX660 on Win 10 x64 Changes the mingw from 4.9 to 5.3. Task-number: QTQAINFRA-1208 Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-09-14 12:08:39 +00:00
Tony Sarajärvi	2a5f54d07e	provisioning: install MinGW 530 and 630 for Win10 x64 MinGW is an alternative option for Visual Studio. It's used to create desktop builds and for cross compiling Android and QNX. At this point it is still unclear which version is going to be used for what, but as both are supported, let's think ahead and provide them both. This also allows us to debug with the other, if the other is causing problems. Task-number: QTQAINFRA-1289 Change-Id: I2a922669c07d49370e608c093be80481c8613dc7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-14 12:08:36 +00:00
Tony Sarajärvi	892833cda9	Provisioning: Invoke installer with Start-Process By launching an installer with Start-Process and -Wait, we make sure no handles are left holding on to the installer when we try to delete it at cleanup. Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>	2017-09-14 12:08:32 +00:00
Tony Sarajärvi	a9cf936a63	Provision: Move Python3 scripts from win8 to win8.1 folder Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-09-14 12:08:28 +00:00
Qt Submodule Update Bot	b38e4732af	Update submodules on '5.6.3' in qt5 Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-14 12:08:24 +00:00
Simo Fält	92d1bdcb43	Provisioning: Fix shasum path Commit `c48355ebb5` changed the path of shasum, which was not intended. While the DownloadURL.sh utility is used by rhel in addition to macOS we can't rely on /usr/bin/shasum but we have to use the one found from PATH. Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-09-08 04:34:41 +00:00
Qt Submodule Update Bot	fba2c6f4dd	Update submodules on '5.6.3' in qt5 Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-07 14:34:28 +00:00
Qt Submodule Update Bot	88d718d381	Update submodules on '5.6.3' in qt5 Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-07 03:10:26 +00:00
Simo Fält	c48355ebb5	Provisioning: Fix DownloadURL utility's shasum check MacOS 10.10 has older shasum tool, which does not support oneliner verification. Change-Id: If00b846d5772aa1991960675d022249d63e7bd77 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-09-05 11:36:43 +00:00
Frederik Gladhorn	73834c7166	Adjust submodule branches	2017-09-04 17:38:58 +02:00
Tony Sarajärvi	a7b1b00350	Provisioning: Hide powershell progress bar for performance Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-09-04 12:12:17 +00:00
Joni Jäntti	dbf737a5c0	Fix Add-Path helper function and start using it in scripts This function was broken and only added the latest addition to the actual PATH. Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-09-04 12:11:17 +00:00
Akseli Salovaara	4e1f4665c5	Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries requires Windows 64bit machine. Linking requires more RAM than Windows 32bit can address. Change MSVC2013 & MSVC2015 integration host machines accordingly. Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-04 07:10:14 +00:00
Aapo Keskimolo	42b502f7bc	Add UploadConfigureExe feature We used to solve the requirement for uploading configure.exe from product version, but we can add this as a feature and remove the dependency to product version. Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-09-02 11:32:38 +00:00
Tony Sarajärvi	3ca7658781	Provision vanilla Windows 8.1 x86 and use it Replaces existing Windows 8 x86 builds with a vanilla tier 1 image that gets all needed software provisioned except for VS2013 that is pre-installed. Also modifies existing provisioning scripts under common to support this 32bit OS. Task-number: QTQAINFRA-1383 Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-09-01 13:02:12 +00:00
Qt Submodule Update Bot	1726ba1611	Update submodules on '5.6' in qt5 Change-Id: Idfea61ecc744f07c6212fa4f29de808103393702 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-09-01 08:06:00 +00:00
Joni Jäntti	05dd83c73a	provisioning: windows: ICU Fixed ICU script to actually install ICU instead of just setting the environment variables. It is required to build qtwebkit. Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-09-01 08:05:57 +00:00
Joni Jäntti	30660bf987	Make CI use a new provisioned Win 10 template Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>	2017-09-01 08:05:54 +00:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\disable-sleep.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\disable-windows-updates.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\install-notepad++.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\install-sevenzip.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\install-qnx660.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\install-git.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\install-java.ps1"`
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\install-dependencywalker.ps1"`