Update submodules on '5.9' in qt5

Change-Id: I038001efcd21e74f02786441c4a30c81d30d1336 Reviewed-by: Liang Qi <liang.qi@qt.io>
Provisioning: Remove logical OR when echo errors
2025-12-27 02:15:59 +08:00 · 2017-11-08 10:00:31 +00:00 · 2017-11-07 15:25:12 +00:00 · 2017-11-07 15:25:04 +00:00 · 2017-11-06 07:56:18 +00:00 · 2017-11-06 07:56:14 +00:00
202 changed files with 1759 additions and 603 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9.2
+	branch = 5.9
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9.2
+	branch = 5.9
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,101 +211,101 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.9.2
+	branch = 5.9
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.9.2
+	branch = 5.9
 	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.9.2
+	branch = 5.9
 	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.9.2
+	branch = 5.9
 	status = preview
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,23 +1,24 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release DisableTests
-qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
-qtci-windows-7-x86-2                                                Mingw53     DeveloperBuild Release OpenGLDynamic
-qtci-windows-10-x86_64-7                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-7-x86-3                                                Mingw53     DeveloperBuild Release OpenGLDynamic
+qtci-windows-10-x86_64-10                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
+qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 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       DebugAndRelease Release
+qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker
+qtci-macos-10.12-x86_64-8                                           Clang       Packaging 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-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_Morty       armv7       GCC         Release
+qtci-macos-10.12-x86_64-8           IOS_ANY             x86_64      Clang       Release DisableTests Static
+qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                arm64       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
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,23 +1,25 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86-2                                        MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                         x86         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_64-10    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-2                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-7    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.2-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.2-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-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-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
+qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
+qtci-windows-10-x86_64-10    QNX_700             armv7       Mingw53     Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_700             x86         Mingw53     Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  INTEGRITY_11_04     armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,3 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1  Boot2Qt_Morty       armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                arm64       GCC         DeveloperBuild
--- a/coin/platform_configs/qtwebkit.txt
+++ b/coin/platform_configs/qtwebkit.txt
@@ -2,4 +2,4 @@ Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-7                        x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-7-x86-2                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
--- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
@@ -36,7 +36,7 @@
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017

 $version = "2017_version_15.0"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
 $sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
 $msvcPackage = "C:\Windows\Temp\$version.exe"

--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
@@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB

 $msvc_web_installer = "vs" + $version + "_" + $update_version
 $package = "C:\Windows\temp\$msvc_web_installer.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
 $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
 $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"

--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -36,7 +36,7 @@
 # This script will install Visual Studio 2017

 $version = "2017"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
 $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
 $msvcPackage = "C:\Windows\Temp\$version.exe"

--- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
@@ -36,7 +36,7 @@
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017

 $version = "2017_version_15.0"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
 $sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
 $msvcPackage = "C:\Windows\Temp\$version.exe"

--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB

 $msvc_web_installer = "vs" + $version + "_" + $update_version
 $package = "C:\Windows\temp\$msvc_web_installer.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
 $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
 $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"

--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -36,7 +36,7 @@
 # This script will install Visual Studio 2017

 $version = "2017"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
 $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
 $msvcPackage = "C:\Windows\Temp\$version.exe"

--- a/coin/provisioning/common/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/common/3dstudio_3rdparty.ps1
@@ -2,7 +2,7 @@

 $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"

-Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
 Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
 Remove-Item $zip
--- 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/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
@@ -42,6 +42,7 @@ source "${BASH_SOURCE%/*}/try_catch.sh"
 # shellcheck source=DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

+ExceptionDownload=99
 ExceptionCreateTmpFile=100
 ExceptionCreateTmpDirectory=101
 ExceptionUncompress=102
@@ -80,7 +81,7 @@ function InstallAppFromCompressedFileFromURL {
        else
            targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
        fi
-        DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
+        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
        echo "Uncompress $targetFile"
        case $extension in
            "tar.gz")
@@ -103,6 +104,9 @@ function InstallAppFromCompressedFileFromURL {

    catch || {
        case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
            $ExceptionCreateTmpFile)
                echo "Failed to create temporary file"
                exit 1;
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
@@ -38,6 +38,7 @@ source "${BASH_SOURCE%/*}/try_catch.sh"
 # shellcheck source=DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

+ExceptionDownload=99
 ExceptionCreateTmpFile=100
 ExceptionCreateTmpDirectory=101
 ExceptionUncompress=102
@@ -66,7 +67,7 @@ function InstallFromCompressedFileFromURL {
        echo "Creating temporary file and directory"
        targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile
        targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
+        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
        echo "Uncompress $targetFile"
        case $extension in
            "tar.gz")
@@ -90,6 +91,9 @@ function InstallFromCompressedFileFromURL {

    catch || {
        case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
            $ExceptionCreateTmpFile)
                echo "Failed to create temporary file"
                exit 1;
--- a/coin/provisioning/common/android_linux.sh
+++ b/coin/provisioning/common/android_linux.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script install Android sdk and ndk.
+
+# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
+
+source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+targetFolder="/opt/android"
+sdkTargetFolder="$targetFolder/sdk"
+
+basePath="http://ci-files01-hki.intra.qt.io/input/android"
+
+toolsVersion="r25.2.5"
+toolsFile="tools_$toolsVersion-linux.zip"
+ndkVersion="r10e"
+ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
+sdkBuildToolsVersion="25.0.2"
+sdkApiLevel="android-21"
+
+toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"
+ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
+
+toolsTargetFile="/tmp/$toolsFile"
+toolsSourceFile="$basePath/$toolsFile"
+ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"
+
+ExceptionDownload=99
+ExceptionUnzipTools=100
+ExceptionUnzipNdk=101
+ExceptionRmTools=102
+ExceptionRmNdk=103
+ExceptionSdkManager=104
+
+try
+(
+    (DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload
+    (DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload
+    echo "Unzipping Android NDK to '$targetFolder'"
+    sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
+    echo "Unzipping Android Tools to '$sdkTargetFolder'"
+    sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
+    rm "$ndkTargetFile" || throw $ExceptionRmNdk
+    rm "$toolsTargetFile" || throw $ExceptionRmTools
+
+    echo "Changing ownership of Android files."
+    sudo chown -R qt:wheel "$targetFolder"
+
+    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+
+    echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
+    echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
+    echo "export ANDROID_NDK_HOST=linux-x86_64" >> ~/.bashrc
+    echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc
+
+    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+    echo "Android NDK = $ndkVersion" >> ~/versions.txt
+)
+catch || {
+        case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
+            $ExceptionUnzipTools)
+                echo "Failed to unzip Android SDK Tools."
+                exit 1;
+            ;;
+            $ExceptionUnzipNdk)
+                echo "Failed to unzip Android NDK."
+                exit 1;
+            ;;
+            $ExceptionRmTools)
+                echo "Failed to remove temporary tools package '$toolsTargetFile'."
+                exit 1;
+            ;;
+            $ExceptionRmNdk)
+                echo "Failed to remove temporary NDK package '$ndkTargetFile'."
+                exit 1;
+            ;;
+            $ExceptionSdkManager)
+                echo "Failed to run sdkmanager."
+                exit 1;
+            ;;
+        esac
+}
+
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -44,14 +44,10 @@ Download $officialurl $cachedurl $zip
 Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"

 Extract-Zip $zip C:
-# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS
-if((Test-Path -Path "C:\CMake" )){
-    try {
-        Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old
-    } catch {}
-}
 $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/cmake_linux.sh
+++ b/coin/provisioning/common/cmake_linux.sh
@@ -37,8 +37,8 @@

 # CMake is needed for autotests that verify that Qt can be built with CMake

-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"

 version="3.6.2"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -28,7 +28,10 @@ function Extract-7Zip
        if (-not (test-path $zipExe)) {
            $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe'
            if (-not (test-path $zipExe)) {
-                throw "Could not find 7-zip."
+                $zipExe = "C:\Utils\sevenzip\7z.exe"
+                if (-not (test-path $zipExe)) {
+                    throw "Could not find 7-zip."
+                }
            }
        }
    } else {
@@ -92,6 +95,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
@@ -109,5 +113,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,30 @@

 . "$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.
+
+$installdir = "C:\Program Files\Java\jre7"

 $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
+
+[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
+Add-Path "$installdir\bin"
+
+echo "Java = $version $arch" >> ~\versions.txt
--- a/coin/provisioning/common/install-jdk.ps1
+++ b/coin/provisioning/common/install-jdk.ps1
@@ -0,0 +1,78 @@
+############################################################################
+##
+## 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 Java SE
+
+$installdir = "C:\Program Files\Java\jdk1.8.0_144"
+
+$version = "8u144"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "x64"
+    $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858"
+}
+else {
+    $arch = "i586"
+    $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
+}
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
+$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
+$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
+
+echo "Fetching Java SE $version..."
+$ProgressPreference = 'SilentlyContinue'
+try {
+    echo "...from local cache"
+    Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage
+} catch {
+    echo "...from oracle.com"
+    $client = new-object System.Net.WebClient
+    $cookie = "oraclelicense=accept-securebackup-cookie"
+    $client.Headers.Add("Cookie", $cookie)
+    $client.DownloadFile($official_url, $javaPackage)
+
+    Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage
+}
+
+Verify-Checksum $javaPackage $sha1
+
+cmd /c "$javaPackage /s SPONSORS=0"
+echo "Cleaning $javaPackage.."
+Remove-Item -Recurse -Force "$javaPackage"
+
+[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
+Add-Path "$installdir\bin"
+
+echo "Java SE = $version $arch" >> ~\versions.txt
--- a/coin/provisioning/common/install-mingw.ps1
+++ b/coin/provisioning/common/install-mingw.ps1
@@ -0,0 +1,68 @@
+############################################################################
+##
+## 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
+
+}
--- 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
@@ -35,17 +35,30 @@

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

 Download $url_official $url_cache $7zPackage
 Verify-Checksum $7zPackage $sha1
-cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\"
+Start-Process -FilePath $7zPackage -ArgumentList "/S","/D=$7zTargetLocation" -Wait

 echo "Cleaning $7zPackage.."
 Remove-Item -Recurse -Force "$7zPackage"

+Add-Path $7zTargetLocation
+
 echo "7-Zip = $version" >> ~\versions.txt
--- 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/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh
@@ -38,7 +38,7 @@
 source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"

 version="11.4.4"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/integrity/ghs_$version.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
 AltUrl="$PrimaryUrl" # we lack an external source for this
 SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
 targetFolder="/opt/ghs"
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/mysql.ps1
@@ -57,26 +57,28 @@ function DownloadAndInstall
    Remove-Item $package
 }

-# Remove any leftovers
-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

--- a/coin/provisioning/common/ninja.ps1
+++ b/coin/provisioning/common/ninja.ps1
@@ -2,11 +2,10 @@

 $zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip"

-Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.ci.local\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
+Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
 Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"

 Extract-Zip $zip C:\Utils\Ninja
 Remove-Item $zip

-$machinePath = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine)
-[Environment]::SetEnvironmentVariable("Path", $machinePath + ";C:\Utils\Ninja", [EnvironmentVariableTarget]::Machine)
+Add-Path "C:\Utils\Ninja"
--- 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/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/openssl_for_android_linux.sh
@@ -0,0 +1,85 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script install OpenSSL from sources.
+# Requires GCC and Perl to be in PATH.
+
+source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
+version="1.0.2g"
+officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
+targetFile="/tmp/openssl-$version.tar.gz"
+installFolder="/home/qt/"
+sha="36af23887402a5ea4ebef91df8e61654906f58f2"
+# Until every VM doing Linux Android builds have provisioned the env variable
+# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
+# QTQAINFRA-1436
+opensslHome="${installFolder}openssl-1.0.2"
+
+ExceptionDownload=99
+ExceptionTar=100
+ExceptionConfig=101
+
+try
+(
+    (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload
+
+    tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar
+    # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
+    mv "${opensslHome}g" "${opensslHome}"
+    pushd "$opensslHome"
+    perl Configure shared android || throw $ExceptionConfig
+
+    echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc
+    echo "OpenSSL for Android = $version" >> ~/versions.txt
+)
+catch || {
+    case $ex_code in
+        $ExceptionDownload)
+            exit 1;
+        ;;
+        $ExceptionTar)
+            echo "Failed to extract $targetFile"
+            exit 1;
+        ;;
+        $ExceptionConfig)
+            echo "Failed to run 'config'."
+            exit 1;
+        ;;
+    esac
+
+}
--- a/coin/provisioning/common/postgresql.ps1
+++ b/coin/provisioning/common/postgresql.ps1
@@ -40,37 +40,40 @@ $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 {}
+    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/python3.ps1
+++ b/coin/provisioning/common/python3.ps1
@@ -46,12 +46,12 @@ $install_path = "C:\Python36"
 if ( $archVer -eq 64 ) {
    echo "Running in 64 bit system"
    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe"
    $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff"
 }
 else {
    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe"
    $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1"
 }

--- a/coin/provisioning/common/python3.sh
+++ b/coin/provisioning/common/python3.sh
@@ -38,7 +38,7 @@

 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
 AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
 SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9"
 DestDir="/"
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
@@ -35,21 +35,18 @@

 # This script installs QNX 7.

-set -e
+set -ex
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.ci.local/input/qnx/qnx700.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
 sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
 folderName="qnx700"
 targetFile="qnx700.tar.xz"
-wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times"
-echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
  mkdir -p $targetFolder
 fi
-if [ -d "$targetFolder/$folderName" ]; then
-  rm -rf $targetFolder/$folderName
-fi
-sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile"
+sudo tar -C $targetFolder -Jxf $targetFile
 sudo chown -R qt:users "$targetFolder"/"$folderName"

 # Verify that we have last file in tar
@@ -60,5 +57,5 @@ fi

 rm -rf $targetFile
 # Set env variables
-echo 'export QNX_700=$targetFolder/$folderName' >> ~/.bashrc
+echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc
 echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/common/ruby.ps1
+++ b/coin/provisioning/common/ruby.ps1
@@ -2,6 +2,6 @@

 $installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"

-Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer
+Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer
 Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
 & $installer /DIR=C:\ruby /VERYSILENT
--- a/coin/provisioning/common/vc_redist.ps1
+++ b/coin/provisioning/common/vc_redist.ps1
@@ -43,13 +43,13 @@ if ( $archVer -eq 64 ) {
    echo "Running in 64 bit system"
    $arch = "x64"
    $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x64.exe"
    $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c"
 }
 else {
    $arch = "x86"
    $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x86.exe"
    $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1"
 }

@@ -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/common/windows_removethemall.ps1
+++ b/coin/provisioning/common/windows_removethemall.ps1
@@ -1,61 +0,0 @@
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-Function Remove {
-Param (
-        [string]$1
-    )
-        If (Test-Path $1){
-        echo "Remove $1"
-        Remove-Item -Recurse -Force $1
-    }Else{
-        echo "'$1' does not exists or already removed !!"
-    }
-
-}
-
-Function Remove-Path {
-    Param (
-        [string]$Path
-    )
-    echo "Remove $path from Path"
-    $name = "Path"
-    $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";"
-    $type = "Machine"
-    [System.Environment]::SetEnvironmentVariable($name,$value,$type)
-}
-
-# Remove Android sdk and ndk
-dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
-[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
-[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
--- 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
@@ -43,7 +43,7 @@
 # E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
 # That's why we need to use Andoid-21 API version in Qt 5.9.

-set -e
+set -ex
 targetFolder="/opt/android"
 baseUrl="http://ci-files01-hki.intra.qt.io/input/android"

@@ -78,8 +78,8 @@ function InstallAndroidPackage {
    folderName=$7
    name=$8

-    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times"
-    echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
+    echo "$sha1  $targetFile" | sha1sum --check
    sudo chmod 755 "$targetFile"
    sudo $extract || echo "Failed to extract $url"
    sudo chown -R qt:users "$targetFolder"/"$folderName"
@@ -87,7 +87,13 @@ function InstallAndroidPackage {
    sudo rm -fr "$targetFolder"/"$version"
 }

+if [ -d "$targetFolder" ]; then
+    echo "Removing old Android installation"
+    sudo rm -fr "$targetFolder"
+fi
+
 sudo mkdir "$targetFolder"
+
 # Install Android SDK
 echo "Installing Android SDK version $sdkPackage..."
 InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
@@ -98,7 +104,7 @@ InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFil

 # run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
 echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
+echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion

 echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc

--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
@@ -35,7 +35,7 @@

 # This script installs the right ICU version

-set -e
+set -ex
 icuVersion="56.1"
 icuLocation="/usr/lib64"
 sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
@@ -45,10 +45,10 @@ function Install7ZPackageFromURL {
    expectedSha1=$2
    targetDirectory=$3

-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
+    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
    rm $targetFile
 }

@@ -61,7 +61,7 @@ echo "Installing custom ICU devel packages on RHEL"

 sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
 develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
-tempDir=`mktemp -d` || echo "Failed to create temporary directory"
+tempDir=`mktemp -d`
 trap "sudo rm -fr $tempDir" EXIT
 Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
 sudo cp -a $tempDir/lib/* /usr/lib64
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
@@ -39,7 +39,7 @@
 # A copy of the patch must be in the root of the Coin path in
 # provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip

-set -e
+set -ex
 sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"

 function InstallZipPackageFromURL {
@@ -47,12 +47,12 @@ function InstallZipPackageFromURL {
    expectedSha1=$2
    targetDirectory=$3

-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check

-    tempDir=`mktemp -d` || echo "Failed to create temporary directory"
-    /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive"
+    tempDir=`mktemp -d`
+    /usr/bin/unzip -o -d $tempDir $targetFile
    trap "sudo rm -fr $targetFile $tempDir" EXIT

    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh
@@ -1 +0,0 @@
-"${BASH_SOURCE%/*}/../common/linux-removethemall.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
@@ -1,18 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo yum install -y python-devel python-virtualenv
-
-# install the EPEL repository which provides python3
-wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-sudo rpm -Uvh epel-release-latest-7.noarch.rpm
-sudo rm -f epel-release-latest-7.noarch.rpm
-
-# install python3
-sudo yum install -y python34-devel
-
-# install pip3
-wget https://bootstrap.pypa.io/get-pip.py
-sudo python3 get-pip.py
-sudo rm -f get-pip.py
-sudo pip3 install virtualenv
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
@@ -1 +0,0 @@
-$(dirname $0)/../common/cmake_linux.sh
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh
@@ -1,117 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3
-
-# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6.
-
-# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
-# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
-# That's why we need to use Andoid-21 API version in Qt 5.9.
-
-set -e
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.ci.local/input/android"
-
-# SDK
-sdkPackage="android-sdk_r24.4.1-linux.tgz"
-sdkBuildToolsVersion="23.0.3"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkPackage"
-sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
-sdkTargetFile="$targetFolder/$sdkPackage"
-sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
-sdkFolderName="android-sdk-linux"
-sdkName="sdk"
-
-# NDK
-ndkVersion="r10e"
-ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip"
-ndkUrl="$baseUrl/$ndkPackage"
-ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
-ndkTargetFile="$targetFolder/$ndkPackage"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-$ndkVersion"
-ndkName="ndk"
-
-function InstallAndroidPackage {
-    targetFolder=$1
-    version=$2
-    url=$3
-    sha1=$4
-    targetFile=$5
-    extract=$6
-    folderName=$7
-    name=$8
-
-    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times"
-    echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-    sudo chmod 755 "$targetFile"
-    sudo $extract || echo "Failed to extract $url"
-    sudo chown -R qt:users "$targetFolder"/"$folderName"
-    sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name"
-    sudo rm -fr "$targetFolder"/"$version"
-}
-
-sudo mkdir "$targetFolder"
-
-# Install Android SDK
-echo "Installing Android SDK version $sdkPackage..."
-InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-echo "Installing Android NDK version $ndkPackage..."
-InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
-
-# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
-
-# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18
-# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one.
-# echo 'export ANDROID_API_VERSION=$sdkApiLevel' >> ~/.bashrc
-
-# Storage version information to ~/versions.txt, which is used to print version information to provision log.
-echo "***** Android SDK *****" >> ~/versions.txt
-echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
-echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt
-platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)"
-echo "Android Platform Tools = $platformTools" >> ~/versions.txt
-sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)"
-echo "Android SDK Tools = $sdkTools" >> ~/versions.txt
-echo "***** Android NDK *****" >> ~/versions.txt
-echo "Android NDK Version = $ndkVersion" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh
@@ -1,11 +0,0 @@
-# gstreamer 1 for QtMultimedia
-# gtk3 style for QtGui/QStyle
-# libusb1 for tqtc-boot2qt/qdb
-# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
-
-sudo yum install -y \
-    gstreamer1-devel gstreamer1-plugins-base-devel \
-    gtk3-devel \
-    libusb1-devel \
-    speech-dispatcher-devel
-
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# refresh local certificates
+sudo subscription-manager refresh
+
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -31,22 +33,19 @@
 ##
 #############################################################################

-. "$PSScriptRoot\..\common\helpers.ps1"
+set -e

-$version = "11_2_2"
-$openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
+BASEDIR=$(dirname "$0")
+source $BASEDIR/../common/network_test_server_ip.txt

-$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll"
-$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
+echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
+echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
+echo "Set DISPLAY"
+echo 'export DISPLAY=":0"' >> ~/.bashrc
+# for current session
+export DISPLAY=:0

-echo "Take ownership of existing opengl32.dll from SysWOW64"
-takeown /f $openglPackage
-icacls $openglPackage /grant Administrators:F
-echo "Remove existing opengl32.dll from SysWOW64"
-Remove-Item -Recurse -Force $openglPackage
-echo "Add new opengl32.dll to SysWOW64"
-Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage
-Verify-Checksum $openglPackage $openglSha1
-
-# Store version information to ~/versions.txt
-echo "OpenGL x86 = $version" >> ~/versions.txt
+# disable Automatic screen lock
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+# disable blank screen power saving
+gsettings set org.gnome.desktop.session idle-delay 0
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/bin/bash

 #############################################################################
 ##
@@ -33,17 +33,8 @@
 ##
 #############################################################################

-# This script removes preinstalled sw.
-# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script
+sudo yum-config-manager --enable rhel-server-rhscl7-rpms
+sudo yum -y install devtoolset-6

-function RemoveDir {
-    targetFolder=$1
+echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc

-    if [ -d "$targetFolder" ]; then
-        echo "Removing existing $targetFolder..."
-        sudo rm -fr "$targetFolder"
-    fi
-}
-
-# Android
-RemoveDir /opt/android
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+set -e
+
+sudo yum -y update
+
+sudo yum -y install git
+sudo yum -y install zlib-devel
+sudo yum -y install glib2-devel
+sudo yum -y install openssl-devel
+sudo yum -y install freetype-devel
+sudo yum -y install fontconfig-devel
+
+# EGL support
+sudo yum -y install mesa-libEGL-devel
+sudo yum -y install mesa-libGL-devel
+
+sudo yum -y install libxkbfile-devel
+
+# Xinput2
+sudo yum -y install libXi-devel
+
+sudo yum -y install python-devel
+sudo yum -y install mysql-server mysql
+sudo yum -y install mysql-devel
+sudo yum -y install postgresql-devel
+sudo yum -y install cups-devel
+sudo yum -y install dbus-devel
+
+# We have to downgrade to an older version of graphite2
+# to avoid a dependency version mismatch with gtk3-devel package.
+
+sudo yum -y downgrade graphite2-1.3.6-1.el7_2
+
+# gstreamer 1 for QtMultimedia
+sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel
+
+# gtk3 style for QtGui/QStyle
+sudo yum -y install gtk3-devel
+
+# libusb1 for tqtc-boot2qt/qdb
+sudo yum -y install libusb-devel
+
+# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
+sudo yum -y install speech-dispatcher-devel
+
+# Python
+sudo yum -y install python-devel python-virtualenv
+
+# WebEngine
+sudo yum -y install bison
+sudo yum -y install flex
+sudo yum -y install gperf
+sudo yum -y install alsa-lib-devel
+sudo yum -y install pulseaudio-libs-devel
+sudo yum -y install libXtst-devel
+
+# For Android builds
+sudo yum -y install java-1.8.0-openjdk-devel
+
+# For receiving shasum
+sudo yum -y install perl-Digest-SHA
+
+# INTEGRITY requirements
+sudo yum -y install glibc.i686
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+name="p7zip"
+version="7-11"
+package="epel-release-$version.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
+sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
+targetFile="/tmp/$package"
+
+DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
+
+sudo rpm -ivh "$targetFile"
+sudo yum -y install "$name"
+sudo rm "$targetFile"
+
+# Link 7za to 7z so we can use existing installation scripts
+sudo ln -s /usr/bin/7za /usr/bin/7z
+
+echo "$name = $version" >> ~/versions.txt
+
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script installs CMake 3.6.2
+
+# CMake is needed for autotests that verify that Qt can be built with CMake
+
+source "${BASH_SOURCE%/*}/../common/cmake_linux.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/qnx_700.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/integrity.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh
@@ -1,11 +1,11 @@
-#!/bin/env bash
+#!/bin/bash

 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## 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.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -33,38 +33,41 @@
 ##
 #############################################################################

-# This script installs the right ICU version
+set -ex
+
+# This script will install ICU

-set -e
 icuVersion="56.1"
 icuLocation="/usr/lib64"
 sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
-
-function Install7ZPackageFromURL {
-    url=$1
-    expectedSha1=$2
-    targetDirectory=$3
-
-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
-    rm $targetFile
-}
-
-echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
-
 baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
-Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
-
-echo "Installing custom ICU devel packages on RHEL"

 sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
 develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
-tempDir=`mktemp -d` || echo "Failed to create temporary directory"
-trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+
+echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
+
+targetFile=`mktemp`
+wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL
+echo "$sha1  $targetFile" | sha1sum --check
+sudo 7z x -y -o"/usr/lib64" $targetFile
+sudo rm $targetFile
+
+echo "Installing custom ICU devel packages on RHEL"
+
+tempDir=`mktemp -d`
+
+targetFile=`mktemp`
+wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL
+echo "$sha1Dev $targetFile" | sha1sum --check
+7z x -y -o$tempDir $targetFile
+
 sudo cp -a $tempDir/lib/* /usr/lib64
 sudo cp -a $tempDir/* /usr/

+sudo rm $targetFile
+sudo rm -fr $tempDir
+
 sudo /sbin/ldconfig
+
+echo "ICU = $icuVersion" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+source /opt/rh/devtoolset-6/enable
+source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/android_linux.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
@@ -32,18 +32,18 @@
 ##
 #############################################################################

-set -e
+set -ex
 # build latest qemu to usermode
 sudo apt-get -y install automake autoconf libtool

-tempDir=$(mktemp -d) || echo "Failed to create temporary directory"
+tempDir=$(mktemp -d)
 git clone git://git.qemu.org/qemu.git "$tempDir"
 cd "$tempDir"

 #latest commit from the master proven to work
 git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f
 git submodule update --init pixman
-./configure --target-list=arm-linux-user --static
+./configure --target-list=arm-linux-user,aarch64-linux-user --static
 make
 sudo make install
 rm -rf "$tempDir"
@@ -51,13 +51,19 @@ rm -rf "$tempDir"
 # Enable binfmt support
 sudo apt-get -y install binfmt-support

-# Install qemu binfmt
+# Install qemu binfmt for 32bit and 64bit arm architectures
 sudo update-binfmts --package qemu-arm --install arm \
 /usr/local/bin/qemu-arm \
 --magic \
 "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \
 --mask \
 "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"
+sudo update-binfmts --package qemu-aarch64 --install aarch64 \
+/usr/local/bin/qemu-aarch64 \
+--magic \
+"\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \
+--mask \
+"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"

 # First test using QFont fails if fonts-noto-cjk is installed. This happens because
 # running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script installs the Yocto toolchain
+
+set -e
+
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+echo "Installing Yocto toolchain for 32-bit b2qt..."
+
+versionARM="2.2.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
+SHA1="2583ae29951954cb27f12400fcb4ee94738d1430"
+yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
+yoctoLocationARMv7="/opt/yocto-armv7"
+sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
+crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-"
+
+DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller"
+chmod +x "$yoctoInstaller"
+
+/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7"
+rm -rf "$yoctoInstaller"
+
+echo "Installing Yocto toolchain for 64-bit b2qt..."
+
+versionARM64="2.2.2"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package"
+SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6"
+yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
+yoctoLocationARM64="/opt/yocto-arm64"
+sysrootARM64="sysroots/aarch64-poky-linux"
+crosscompileARM64="sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-"
+
+DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller"
+chmod +x "$yoctoInstaller"
+
+/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64"
+rm -rf "$yoctoInstaller"
+
+if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then
+    echo "export QEMUARMV7_TOOLCHAIN_SYSROOT=$yoctoLocationARMv7/$sysrootARMv7" >> ~/.profile
+    echo "export QEMUARMV7_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARMv7/$crosscompileARMv7" >> ~/.profile
+    echo "export QEMUARM64_TOOLCHAIN_SYSROOT=$yoctoLocationARM64/$sysrootARM64" >> ~/.profile
+    echo "export QEMUARM64_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARM64/$crosscompileARM64" >> ~/.profile
+else
+    echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2
+    exit 1
+fi
+
+echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt
+echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
@@ -44,3 +44,5 @@ sudo zypper -nq install libXcomposite-devel
 sudo zypper -nq install libXcursor-devel
 sudo zypper -nq install libXrandr-devel
 sudo zypper -nq install libXtst-devel
+sudo zypper -nq install mozilla-nspr-devel
+sudo zypper -nq install mozilla-nss-devel
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# This script install Intel Parallel Studio XE Composer Edition for C++ Linux
+
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+set -e
+
+mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
+localMount="/mnt/storage/"
+
+iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz"
+iccPackageSource="$localMount/intel/$iccPackage"
+iccInstallPath="/opt/intel"
+iccTmpPath="/tmp/icc"
+
+iccLicense="l_icc.lic"
+iccLicenseSource="$localMount/semisecure/$iccLicense"
+iccLicenseTarget="/home/qt/$iccLicense"
+
+iccInstallInstructions="$iccTmpPath/instructions.txt"
+
+sudo mkdir -p "$localMount"
+sudo mount "$mainStorage" "$localMount"
+mkdir -p "$iccTmpPath"
+tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1
+
+cp "$iccLicenseSource" "$iccLicenseTarget"
+
+sudo umount "$localMount"
+
+cat >"$iccInstallInstructions" <<EOT
+ACCEPT_EULA=accept
+CONTINUE_WITH_OPTIONAL_ERROR=yes
+PSET_INSTALL_DIR=$iccInstallPath
+CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
+PSET_MODE=install
+ACTIVATION_LICENSE_FILE=$iccLicenseTarget
+ACTIVATION_TYPE=license_file
+PHONEHOME_SEND_USAGE_DATA=no
+ARCH_SELECTED=ALL
+COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
+EOT
+
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
+
+# Export LD_LIBRARY_PATH to Coin
+echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc
+echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc
+echo "ICC = 18.0.0 20170811" >> ~/versions.txt
+
+rm -rf "$iccTmpPath"
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
+++ b/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 python3 python3-pip python3-virtualenv
+sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv
--- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/XZ.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
 AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
 SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
 DestDir="/"
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
@@ -49,7 +49,7 @@ ExceptionRemoveTmpFile=106
 ExceptionDisableAutoUpdate=107


-url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg
+url=http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg
 url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
 targetFile=/tmp/jdk-8u102-macosx-x64.dmg
 expectedSha1=1405af955f14e32aae187b5754a716307db22104
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
@@ -48,4 +48,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 # shellcheck source=../common/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
 appPrefix=""
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
@@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"

 psqlVersion="9.6.0"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip"
 AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip"
 SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
 appPrefix=""
--- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
@@ -43,7 +43,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"

-basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android"
+basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"

 toolsVersion="r25.2.5"
 toolsFile="tools_$toolsVersion-macosx.zip"
@@ -79,15 +79,15 @@ try
    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager

-    echo "export ANDROID_SDK_ROOT=$sdkTargetFolder" >> ~/.bashrc
+    echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
    echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
    echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc
    echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc

-    echo "Android SDK tools = $toolsVersion" >> ~/version.txt
-    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/version.txt
-    echo "Android SDK API level = $sdkApiLevel" >> ~/version.txt
-    echo "Android NDK = $ndkVersion" >> ~/version.txt
+    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+    echo "Android NDK = $ndkVersion" >> ~/versions.txt
 )
 catch || {
        case $ex_code in
--- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
@@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"

 opensslVersion="1.0.2k"
 opensslFile="openssl-$opensslVersion.tar.gz"
-opensslDlUrl="http://ci-files01-hki.ci.local/input/openssl/$opensslFile"
+opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
 opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"

--- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/XZ.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg"
 AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
 SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
 DestDir="/"
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
@@ -50,4 +50,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 # shellcheck source=../common/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/install_xcode.sh"

-InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
 appPrefix=""
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
 AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"
 SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
 appPrefix=""
--- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
--- 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/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.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/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -37,7 +37,7 @@

 $zip = "c:\users\qt\downloads\qnx700.7z"

-Invoke-WebRequest -UseBasicParsing  http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip
+Invoke-WebRequest -UseBasicParsing  http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip
 Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
 Extract-7Zip $zip C:\

--- 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
+
+$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0"
+$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A"
+
+InstallMinGW $release $sha1
+
+
--- 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
+
+$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2"
+$sha1    = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B"
+
+InstallMinGW $release $sha1
--- 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-10-x86_64/patch_qnx.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\patch_qnx.ps1"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Liang Qi	207494b1d3	Update submodules on '5.9' in qt5 Change-Id: I038001efcd21e74f02786441c4a30c81d30d1336 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-11-08 10:00:31 +00:00
Heikki Halmet	0e278c4e95	Provisioning: Remove logical OR when echo errors set -e won't work if logical OR is used after commands. These error echo's need to be removed so that error catch will works. Also set -ex added to print executed command when error caught. Task-number: QTQAINFRA-1533 Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-11-07 15:25:12 +00:00
Tony Sarajärvi	894c63834b	Fix spelling of ANDROID_SDK_HOME It was incorrectly created at ANDROID_SDK_ROOT, but Coin doesn't use that env variable. It uses _HOME. Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-11-07 15:25:04 +00:00
Joni Jäntti	e3deccd936	Yocto toolchain provisioning to CI Provisioning scripts need to install Yocto toolchains (32 and 64 bit) so that the artifacts aren't needed to be unzipped during Qt builds. Task-number: QTQAINFRA-1454 Change-Id: Idceeabb7aa9ffe2555fb98c94916f8429c32af75 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-11-06 07:56:18 +00:00
Qt Submodule Update Bot	f132490a61	Update submodules on '5.9' in qt5 Change-Id: I07353da970e5939cfba760c23b11d74d2de02a9c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-11-06 07:56:14 +00:00
Heikki Halmet	6275ed9d70	Provisioning: Fix p7zip installation Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-11-03 07:15:41 +00:00
Joni Jäntti	03d6b7b36a	Fix Windows 8 libclang script locations Currently for some reason there exist both "windows-8" and "windows-8.1" folders in coin/provisioning/. "windows-8" folders contain only the libclang provisioning scripts. These should be under "windows-8.1" since "windows-8" shouldn't exist anymore. Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-11-03 07:15:38 +00:00
Heikki Halmet	634d196109	Provisioning: Refresh Subscription-manager Subscription manager needs to be refreshed so that RedHat repositories will stay available for provisioning scripts Change-Id: Idebc994fbefde951000570f6690c6849abfd3666 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-11-03 07:15:36 +00:00
Tony Sarajärvi	baa46f9590	Provisioning: fix .ci.local addresses to .intra.qt.io Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-11-03 07:15:33 +00:00
Qt Submodule Update Bot	4b73d4a666	Update submodules on '5.9' in qt5 Change-Id: I72963749ae7d3756933c0a561f06fc90adc59dc8 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-10-30 06:01:34 +00:00
Tony Sarajärvi	583e196784	Cleanup of opengl32.dll replacement This one isn't needed as the vanilla OS already contains the original file. Change-Id: I210b62d4483ea78af7b5922c46f73e3ec6d44aeb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-28 18:40:44 +00:00
Tony Sarajärvi	185eb5b414	Cleanup of provisioning scripts as tier1 images are vanilla Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-28 18:40:41 +00:00
Qt Submodule Update Bot	81f832f0a6	Update submodules on '5.9' in qt5 Change-Id: Id803fd815a34d0adad0e3c02cb4373b78e9a9eab Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-10-28 18:40:38 +00:00
Jani Heikkinen	72cc047726	Fix QNX platform configurations for Qt 5.9 With Qt 5.9 series we still deliver binaries for QNX 6.6 only -> - Add QNX 6.6 platform configurations for windows - Remove 'packaging' flag from QNX 7.0 builds - Add provisioning script to patch QNX in windows 10 as well This change fixes the previous 5.6 merge, where this should've happened. Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893 Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-10-27 03:18:00 +00:00
Qt Submodule Update Bot	1376f16f3b	Update submodules on '5.9' in qt5 Change-Id: I903ba51634aa67a83e980c125ccc7d063e12ca73 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-10-25 12:37:49 +00:00
Qt Submodule Update Bot	1b798a59a3	Update submodules on '5.9' in qt5 Change-Id: Ica9109b0b5868ccc60043b5c861e853837bd9213 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-10-24 12:53:33 +00:00
Tony Sarajärvi	372d2bb076	Provision vanilla Windows 7 x86 and use it Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-24 12:53:26 +00:00
Joni Jäntti	3b7b924b31	Fix Windows 10 x64 Python with new tier 1 Current tier 1 template #9 has python and anaconda installed that came with MSVC2017. This messes with the provisioning scripts and ultimately builds such as pyside, even though qt5 builds go through. Task-number: QTQAINFRA-1503 Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-23 17:37:10 +00:00
Allan Sandfeld Jensen	f129af9f81	Add mozilla-nss-devel to opensuse QtWebEngine now depends hard on NSS as the OpenSSL backend never worked well on Linux. Change-Id: I4ea516bcb6fafdf6efd10493750da93b1961d965 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-10-22 12:17:33 +00:00
Tony Sarajärvi	5f76910476	Provision ICC to openSUSE 42.3 Task-number: QTQAINFRA-1196 Change-Id: I9ae6089acf3360a8a937b1108c13a78698d91bcf Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-10-19 09:28:47 +00:00
Joni Jäntti	357202801f	Make CI use a new RHEL 7.4 provisioning Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This commit replaces RHEL 7.2 in desktop builds, android builds and INTEGRITY builds. Task-number: QTQAINFRA-1251 Task-number: QTQAINFRA-1252 Task-number: QTQAINFRA-1253 Task-number: QTQAINFRA-1267 Task-number: QTQAINFRA-1269 Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-10-19 09:28:44 +00:00
Qt Submodule Update Bot	5c7ccdbc83	Update submodules on '5.9' in qt5 Change-Id: Ic685ba43f99c41edd5727cfe4fcc823d544f2f6e Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-10-19 09:28:36 +00:00
Tony Sarajärvi	128075f744	Fix typo in echoing version to versions.txt Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-17 16:57:17 +00:00
Joni Jäntti	4cdfd8e902	Make 7zip provisioning script add 7zip to path 7zip is nice to have in path for future purposes such as when cherry-picking to other branches where we use different extracts scripts. Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-17 16:57:15 +00:00
Joni Jäntti	e8fc216658	Make Extract-7zip helper function work with the new provision location Changed the helper function for extracting 7z files so that it also supports the new C:\Utils\sevenzip location. Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-10-17 16:57:12 +00:00
Joni Jäntti	e09dc71d25	Make Ninja provisioning use Add-Path function We should use this helper function now that we have it. Change-Id: I9a522533795d4d4e63f608a0624378f066055b10 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-17 16:57:09 +00:00
Joni Jäntti	a26ce5e56a	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: I0f3d1072d53eb75f7405cf79139f2919eeb1f716 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-10-17 16:57:07 +00:00
Qt Submodule Update Bot	a1958e911c	Update submodules on '5.9' in qt5 Change-Id: I801d03778533471c15db148fdb9d44cbc37e249f Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-10-14 05:37:19 +00:00
Liang Qi	f63fc8ca25	Merge remote-tracking branch 'origin/5.9.2' into 5.9 Conflicts: .gitmodules Change-Id: I2a20f7682f088a6ff1dd1fdb987b0bde3844d2ce	2017-10-11 10:31:05 +02:00
Qt Submodule Update Bot	388747cb1a	Update submodules on '5.9' in qt5 Change-Id: Ic7ba6fa7ab6eb9cf76b07164ce93607798eaa5b1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>	2017-10-11 07:51:10 +00:00
Tony Sarajärvi	2a650c49ee	Provisioning: Fix usage of DownloadURL to throw errors In case DownloadURL failed it's shasum check, it printed an error and threw an exit 1. This exit 1 was never handled in the calling scripts and went ignored. It was also not passed forward as it was inside a try-catch statement. Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>	2017-09-30 12:21:16 +00:00
Tony Sarajärvi	cda49ad060	Remove duplicate MinGW 5.3 provisioning Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>	2017-09-30 12:21:01 +00:00
Tony Sarajärvi	8a93a8fe6a	Provisioning: cleanup path from cmake_linux.sh Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2017-09-30 12:20:39 +00:00
Qt Submodule Update Bot	9f69da6575	Update submodules on '5.9' in qt5 Change-Id: I18b9043156b97206500c2aa7375cf80b55623044 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-29 03:12:42 +00:00
Qt Submodule Update Bot	3fe0d212a5	Update submodules on '5.9' in qt5 Change-Id: I9481fbac3934de35e731eaf4ca9e3d907b19a303 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-27 20:38:23 +00:00
Joni Jäntti	0e4d668e35	Add official URL to MinGW Windows 10 provisioning MinGW currently uses only internal URL without backup. Added the official URL to these scripts with SHA1 checksum verification. Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2017-09-27 06:04:11 +00:00
Simo Fält	0b251bbdc0	Provisioning: Install Python3 development libs to OpenSUSE Those are required to build Pyside#5.9 branch. Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>	2017-09-26 07:30:25 +00:00
Qt Submodule Update Bot	28ffb0ce8a	Update submodules on '5.9' in qt5 Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-26 06:06:18 +00:00
Heikki Halmet	512f8ff0a2	Change Packaging and iOS builds to macOS 10.12 This changes swap packaging and iOS builds from 10.10 to 10.12 Task-number: QTQAINFRA-1095 Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2017-09-25 09:10:31 +00:00
Qt Submodule Update Bot	51c2673304	Update submodules on '5.9' in qt5 Change-Id: I35d02c6c8d6ce01d10d094302782d81713163ded Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-24 19:29:34 +00:00
Liang Qi	04ccf0e8db	Merge remote-tracking branch 'origin/5.6' into 5.9 `42b502f` is not needed for branches >= 5.8, configure.exe does not exist anymore. `30660bf` was not applied to 5.9 branch, the scripts were not adapted to new template. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17	2017-09-22 21:15:52 +02:00
Qt Submodule Update Bot	6c4eb77aa0	Update submodules on '5.9' in qt5 Change-Id: If34cf07aad9b4b3a539223dd37c40c799ffb7ba3 Reviewed-by: Liang Qi <liang.qi@qt.io>	2017-09-22 12:30:54 +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
				`@@ -1 +0,0 @@`
				`"${BASH_SOURCE%/*}/../common/linux-removethemall.sh"`
				`@@ -1 +0,0 @@`
				`. "$PSScriptRoot\..\common\windows_removethemall.ps1"`
				`@@ -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"`