Update submodules on '5.9.2' in qt5

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

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.10
+	branch = 5.9.2
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.10
+	branch = 5.9.2
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,109 +211,101 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
-	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.10
+	branch = 5.9.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.10
-	status = addon
+	branch = 5.9.2
+	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.10
-	status = addon
+	branch = 5.9.2
+	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.10
-	status = preview
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = 5.10
+	branch = 5.9.2
 	status = preview

coin/platform_configs/default.txt

@@ -12,11 +12,12 @@ qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
 qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
-qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
+qtci-macos-10.12-x86_64-8                                           Clang       DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
+qtci-osx-10.10-x86_64                                               Clang       Packaging DebugAndRelease Release DisableTests
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
-qtci-macos-10.12-x86_64-8           IOS_ANY             x86_64      Clang       Release DisableTests Static
+qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64-1    Boot2Qt_Pyro        armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-1    Boot2Qt_Morty       armv7       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         TestOnly LicenseCheck
 qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qt5.txt

@@ -1,6 +1,6 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64                         x86         MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8-x86-2                                        MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-8.1-x86_64                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
@@ -19,7 +19,5 @@ qtci-linux-RHEL-7.2-x86_64  QNX_700             x86         GCC         Packagin
 qtci-linux-RHEL-7.2-x86_64  QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-10-x86_64-7    QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-10-x86_64-7    QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
-qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
+qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-linux-RHEL-7.2-x86_64  INTEGRITY_11_04     armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qtdeclarative.txt

@@ -1,3 +1,3 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1  Boot2Qt_Pyro        armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  Boot2Qt_Morty       armv7       GCC         DeveloperBuild

coin/provisioning/common/DownloadURL.sh

@@ -70,8 +70,7 @@ function DownloadURL {
             esac
         }
         echo "Checking SHA1 on PKG '$targetFile'"
-        echo "$expectedSha1 *$targetFile" > $targetFile.sha1
-        shasum --check $targetFile.sha1 || throw $ExceptionSHA1
+        echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
     )
 
     catch || {

coin/provisioning/common/cmake.ps1

@@ -53,7 +53,5 @@ 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
 

coin/provisioning/common/helpers.ps1

@@ -92,7 +92,6 @@ 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
@@ -110,17 +109,5 @@ function Add-Path
         [string]$Path
     )
     echo "Adding $Path to Path"
-
-    $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
-    }
+    [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
 }

coin/provisioning/common/icu.ps1

@@ -1,78 +1,5 @@
-############################################################################
-##
-## 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
-   }
+# 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")
@@ -80,46 +7,3 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
 
 # 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")
-
-}

coin/provisioning/common/install-dependencywalker.ps1

@@ -36,17 +36,10 @@
 # This script will install Dependency Walker 2.2.6000
 
 $version = "2.2.6000"
-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"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip"
+$url_official = "http://www.dependencywalker.com/depends22_x64.zip"
 $dependsPackage = "C:\Windows\Temp\depends-$version.zip"
+$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
 
 $TARGETDIR = "C:\Utils\dependencywalker"
 if(!(Test-Path -Path $TARGETDIR )){

coin/provisioning/common/install-git.ps1

@@ -35,17 +35,10 @@
 # Install Git version 2.13.0
 
 $version = "2.13.0"
-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"
+$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"
 
 echo "Fetching Git $version..."
 Download $url_official $url_cache $gitPackage

coin/provisioning/common/install-java.ps1

@@ -33,24 +33,14 @@
 
 . "$PSScriptRoot\..\common\helpers.ps1"
 
-# This script will install Java RE
-# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.
+# This script will install Java
 
 $version = "7u7"
-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"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.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 $arch" >> ~\versions.txt
+echo "Java = $version" >> ~\versions.txt

coin/provisioning/common/install-mingw.ps1

@@ -1,68 +0,0 @@
-############################################################################
-##
-## 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"
-
-function InstallMinGW
-{
-    Param (
-        [string] $release = $(BadParam("release file name")),
-        [string] $sha1    = $(BadParam("SHA1 checksum of the file"))
-    )
-
-    $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
-
-    if ($arch -eq "i686") { $win_arch = "Win32" }
-    elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
-
-    $envvar = "MINGW$version"
-    $envvar = $envvar -replace '["."]'
-    $targetdir = "C:\$envvar"
-    $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
-    $url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z"
-
-    $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
-    Download $url_official $url_cache $mingwPackage
-    Verify-Checksum $mingwPackage $sha1
-
-    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
-
-}

coin/provisioning/common/install-notepad++.ps1

@@ -36,16 +36,9 @@
 # This script will install Notepad++
 
 $version = "7.3"
-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"
+$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"
 $nppPackage = "C:\Windows\Temp\npp-$version.exe"
 
 Download $url_official $url_cache $nppPackage
@@ -57,11 +50,5 @@ Remove-Item -Recurse -Force "$nppPackage"
 
 echo "Notepad++ = $version" >> ~\versions.txt
 
-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"
-}
-
+Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
 echo "Auto-updating disabled."

coin/provisioning/common/install-qnx660.ps1

@@ -1,46 +0,0 @@
-############################################################################
-##
-## 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

coin/provisioning/common/install-ruby.ps1

@@ -36,17 +36,10 @@
 # This script will install Ruby
 
 $version = "2.2.6"
-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"
+$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"
 $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
+$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
 
 Download $url_official $url_cache $rubyPackage
 Verify-Checksum $rubyPackage $sha1
@@ -55,6 +48,7 @@ cmd /c "$rubyPackage /silent"
 echo "Cleaning $rubyPackage.."
 Remove-Item -Recurse -Force "$rubyPackage"
 
-Add-Path "C:\Ruby22-x64\bin"
+$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Ruby22-x64\bin", [EnvironmentVariableTarget]::Machine)
 
 echo "Ruby = $version" >> ~\versions.txt

coin/provisioning/common/install-sevenzip.ps1

@@ -36,19 +36,10 @@
 # This script installs 7-Zip
 
 $version = "1604"
-
-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"
+$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"
 $7zPackage = "C:\Windows\Temp\7zip-$version.exe"
+$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"
 
 Download $url_official $url_cache $7zPackage
 Verify-Checksum $7zPackage $sha1

coin/provisioning/common/install-strawberry-perl.ps1

@@ -36,17 +36,10 @@
 # This script installs Strawberry Perl
 
 $version = "5.26.0.1"
-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"
+$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"
 $strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi"
+$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
 
 Download $url_official $url_cache $strawberryPackage
 Verify-Checksum $strawberryPackage $sha1

coin/provisioning/common/mqtt_broker.ps1

@@ -1,50 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-. "$PSScriptRoot\helpers.ps1"
-
-echo "MQTT: Downloading Paho test broker..."
-$zip = "c:\users\qt\downloads\pahotest.zip"
-$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
-$sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
-
-Download $externalUrl $internalUrl $zip
-Verify-Checksum $zip $sha1
-
-echo "MQTT: Installing $zip..."
-Extract-Zip $zip C:\Utils
-Remove-Item $zip
-
-echo "MQTT: Updating environment..."
-[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine")

coin/provisioning/common/mqtt_broker.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-# This script installs paho testing broker
-
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
-
-CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
-PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
-SHA1="532fe145096cdd8d679f425cbfd883289150c968"
-targetFolder="/opt/paho_broker"
-appPrefix="paho.mqtt.testing-$CommitSHA"
-
-sudo rm -fr "$targetFolder"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding MQTT broker path to environment"
-sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc

coin/provisioning/common/mysql.ps1

@@ -62,28 +62,21 @@ try {
     Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
 } catch {}
 
-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"
+# 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
 

coin/provisioning/common/openssl.ps1

@@ -40,39 +40,30 @@ $version = "1_0_2j"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
-if( (is64bitWinHost) -eq 1 ) {
+# 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"
 
-    # 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 "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 "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 "Remove downloaded $packagex64 ..."
+Remove-Item $packagex64
 
-    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")
-}
+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"
-
-if( (is64bitWinHost) -eq 1 ) {
-    $installFolder = "C:\openssl$architecture"
-} else {
-    $installFolder = "C:\openssl"
-}
-
+$installFolder = "C:\openssl$architecture"
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"

coin/provisioning/common/postgresql.ps1

@@ -40,45 +40,37 @@ $version = "9.1.9-1"
 $packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip"
 $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
 
-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"
+# 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

coin/provisioning/common/python.ps1

@@ -30,23 +30,27 @@
 ## $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"
-if( (is64bitWinHost) -eq 1 ) {
-    $arch = ".amd64"
+$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"
     $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 }
 else {
-    $arch = ""
+    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi"
     $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
@@ -59,7 +63,8 @@ echo "Chancing allowZip64 value to 'True'..."
 echo "Remove $package..."
 del $package
 
-Add-Path "C:\Python27;C:\Python27\Scripts"
+$oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+[Environment]::SetEnvironmentVariable("Path", $oldPath + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine)
 
 C:\Python27\python.exe -m ensurepip
 # Install python virtual env

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..."
-Start-Process -FilePath $package -ArgumentList "/q" -Wait
+cmd /c "$package /q"
 echo "Remove $package..."
 del $package

coin/provisioning/common/vulkansdk.ps1

@@ -1,48 +0,0 @@
-############################################################################
-##
-## 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"
-
-# This script will install Vulkan SDK
-
-$version = "1.0.51.0"
-$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
-$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
-
-Copy-Item $url_cache $vulkanPackage
-cmd /c "$vulkanPackage /S"
-
-echo "Cleaning $vulkanPackage.."
-Remove-Item -Recurse -Force "$vulkanPackage"
-
-echo "Vulkan SDK = $version" >> ~\versions.txt

coin/provisioning/common/winrtrunner.ps1

@@ -1,10 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$zip = "c:\users\qt\downloads\winrtrunner.zip"
-
-Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip
-Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
-Extract-Zip $zip C:\Utils\winrtrunner
-Remove-Item $zip
-
-[Environment]::SetEnvironmentVariable("CI_WINRTRUNNER_PATH", "C:\Utils\winrtrunner", "Machine")

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh

@@ -87,13 +87,7 @@ function InstallAndroidPackage {
     sudo rm -fr "$targetFolder"/"$version"
 }
 
-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; )
-
+sudo mkdir "$targetFolder"
 # Install Android SDK
 echo "Installing Android SDK version $sdkPackage..."
 InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"

coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh

@@ -1,49 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-sudo apt-get update
-sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev
-
-TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
-trap "sudo rm -fr $TEMPDIR" EXIT
-cd $TEMPDIR
-git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua
-cd freeopcua
-git checkout ca75e05a8e63d88dbfc259e1251f405106411b66
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local ..
-make
-sudo make install

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

@@ -5,4 +5,4 @@ sudo pkcon -y refresh
 sudo pkcon -y install python-devel python-virtualenv
 
 # install python3
-sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv
+sudo pkcon -y install python3 python3-pip python3-virtualenv

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh

@@ -1,36 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 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$
-##
-#############################################################################
-
-source "${BASH_SOURCE%/*}/../common/mqtt_broker.sh"

coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1

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

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

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

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

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

coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1

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

coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"

coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"

coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1

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

coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1

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

coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1

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

coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1

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

coin/provisioning/qtci-windows-10-x86_64/08-install-java.ps1

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

coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1

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

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1

@@ -1,10 +0,0 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
-
-# This script will install MinGW 5.3.0
-
-$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0"
-$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A"
-
-InstallMinGW $release $sha1
-
-

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1

@@ -1,8 +0,0 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
-
-# This script will install MinGW 6.3.0
-
-$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2"
-$sha1    = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B"
-
-InstallMinGW $release $sha1

coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1

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

coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"

coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"

coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1

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

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

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

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

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

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

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

coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1

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

coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1

@@ -0,0 +1,5 @@
+# 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

coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1

@@ -0,0 +1,3 @@
+
+# Disable the windows search indexing service
+sc.exe config WSearch start= disabled

coin/provisioning/qtci-windows-8-x86/06-python.ps1

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

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

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

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

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

coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1

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

coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"

coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"

coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"

coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1

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

coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1

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

coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1

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

coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1

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

coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1

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

coin/provisioning/qtci-windows-8.1-x86/06-python.ps1

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

coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1

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

coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1

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

coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1

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

coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1

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

coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"

coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1

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

coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1

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

coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1

@@ -1,51 +0,0 @@
-#############################################################################
-##
-## 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

coin/provisioning/qtci-windows-8.1-x86/openssl.ps1

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

coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1

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