Update submodules on '5.6' in qt5

Change-Id: I83d922770362c73318da7149495e868c59cdf580 Reviewed-by: Liang Qi <liang.qi@qt.io>
2025-12-25 01:16:14 +08:00 · 2018-09-08 22:48:53 +00:00 · 2018-08-26 19:58:16 +00:00 · 2018-08-16 16:41:22 +00:00 · 2018-08-16 06:26:34 +00:00 · 2018-05-25 07:20:14 +00:00
370 changed files with 2829 additions and 3193 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -11,7 +11,6 @@
 #
 # One task per entry. Remember space after colon.
 #Task-number: 
-#Coverity-Id: 
 #
 # ==[ Please wrap at 72 characters ]===================================|
 #
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
 .tag                    export-subst
 .gitignore              export-ignore
 .gitattributes          export-ignore
-.commit-template        export-ignore
+.commit-template        export-ignore eol=lf
 init-repository         export-ignore
 README.git              export-ignore
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9
+	branch = 5.6
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,13 +68,14 @@
 	url = ../qtrepotools.git
 	branch = master
 	status = essential
-	qt = false
+	project = -
 [submodule "qtwebkit"]
 	depends = qtbase
 	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
+	serialize = qtwebengine
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.9
+	branch = 5.6
 	status = obsolete
 	project = WebKit.pro
 	priority = 20
@@ -82,7 +83,7 @@
 	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.9
+	branch = 5.6
 	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
@@ -93,17 +94,17 @@
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
+	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -136,191 +137,135 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qt3d"]
 	depends = qtdeclarative qtimageformats
-	recommends = qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9
-	status = addon
+	branch = 5.6
+	status = preview
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
 	recommends = qtsvg qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = dev
-	status = ignore
+	branch = 5.6
+	status = obsolete
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9
+	branch = 5.6
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9
-	status = addon
+	branch = 5.6
+	status = preview
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = dev
-	status = ignore
+	branch = 5.6
+	status = deprecated
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
-	recommends = qtlocation qttools
-	serialize = qtwebkit
+	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9
+	branch = 5.6
 	status = addon
 [submodule "qtquickcontrols2"]
-	depends = qtgraphicaleffects
+	depends = qtquickcontrols
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9
-	status = addon
+	branch = 5.6
+	status = preview
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 5.9
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 5.9
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 5.9
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad
-	branch = 5.9
-	status = addon
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml
-	branch = 5.9
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech
-	branch = 5.9
-	status = preview
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	recommends = qtwebview
-	path = qtnetworkauth
-	url = ../qtnetworkauth
-	branch = 5.9
-	status = preview
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	path = qtremoteobjects
-	url = ../qtremoteobjects
-	branch = 5.9
-	status = preview
+	branch = dev
+	status = ignore
--- a/8
+++ b/8
@@ -10,7 +10,7 @@ HOW TO BUILD QT5

    - Perl 5.8 or later
    - Python 2.7 or later
-    - C++ compiler supporting the C++11 standard
+    - C++ compiler supporting the C++98 standard

     For other platform specific requirements,
     please see section "Setting up your machine" on:
@@ -39,10 +39,8 @@ HOW TO BUILD QT5
   Windows:
   --------

-     Open a command prompt.
-     Ensure that the following tools can be found in the path:
-     * Supported compiler (Visual Studio 2012 or later,
-        MinGW-builds gcc 4.9 or later)
+     Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
+     following tools can be found in the path:
     * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
     * Python version 2.7 or later  [http://www.activestate.com/activepython/]
     * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,26 +1,25 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64-5                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-8-x86_64-2                                             MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-7-x86-2                                                Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86-4                                               MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-5                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-5            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-5            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64                                      GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64                                      GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
-qtci-linux-openSUSE-42.1-x86_64                                     GCC         DeveloperBuild NoPch
-qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
-qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
-qtci-macos-10.12-x86_64-8                                           Clang       DebugAndRelease Release DisableTests
-qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch DisableTests
-qtci-osx-10.10-x86_64                                               Clang       Packaging DebugAndRelease Release
-qtci-osx-10.10-x86_64                                               Clang       DeveloperBuild Release QtNamespace NoPch
-qtci-osx-10.10-x86_64                                               Clang       Release NoFramework
-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      Boot2Qt_Jethro      x86_64      GCC         DisableTests
+qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release BuildExamples
+qtci-windows-8.1-x86_64                                             MSVC2012    DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-8.1-x86_64                                 x86         MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-8.1-x86_64                                             MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-7-x86-3                                                MSVC2010    Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
+qtci-windows-7-x86-3                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-10-x86_64-10                               x86         MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-10-x86_64-10                                           MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
+qtci-windows-8.1-x86_64             Windows_Phone_8_1   armv4       MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
+qtci-windows-8.1-x86_64             WinRT_8_1                       MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
+qtci-linux-OpenSuSE-13.01-x86_64                                    GCC         DeveloperBuild NoPch
+qtci-linux-RHEL-6.6-x86_64                                          GCC         Packaging Release NoUseGoldLinker
+qtci-osx-10.11-x86_64-3                                             Clang       Packaging DebugAndRelease Release
+qtci-osx-10.10-x86_64                                               Clang       DebugAndRelease Release DisableTests
+qtci-osx-10.9-x86_64                                                Clang       DeveloperBuild Release QtNamespace NoPch
+qtci-osx-10.8-x86_64                                                Clang       Release NoFramework
+qtci-linux-RHEL-6.6-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-14.04-x86_64-1    Boot2Qt_Fido        armv7       GCC         DisableTests
 qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64                                      GCC         TestOnly LicenseCheck
+qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         TestOnly LicenseCheck
+qtci-windows-7-x86-3                Windows_7_Embedded  armv4       MSVC2008    DeveloperBuild Release DisableTests OpenGLES2
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,13 +1,15 @@
 Template                    Target OS           Target arch Compiler    Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-5    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release 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-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-windows-8.1-x86_64     Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
+qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
+qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
+qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2 UploadConfigureExe
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2 UploadConfigureExe
+qtci-osx-10.11-x86_64-3     Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
+qtci-osx-10.11-x86_64-3     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-windows-7-x86-2        QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2        QNX_660             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-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
+# target arch is used here only for documentation the value is ignored
+qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,3 +0,0 @@
-Template                        Target OS           Target arch Compiler    Features
------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64  Boot2Qt_Jethro      x86_64      GCC         DeveloperBuild
--- 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
@@ -0,0 +1,48 @@
+############################################################################
+##
+## 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\..\..\provisioning\common\windows\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# 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"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"

 # Install Visual Studio $version with $update_version
 # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################

-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"

 # This script will install Visual Studio 2017

@@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe"

 Download $url_cache $url_cache $msvcPackage
 Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait"
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
 echo "Cleaning $msvcPackage.."
 Remove-Item -Recurse -Force "$msvcPackage"
 echo "Visual Studio = $version" >> ~\versions.txt
--- 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
@@ -0,0 +1,48 @@
+############################################################################
+##
+## 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\..\..\provisioning\common\windows\helpers.ps1"
+
+# This script will install Visual Studio 2017 Build Tools
+# 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"
+$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
+$msvcPackage = "C:\Windows\Temp\$version.exe"
+
+Download $url_cache $url_cache $msvcPackage
+Verify-Checksum $msvcPackage $sha1
+cmd /c "$msvcPackage --all --passive --wait"
+echo "Cleaning $msvcPackage.."
+Remove-Item -Recurse -Force "$msvcPackage"
+echo "Visual Studio Build Tools = $version" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"

 # Install Visual Studio $version with $update_version
 # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################

-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"

 # This script will install Visual Studio 2017

@@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe"

 Download $url_cache $url_cache $msvcPackage
 Verify-Checksum $msvcPackage $sha1
-cmd /c "$msvcPackage --all --norestart --quiet --wait"
+cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
 echo "Cleaning $msvcPackage.."
 Remove-Item -Recurse -Force "$msvcPackage"
 echo "Visual Studio = $version" >> ~\versions.txt
--- a/coin/provisioning/common/03-conan.ps1
+++ b/coin/provisioning/common/03-conan.ps1
@@ -1,58 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$scriptsPath = "C:\Python27\Scripts"
-
-& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2
-
-[Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
-
-function Start-Process-Logged
-{
-    Write-Host "Start-Process", $args
-    Start-Process @args
-}
-
-function Run-Conan-Install
-{
-    Param (
-        [string]$ConanfilesDir,
-        [string]$BuildinfoDir,
-        [string]$Arch,
-        [string]$Compiler,
-        [string]$CompilerVersion,
-        [string]$CompilerRuntime,
-        [string]$CompilerLibcxx
-    )
-
-    if ($CompilerRuntime) {
-        $extraArgs = "-s compiler.runtime=$($CompilerRuntime)"
-    }
-
-    if ($CompilerLibcxx) {
-        $extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
-    }
-
-    Get-ChildItem -Path "$ConanfilesDir\*.txt" |
-    ForEach-Object {
-        $conanfile = $_.FullName
-        $outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
-        $manifestsDir = "$($_.DirectoryName)\$($_.BaseName).manifests"
-        New-Item $outpwd -Type directory -Force
-
-        $process = Start-Process-Logged `
-            "$scriptsPath\conan.exe" `
-            -WorkingDirectory $outpwd `
-            -ArgumentList "install -f $conanfile --no-imports --verify $manifestsDir", `
-                '-s', ('compiler="' + $Compiler + '"'), `
-                "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
-            -NoNewWindow -Wait -Verbose `
-            -PassThru # Return process object
-
-        if ($process.ExitCode -ne 0) {
-            Write-Host "conan exited with code $($process.ExitCode)"
-            Exit(1)
-        }
-
-        Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
-    }
-}
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -1,10 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip"
-
-Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip
-Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
-
-Extract-Zip $zip C:
-Remove-Item C:\CMake -Force -Recurse
-Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -1,83 +0,0 @@
-function Verify-Checksum
-{
-    Param (
-        [string]$File=$(throw("You must specify a filename to get the checksum of.")),
-        [string]$Expected=$(throw("Checksum required")),
-        [ValidateSet("sha1","md5")][string]$Algorithm="sha1"
-    )
-    $fs = new-object System.IO.FileStream $File, "Open"
-    $algo = [type]"System.Security.Cryptography.$Algorithm"
-    $crypto = $algo::Create()
-    $hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
-    $fs.Close()
-    if ($hash -ne $Expected) {
-        Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'"
-    }
-}
-
-function Extract-7Zip
-{
-    Param (
-        [string]$Source,
-        [string]$Destination
-    )
-    echo "Extracting '$Source' to '$Destination'..."
-
-    if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
-        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles} -ne $null)[0] '7-zip\7z.exe'
-        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."
-            }
-        }
-    } else {
-        $zipExe = "7z.exe"
-    }
-
-    & $zipExe x $Source "-o$Destination" -y
-}
-
-function Extract-Zip
-{
-    Param (
-        [string]$Source,
-        [string]$Destination
-    )
-    echo "Extracting '$Source' to '$Destination'..."
-
-    New-Item -ItemType Directory -Force -Path $Destination
-    $shell = new-object -com shell.application
-    $zipfile = $shell.Namespace($Source)
-    $destinationFolder = $shell.Namespace($Destination)
-    $destinationFolder.CopyHere($zipfile.Items(), 16)
-}
-
-function BadParam
-{
-    Param ([string]$Description)
-    throw("You must specify $Description")
-}
-
-function Download
-{
-    Param (
-        [string] $OfficialUrl = $(BadParam("the official download URL")),
-        [string] $CachedUrl   = $(BadParam("the locally cached URL")),
-        [string] $Destination = $(BadParam("a download target location"))
-    )
-    try {
-        Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
-    } catch {
-        Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
-    }
-}
-
-function Add-Path
-{
-    Param (
-        [string]$Path
-    )
-    echo "Adding $Path to Path"
-    [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
-}
--- a/coin/provisioning/common/icu.ps1
+++ b/coin/provisioning/common/icu.ps1
@@ -1,9 +0,0 @@
-# ICU is already pre-installed on Windows machines, it would be nice to have
-# the installation script, but for now let's just export the right variables
-
-# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
-
-# FIXME: do we really want to use the 4.8.2 ICU build?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
--- 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/libusb.ps1
+++ b/coin/provisioning/common/libusb.ps1
@@ -1,47 +0,0 @@
-#############################################################################
-#
-# Copyright (C) 2017 The Qt Company Ltd.
-# Contact: http://www.qt.io/licensing/
-#
-# This file is part of the provisioning scripts of the Qt Toolkit.
-#
-# $QT_BEGIN_LICENSE:LGPL21$
-# Commercial License Usage
-# Licensees holding valid commercial Qt licenses may use this file in
-# accordance with the commercial license agreement provided with the
-# Software or, alternatively, in accordance with the terms contained in
-# a written agreement between you and The Qt Company. For licensing terms
-# and conditions see http://www.qt.io/terms-conditions. For further
-# information use the contact form at http://www.qt.io/contact-us.
-#
-# GNU Lesser General Public License Usage
-# Alternatively, this file may be used under the terms of the GNU Lesser
-# General Public License version 2.1 or version 3 as published by the Free
-# Software Foundation and appearing in the file LICENSE.LGPLv21 and
-# LICENSE.LGPLv3 included in the packaging of this file. Please review the
-# following information to ensure the GNU Lesser General Public License
-# requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-#
-# As a special exception, The Qt Company gives you certain additional
-# rights. These rights are described in The Qt Company LGPL Exception
-# version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-#
-# $QT_END_LICENSE$
-#
-############################################################################
-
-# lisbusb-1.0 is needed by tqtc-boot2qt/qdb
-
-. "$PSScriptRoot\helpers.ps1"
-
-$archive = "C:\users\qt\downloads\libusb-1.0.21.7z"
-$libusb_location = "C:\Utils\libusb-1.0"
-
-Download https://vorboss.dl.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.21/libusb-1.0.21.7z http://ci-files01-hki.ci.local/input/libusb-1.0/libusb-1.0.21.7z $archive
-Verify-Checksum $archive "37c8884a0ddca97d492b8ef3e08970ae3ba20653"
-
-Extract-7Zip $archive $libusb_location
-
-# Tell tqtc-boot2qt/qdb build system where to find libusb
-[Environment]::SetEnvironmentVariable("LIBUSB_PATH", $libusb_location, "Machine")
--- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh
@@ -37,11 +37,11 @@

 # 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=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"

 version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
 SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
 targetFolder="/opt/cmake-$version"
@@ -50,4 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"

 echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
+echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
--- a/coin/provisioning/common/linux/disable-ntp_linux.sh
+++ b/coin/provisioning/common/linux/disable-ntp_linux.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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 -ex
+
+echo "Disable Network Time Protocol (NTP)"
+
+if uname -a |grep -q "Ubuntu"; then
+    sudo timedatectl set-ntp false
+else
+    systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
+fi
--- a/coin/provisioning/common/linux/linux-removethemall.sh
+++ b/coin/provisioning/common/linux/linux-removethemall.sh
--- a/coin/provisioning/common/linux/version.sh
+++ b/coin/provisioning/common/linux/version.sh
--- a/coin/provisioning/common/macos/01-macos-removethemall.sh
+++ b/coin/provisioning/common/macos/01-macos-removethemall.sh
--- a/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh
@@ -37,11 +37,12 @@
 # uncompresses it and installs it by default
 # to /Applications/. This can be overridden by a target parameter.

-# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/try_catch.sh"
-# shellcheck source=DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# shellcheck source=../unix/try_catch.sh
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

+ExceptionDownload=99
 ExceptionCreateTmpFile=100
 ExceptionCreateTmpDirectory=101
 ExceptionUncompress=102
@@ -74,8 +75,13 @@ function InstallAppFromCompressedFileFromURL {
        echo "Extension for file: $extension"
        echo "Creating temporary file and directory"
        targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile
-        targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
+        # macOS 10.10 mktemp does require prefix
+        if [[ $OSTYPE == "darwin14" ]]; then
+            targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory
+        else
+            targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
+        fi
+        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
        echo "Uncompress $targetFile"
        case $extension in
            "tar.gz")
@@ -98,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/macos/InstallPKGFromURL.sh
+++ b/coin/provisioning/common/macos/InstallPKGFromURL.sh
@@ -33,8 +33,8 @@
 ##
 #############################################################################

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

 ExceptionCreateTmpFile=100
 ExceptionDownloadPrimaryUrl=101
@@ -69,7 +69,8 @@ function InstallPKGFromURL {
            esac
        }
        echo "Checking SHA1 on PKG '$targetFile'"
-        echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
+        echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+        /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1
        echo "Run installer on PKG"
        sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG
        echo "Removing file '$targetFile'"
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh
@@ -37,15 +37,15 @@

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

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

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/cmake-3.6.2-Darwin-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz"
 SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e"
 appPrefix="cmake-3.6.2-Darwin-x86_64"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

-echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc
+echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc
 echo "CMake = 3.6.2" >> ~/versions.txt
--- a/coin/provisioning/common/macos/homebrew.sh
+++ b/coin/provisioning/common/macos/homebrew.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Will install homebrew package manager for macOS
+/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh
@@ -1,8 +1,8 @@
-#!/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.
@@ -32,39 +32,57 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+set -ex

-# This script installs the right ICU version
+# Command line tools is need by Homebrew

-set -e
-icuVersion="56.1"
-icuLocation="/usr/lib64"
-sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
+function InstallCommandLineTools {
+
+    ExceptionMount=101
+    ExceptionInstall=102
+    ExceptionUnmount=103

-function Install7ZPackageFromURL {
    url=$1
-    expectedSha1=$2
-    targetDirectory=$3
+    url_alt=$2
+    expectedSha1=$3
+    packageName=$4
+    version=$5
+
+    try
+    (
+        DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
+        echo "Mounting $packageName"
+        hdiutil attach /tmp/$packageName || throw $ExceptionMount
+        cd "/Volumes/Command Line Developer Tools"
+        echo "Installing"
+        sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall
+        cd /
+        # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
+        sleep 3
+        echo "Unmounting"
+        umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount
+        echo "Removing $packageName"
+        rm /tmp/$packageName
+
+        echo "Command Line Tools = $version" >> ~/versions.txt
+    )
+    catch || {
+        case $ex_code in
+            $ExceptionMount)
+                echo "Failed to mount."
+                exit 1;
+            ;;
+            $ExceptionInstall)
+                echo "Failed to install command line tools."
+                exit 1;
+            ;;
+            $ExceptionUnmount)
+                echo "Failed to unmount."
+                exit 1;
+
+        esac
+    }

-    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
-sudo cp -a $tempDir/lib/* /usr/lib64
-sudo cp -a $tempDir/* /usr/
-
-sudo /sbin/ldconfig
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -44,13 +44,14 @@



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

 function InstallXCode()
 {
    ExceptionCPIO=103
    ExceptionAcceptLicense=105
+    ExceptionDeveloperMode=113

    sourceFile=$1
    version=$2
@@ -58,11 +59,14 @@ function InstallXCode()
    try
    (
        echo "Uncompressing and installing '$sourceFile'"
-        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -vdmi) || throw $ExceptionCPIO
+        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO

        echo "Accept license"
        sudo xcodebuild -license accept || throw $ExceptionAcceptLicense

+        echo "Enabling developer mode, so that using lldb does not require interactive password entry"
+        sudo /usr/sbin/DevToolsSecurity -enable || throw $ExceptionDeveloperMode
+
        echo "Xcode = $version" >> ~/versions.txt
    )
    catch || {
@@ -71,6 +75,10 @@ function InstallXCode()
                echo "Failed to unarchive .cpio."
                exit 1;
            ;;
+            $ExceptionDeveloperMode)
+                echo "Failed to enable developer mode."
+                exit 1;
+            ;;
            $ExceptionAcceptLicense)
                echo "Failed to accept license."
                exit 1;
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
@@ -3,6 +3,7 @@
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,22 +34,19 @@
 ##
 #############################################################################

-# This script installs MySQL
+# This script installs python3

-# MySQL is needed for Qt to be able to support MySQL
+source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"

-# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
+PrimaryUrl="http://ci-files01-hki.ci.local/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="/"

-PrimaryUrl="http://ci-files01-hki.ci.local/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=""
-targetDir="/opt/mysql57/"
+InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"

-sudo mkdir -p "/opt"
+/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv

-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir"
-
-echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc
-echo "MySQL = 5.7.15" >> ~/versions.txt
+echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc
+echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc
+echo "python3 = 3.6.1" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
@@ -33,18 +33,8 @@
 ##
 #############################################################################

-# This script installs XZ-Utils
+# Disable "Download newly available updates in the background" from App Store
+sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE

-# XZ-Utils are needed for uncompressing xz-compressed files
-
-# 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"
-AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
-SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
-DestDir="/"
-
-InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
-
-echo "XZ = 5.0.7" >> ~/versions.txt
+# Disable "Install system data files and security updates" from App Store
+sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate CriticalUpdateInstall -boolean FALSE
--- a/coin/provisioning/common/ruby.ps1
+++ b/coin/provisioning/common/ruby.ps1
@@ -1,7 +0,0 @@
-. "$PSScriptRoot\helpers.ps1"
-
-$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
-Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
-& $installer /DIR=C:\ruby /VERYSILENT
--- a/coin/provisioning/common/shared/network_test_server_ip.txt
+++ b/coin/provisioning/common/shared/network_test_server_ip.txt
@@ -0,0 +1 @@
+network_test_server_ip=10.212.2.216
--- a/coin/provisioning/common/unix/DownloadURL.sh
+++ b/coin/provisioning/common/unix/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/unix/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh
@@ -80,7 +80,7 @@ function InstallFromCompressedFileFromURL {
            ;;
        esac
        echo "Moving app to $installDirectory"
-        sudo mkdir -p "$installDirectory"
+        sudo mkdir "$installDirectory"
        sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp
        echo "Removing file '$targetFile'"
        rm "$targetFile" || throw $ExceptionDeleteTmpFile
--- a/coin/provisioning/common/unix/disable-ntp_macos.sh
+++ b/coin/provisioning/common/unix/disable-ntp_macos.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 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 -ex
+
+echo "Disable Network Time Protocol (NTP)"
+echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile
+
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -0,0 +1,72 @@
+#!/usr/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$
+##
+#############################################################################
+
+# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
+# The Clang library (C-bindings), version 3.9 or higher is required for building.
+
+# This same script is used to provision libclang to Linux and macOS.
+# In case of Linux, we expect to get the values as args
+set -e
+
+BASEDIR=$(dirname "$0")
+url=$1
+sha1=$2
+version=$3
+if [ $# -eq 0 ]
+  then
+    # The default values are for macOS package
+    echo "Using macOS defaults"
+    version="4.0"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
+    sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
+fi
+
+zip="libclang.7z"
+destination="/usr/local/libclang-$version"
+
+curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
+_shasum=sha1sum
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo "DARWIN"
+    _shasum=/usr/bin/shasum
+fi
+echo "$sha1  $zip" | $_shasum --check
+7z x $zip -o/tmp/
+rm -rf $zip
+
+sudo mv /tmp/libclang $destination
+
+echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
+echo "libClang = $version" >> ~/versions.txt
--- a/coin/provisioning/common/unix/try_catch.sh
+++ b/coin/provisioning/common/unix/try_catch.sh
--- a/coin/provisioning/common/windows/allow-remote-desktop-access.ps1
+++ b/coin/provisioning/common/windows/allow-remote-desktop-access.ps1
@@ -0,0 +1,36 @@
+############################################################################
+##
+## 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 allows the Windows Remote Desktop Access
+
+reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server" /v fDenyTSConnections /t REG_DWORD /d 0 /f
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -33,19 +31,29 @@
 ##
 #############################################################################

-# This script installs Xcode
-# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
-# This can be achieved by fetching Xcode_8.xip from Apple Store.
-# Uncompress it with 'xar -xf Xcode_8.xip'
-# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
-# with which you can run 'python parse_pbzx2.py Content'.
-# This will give you a file called "Content.part00.cpio.xz" that
-# can be renamed to Xcode_8.xz for this script.
+. "$PSScriptRoot\helpers.ps1"

-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+$majorminorversion = "3.6"
+$version = "3.6.2"

-# shellcheck source=../common/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
+$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip"
+$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
+$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
+
+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

-InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz 8.2.1
--- a/coin/provisioning/common/windows/disable-ntp.ps1
+++ b/coin/provisioning/common/windows/disable-ntp.ps1
@@ -0,0 +1,2 @@
+# Disable the NTP from syncing
+w32tm /config /syncfromflags:NO
--- a/coin/provisioning/common/windows/disable-sleep.ps1
+++ b/coin/provisioning/common/windows/disable-sleep.ps1
@@ -0,0 +1,39 @@
+############################################################################
+##
+## 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 prevents Windows from going to sleep
+
+powercfg -change -monitor-timeout-ac 0
+powercfg -change -standby-timeout-ac 0
+powercfg -change -disk-timeout-ac 0
+powercfg -change -hibernate-timeout-ac 0
--- a/coin/provisioning/common/windows/disable-uac.ps1
+++ b/coin/provisioning/common/windows/disable-uac.ps1
@@ -0,0 +1,36 @@
+############################################################################
+##
+## 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 disables the Windows UAC
+
+C:\Windows\System32\cmd.exe /k %windir%\System32\reg.exe ADD HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System /v EnableLUA /t REG_DWORD /d 0 /f
--- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
--- a/coin/provisioning/common/windows/disable-windows-updates.ps1
+++ b/coin/provisioning/common/windows/disable-windows-updates.ps1
@@ -0,0 +1,54 @@
+############################################################################
+##
+## 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 disables the automatic Windows updates
+
+$service = get-service wuauserv
+if (-not $service) {
+    Write-Host "Windows Update service not found."
+    exit 0
+}
+
+if ($service.Status -eq "Stopped") {
+    Write-Host "Windows Update service already stopped."
+} else {
+    Write-Host "Stopping Windows Update service."
+    stop-service wuauserv
+}
+
+$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
+if ($startup -ne "Disabled") {
+    set-service wuauserv -startup disabled
+} else {
+    Write-Host "Windows Update service startup already disabled."
+}
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -0,0 +1,114 @@
+function Verify-Checksum
+{
+    Param (
+        [string]$File=$(throw("You must specify a filename to get the checksum of.")),
+        [string]$Expected=$(throw("Checksum required")),
+        [ValidateSet("sha1","md5")][string]$Algorithm="sha1"
+    )
+    $fs = new-object System.IO.FileStream $File, "Open"
+    $algo = [type]"System.Security.Cryptography.$Algorithm"
+    $crypto = $algo::Create()
+    $hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
+    $fs.Close()
+    if ($hash -ne $Expected) {
+        Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'"
+    }
+}
+
+function Extract-Zip
+{
+    Param (
+        [string]$Source,
+        [string]$Destination
+    )
+    echo "Extracting '$Source' to '$Destination'..."
+
+    New-Item -ItemType Directory -Force -Path $Destination
+    $shell = new-object -com shell.application
+    $zipfile = $shell.Namespace($Source)
+    $destinationFolder = $shell.Namespace($Destination)
+    $destinationFolder.CopyHere($zipfile.Items(), 16)
+}
+
+function Extract-Dev-Folders-From-Zip
+{
+    Param (
+        [string]$package,
+        [string]$zipDir,
+        [string]$installPath
+    )
+
+    $shell = new-object -com shell.application
+
+    echo "Extracting contents of $package"
+    foreach ($subDir in "lib", "include", "bin", "share") {
+        $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
+        if ($zip) {
+            Write-Host "Extracting $subDir from zip archive"
+        } else {
+            Write-Host "$subDir is missing from zip archive - skipping"
+            continue
+        }
+        $destDir = $installPath + "\" + $subdir
+        New-Item $destDir -type directory
+        $destinationFolder = $shell.Namespace($destDir)
+        $destinationFolder.CopyHere($zip.Items(), 16)
+    }
+}
+
+function BadParam
+{
+    Param ([string]$Description)
+    throw("You must specify $Description")
+}
+
+function Download
+{
+    Param (
+        [string] $OfficialUrl = $(BadParam("the official download URL")),
+        [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
+        } else {
+            Copy-Item $CachedUrl $Destination
+        }
+    } catch {
+        Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
+    }
+}
+
+function Set-EnvironmentVariable
+{
+    Param (
+        [string]$Key = $(BadParam("a key")),
+        [string]$Value = $(BadParam("a value."))
+    )
+    Write-Host "Setting environment variable `"$($Key)`" to `"$($Value)`""
+
+    [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Machine)
+}
+
+function Add-Path
+{
+    Param (
+        [string]$Path
+    )
+    echo "Adding $Path to Path"
+
+    $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
+    [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
+}
+
+function is64bitWinHost
+{
+    if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
+        return 1
+    }
+    else {
+        return 0
+    }
+}
--- a/coin/provisioning/common/windows/icu.ps1
+++ b/coin/provisioning/common/windows/icu.ps1
@@ -0,0 +1,125 @@
+############################################################################
+##
+## 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")
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
+
+# FIXME: do we really want to use the 4.8.2 ICU build?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
+
+} 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/windows/install-dependencywalker.ps1
+++ b/coin/provisioning/common/windows/install-dependencywalker.ps1
@@ -0,0 +1,63 @@
+############################################################################
+##
+## 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 Dependency Walker 2.2.6000
+
+$version = "2.2.6000"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "_x64"
+    $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
+}
+else {
+    $arch = "_x86"
+    $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22" + $arch + ".zip"
+$url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip"
+$dependsPackage = "C:\Windows\Temp\depends-$version.zip"
+
+$TARGETDIR = "C:\Utils\dependencywalker"
+if(!(Test-Path -Path $TARGETDIR )){
+    New-Item -ItemType directory -Path $TARGETDIR
+}
+Download $url_official $url_cache $dependsPackage
+Verify-Checksum $dependsPackage $sha1
+
+Get-ChildItem $dependsPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
+
+echo "Cleaning $dependsPackage.."
+Remove-Item -Recurse -Force "$dependsPackage"
+
+echo "Dependency Walker = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-git.ps1
+++ b/coin/provisioning/common/windows/install-git.ps1
@@ -0,0 +1,57 @@
+#############################################################################
+##
+## 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"
+
+# Install Git version 2.13.0
+
+$version = "2.13.0"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-64-bit"
+    $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
+}
+else {
+    $arch = "-32-bit"
+    $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec"
+}
+$gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe"
+$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe"
+
+echo "Fetching Git $version..."
+Download $url_official $url_cache $gitPackage
+Verify-Checksum $gitPackage $sha1
+echo "Installing Git $version..."
+cmd /c "$gitPackage /SILENT /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh""
+remove-item $gitPackage
+
+echo "Git = $version" >> ~\versions.txt
--- 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
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-#############################################################################
+############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
@@ -33,23 +31,32 @@
 ##
 #############################################################################

-# This script installs INTEGRITY
+. "$PSScriptRoot\helpers.ps1"

-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# This script will install Java RE
+# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.

-version="11.4.4"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/integrity/ghs_$version.tar.gz"
-AltUrl="$PrimaryUrl" # we lack an external source for this
-SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
-targetFolder="/opt/ghs"
-appPrefix=""
+$installdir = "C:\Program Files\Java\jre7"

-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+$version = "7u7"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "x64"
+    $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3"
+}
+else {
+    $arch = "i586"
+    $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219"
+}

-echo "export INTEGRITY_BSP=platform-cortex-a9" >> ~/.bashrc
-echo "export INTEGRITY_PATH=$targetFolder/comp_201654" >> ~/.bashrc
-echo "export INTEGRITY_DIR=$targetFolder/int1144" >> ~/.bashrc
-echo "export INTEGRITY_GL_INC_DIR=\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" >> ~/.bashrc
-echo "export INTEGRITY_GL_LIB_DIR=\$INTEGRITY_DIR/libs/Vivante" >> ~/.bashrc
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe"
+$javaPackage = "C:\Windows\Temp\java-$version.exe"

-echo "INTEGRITY = $version" >> ~/versions.txt
+Copy-Item $url_cache $javaPackage
+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 = $version $arch" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-jdk.ps1
+++ b/coin/provisioning/common/windows/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\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/windows/install-mingw.ps1
+++ b/coin/provisioning/common/windows/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\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/windows/install-notepad++.ps1
+++ b/coin/provisioning/common/windows/install-notepad++.ps1
@@ -0,0 +1,62 @@
+############################################################################
+##
+## 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 Notepad++
+
+$version = "7.3"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = ".x64"
+    $sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA"
+}
+else {
+    $arch = ""
+    $sha1 = "d4c403675a21cc381f640b92e596bae3ef958dc6"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer" + $arch + ".exe"
+$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer" + $arch + ".exe"
+$nppPackage = "C:\Windows\Temp\npp-$version.exe"
+
+Download $url_official $url_cache $nppPackage
+Verify-Checksum $nppPackage $sha1
+cmd /c "$nppPackage /S"
+
+echo "Cleaning $nppPackage.."
+Remove-Item -Recurse -Force "$nppPackage"
+
+echo "Notepad++ = $version" >> ~\versions.txt
+
+Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
+
+echo "Auto-updating disabled."
--- a/coin/provisioning/common/windows/install-qnx660.ps1
+++ b/coin/provisioning/common/windows/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 + "-patch4687-windows.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/windows/install-ruby.ps1
+++ b/coin/provisioning/common/windows/install-ruby.ps1
@@ -0,0 +1,60 @@
+############################################################################
+##
+## 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 Ruby
+
+$version = "2.2.6"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-x64"
+    $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
+}
+else {
+    $arch = ""
+    $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
+$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
+$rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
+
+Download $url_official $url_cache $rubyPackage
+Verify-Checksum $rubyPackage $sha1
+cmd /c "$rubyPackage /silent"
+
+echo "Cleaning $rubyPackage.."
+Remove-Item -Recurse -Force "$rubyPackage"
+
+Add-Path "C:\Ruby22-x64\bin"
+
+echo "Ruby = $version" >> ~\versions.txt
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
@@ -1,6 +1,4 @@
-#!/bin/bash
-
-#############################################################################
+############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
@@ -33,21 +31,30 @@
 ##
 #############################################################################

-# This script installs PostgreSQL
+. "$PSScriptRoot\helpers.ps1"

-# PostgreSQL is needed for Qt to be able to support PostgreSQL
+# This script installs 7-Zip

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

-psqlVersion="9.6.0"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-x64"
+    $sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"
+}
+else {
+    $arch = ""
+    $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4"
+}

-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip"
-AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip"
-SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
-appPrefix=""
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe"
+$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe"
+$7zPackage = "C:\Windows\Temp\7zip-$version.exe"

-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
+Download $url_official $url_cache $7zPackage
+Verify-Checksum $7zPackage $sha1
+cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\"

-echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc
-echo "PostgreSQL = $psqlVersion" >> ~/versions.txt
+echo "Cleaning $7zPackage.."
+Remove-Item -Recurse -Force "$7zPackage"
+
+echo "7-Zip = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-strawberry-perl.ps1
+++ b/coin/provisioning/common/windows/install-strawberry-perl.ps1
@@ -0,0 +1,58 @@
+############################################################################
+##
+## 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 Strawberry Perl
+
+$version = "5.26.0.1"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-64bit"
+    $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
+}
+else {
+    $arch = "-32bit"
+    $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + $arch + ".msi"
+$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" + $version + $arch + ".msi"
+$strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi"
+
+Download $url_official $url_cache $strawberryPackage
+Verify-Checksum $strawberryPackage $sha1
+cmd /c "$strawberryPackage /QB INSTALLDIR=C:\strawberry REBOOT=REALLYSUPPRESS"
+
+echo "Cleaning $strawberryPackage.."
+Remove-Item -Recurse -Force "$strawberryPackage"
+
+echo "strawberry = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/jom.ps1
+++ b/coin/provisioning/common/windows/jom.ps1
--- a/coin/provisioning/common/windows/memorypershell.ps1
+++ b/coin/provisioning/common/windows/memorypershell.ps1
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -30,34 +30,34 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"

 $version = "11_2_2"
-$package = "C:\Windows\temp\opengl32sw_$version.7z"
-$destinationFolder = "C:\Windows\SysWOW64"
-$openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
+$package = "C:\Windows\temp\opengl32sw.7z"
+$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1"
+$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z"
+$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
+$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"

-$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
-$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
-$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll"
-$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
+function Extract-Mesa
+{
+    Param (
+        [string]$downloadUrl,
+        [string]$sha1,
+        [string]$targetFolder
+    )
+    Write-Host "Installing Mesa from $downloadUrl to $targetFolder"
+    $localArchivePath = "C:\Windows\temp\opengl32sw.7z"
+    Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $localArchivePath
+    Verify-Checksum $localArchivePath $sha1
+    Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$targetFolder"}
+    Remove-Item $localArchivePath
+}

-Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
-Verify-Checksum $package $mesaOpenglSha1
-Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"}
+if ( Test-Path C:\Windows\SysWOW64 ) {
+    Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative"
+    Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
+} else {
+    Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"
+}

-echo "Remove downloaded $package ..."
-Remove-Item $package -recurse
-
-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
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
@@ -30,21 +30,31 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"

 # Install Cumulative Servicing Release Visual Studio 2015 update 3
 # Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
-# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe

 $version = "2015 update3 (KB3165756)"
 $package = "C:\Windows\Temp\vs14-kb3165756.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe"
 $url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
 $sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
+$preparedPackage="\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update"

-echo "Fetching patch for Visual Studio $version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
+if (Test-Path $preparedPackage) {
+    echo "Using prepared package"
+    pushd $preparedPackage
+    $commandLine = "$preparedPackage\vs14-kb3165756.exe"
+} else {
+    echo "Fetching patch for Visual Studio $version..."
+    Download $url_official $url_cache $package
+    Verify-Checksum $package $sha1
+    $commandLine = $package
+}
 echo "Installing patch for Visual Studio $version..."
-cmd /c "$package /norestart /Quiet"
-remove-item $package
+. $commandLine /norestart /passive
+
+if ($commandLine.StartsWith("C:\Windows")) {
+    remove-item $package
+}
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -31,82 +31,65 @@
 ##
 #############################################################################

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

 # This script installs MySQL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

 $version = "5.6.11"
-$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip"
+$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
 $packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"

-function CheckAndRemovePreviousInstallation
-{
-    Param (
-        [string]$InstallFolder
-    )
-    echo "Check for previous installation..."
-    $FolderExists = Test-Path $ExistingInstallation
-    If ($FolderExists -eq $True) {
-        echo "Removing previous installation ($ExistingInstallation)"
-        Remove-Item $ExistingInstallation -recurse
-    }
-}
-
 function DownloadAndInstall
 {
    Param (
-        [string]$arch,
-        [string]$externalUrl,
        [string]$internalUrl,
        [string]$package,
-        [string]$sha1,
        [string]$installPath
    )

-   echo "Fetching from URL ..."
-   Download $externalUrl $internalUrl $package
-   Verify-Checksum $package $sha1
-   Extract-Zip $package $installPath
+    echo "Fetching from URL ..."
+    Copy-Item $internalUrl $package
+
+    $zipDir = [io.path]::GetFileNameWithoutExtension($package)
+    Extract-Dev-Folders-From-Zip $package $zipDir $installPath
+
+    Remove-Item $package
 }

-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\Utils\my_sql"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64"
-$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38"
+# Remove any leftovers
+try {
+    Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
+} catch {}

-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql
+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"

-echo "Remove downloaded package ..."
-Remove-Item $packagex64
+    DownloadAndInstall $internalUrl $packagex64 $installFolder

-echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\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$architecture"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32"
-$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679"
+$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"
+}

-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql
-
-echo "Remove downloaded package ..."
-Remove-Item $packagex86
+DownloadAndInstall $internalUrl $packagex86 $installFolder

 echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")

 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 echo "MySQL = $version" >> ~/versions.txt
--- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################

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

 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
@@ -40,32 +40,41 @@ $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 = "http://ci-files01-hki.ci.local/input/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 = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"

 echo "Fetching from URL ..."
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -31,7 +31,7 @@
 ##
 #############################################################################

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

 # This script installs postgresql $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
@@ -40,45 +40,58 @@ $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"
-$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/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"

-echo "Fetching from URL ..."
-Download $externalUrl $internalUrl $packagex64
-Verify-Checksum $packagex64 $sha1
-echo "Installing $packagex64 ..."
-Extract-Zip $packagex64 $installFolder
+    # Delete any leftovers
+    try {
+        Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
+    } catch {}

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

-echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine")
+    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")
+}

 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\postgresql$architecture"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/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
 Verify-Checksum $packagex86 $sha1
 echo "Installing $packagex86 ..."
-Extract-Zip $packagex86 $installFolder
+Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder

 echo "Remove downloaded $packagex86 ..."
 Remove-Item $packagex86

 echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine")

 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 echo "PostgreSQL = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/python.ps1
+++ b/coin/provisioning/common/windows/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 = "http://ci-files01-hki.ci.local/input/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 = "http://ci-files01-hki.ci.local/input/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
@@ -62,7 +58,8 @@ echo "Chancing allowZip64 value to 'True'..."
 (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
 echo "Remove $package..."
 del $package
-[Environment]::SetEnvironmentVariable("Path", $env:Path + ";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/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
@@ -1,8 +1,7 @@
-#!/bin/env bash
-
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -33,32 +32,39 @@
 ##
 #############################################################################

-# Patch QNX SDK due to issues in the standard library.
-# The patches are available here:
-# http://www.qnx.com/download/feature.html?programid=27555
-# A copy of the patch must be in the root of the Coin path in
-# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
+param([Int32]$archVer=32)
+. "$PSScriptRoot\helpers.ps1"

-set -e
-sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
+# This script installs Python $version.
+# Python3 is required for building some qt modules.

-function InstallZipPackageFromURL {
-    url=$1
-    expectedSha1=$2
-    targetDirectory=$3
+$version = "3.6.1"
+$package = "C:\Windows\temp\python-$version.exe"
+$install_path = "C:\Python36"

-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-
-    tempDir=`mktemp -d` || echo "Failed to create temporary directory"
-    /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive"
-    trap "sudo rm -fr $targetFile $tempDir" EXIT
-
-    sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
+# check bit version
+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"
+    $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"
+    $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1"
 }

-echo "Patching QNX"
+echo "Fetching from URL..."
+Download $externalUrl $internalUrl $package
+Verify-Checksum $package $sha1
+echo "Installing $package..."
+cmd /c "$package /q TargetDir=$install_path"
+echo "Remove $package..."
+del $package

-baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip"
-InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/"
+[Environment]::SetEnvironmentVariable("PYTHON3_PATH", "$install_path", [EnvironmentVariableTarget]::Machine)
+[Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine)
+
+# Install python virtual env
+cmd /c "$install_path\Scripts\pip3.exe install virtualenv"
--- a/coin/provisioning/common/windows/set-network-test-server.ps1
+++ b/coin/provisioning/common/windows/set-network-test-server.ps1
@@ -0,0 +1,42 @@
+############################################################################
+##
+## 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 set the network test server IP in to hosts file
+
+$n = Get-Content "$PSScriptRoot\..\shared\network_test_server_ip.txt"
+$n = $n.Split('=')
+New-Variable -Name $n[0] -Value $n[1]
+
+Add-Content -Path C:\Windows\System32\drivers\etc\hosts. -Value "$network_test_server_ip  qt-test-server  qt-test-server.qt-test-net"
--- a/coin/provisioning/common/windows/vc_redist.ps1
+++ b/coin/provisioning/common/windows/vc_redist.ps1
@@ -1,6 +1,7 @@
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -31,21 +32,33 @@
 ##
 #############################################################################

-# Patch QNX SDK due to issues in the standard library.
-# The patches are available here:
-# http://www.qnx.com/download/feature.html?programid=27555
-# A copy of the patch must be in the root of the Coin path in
-# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
-
-
+param([Int32]$archVer=32)
 . "$PSScriptRoot\helpers.ps1"

-$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
-$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
-$tempDir = "C:\temp\qnx_path"
+# This script installs Visual C++ Redistributable for Visual Studio 2015
+# This is a dependency of the current python3 version

-Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
-Verify-Checksum $zip $sha1
-Extract-Zip $zip $tempDir
-Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
-Remove-Item $tempDir -recurse
+# check bit version
+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"
+    $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"
+    $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1"
+}
+
+$package = "C:\Windows\temp\vc_redist.$arch.exe"
+
+echo "Fetching from URL..."
+Download $externalUrl $internalUrl $package
+Verify-Checksum $package $sha1
+echo "Installing $package..."
+Start-Process -FilePath $package -ArgumentList "/q" -Wait
+echo "Remove $package..."
+del $package
--- a/coin/provisioning/common/windows/windows_removethemall.ps1
+++ b/coin/provisioning/common/windows/windows_removethemall.ps1
@@ -56,6 +56,8 @@ Function Remove-Path {
 }

 # Remove Android sdk and ndk
-Remove C:\utils\android*
-[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
-[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
+If (Test-Path "c:\utils") {
+    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-windows-10-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
--- a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/02-disable-ntp.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh
@@ -2,3 +2,17 @@
 # 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-6.noarch.rpm
+sudo rpm -Uvh epel-release-latest-6.noarch.rpm
+sudo rm -f epel-release-latest-6.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-6.6-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh
@@ -1,53 +1 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs CMake 3.6.2
-
-# 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"
-
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
-
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
+$(dirname $0)/../common/linux/cmake_linux.sh
--- 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
@@ -35,22 +35,22 @@

 # 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
+# It also runs update for SDK API level 18, 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.
+# E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device.
+# That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6.

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

 # SDK
 sdkPackage="android-sdk_r24.4.1-linux.tgz"
 sdkBuildToolsVersion="23.0.3"
-sdkApiLevel="android-21"
+sdkApiLevel="android-18"
 sdkUrl="$baseUrl/$sdkPackage"
 sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
 sdkTargetFile="$targetFolder/$sdkPackage"
@@ -87,7 +87,13 @@ function InstallAndroidPackage {
    sudo rm -fr "$targetFolder"/"$version"
 }

-sudo mkdir "$targetFolder"
+if [ -d "$targetFolder" ]; then
+    echo "Removing old Android installation"
+    sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
+fi
+
+sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
+
 # Install Android SDK
 echo "Installing Android SDK version $sdkPackage..."
 InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
@@ -96,11 +102,13 @@ InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFil
 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 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..."
+# 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"

-echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
+# 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=android-18' >> ~/.bashrc

 # Storage version information to ~/versions.txt, which is used to print version information to provision log.
 echo "***** Android SDK *****" >> ~/versions.txt
@@ -112,3 +120,4 @@ sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut
 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-6.6-x86_64/libusb.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh
@@ -1,3 +0,0 @@
-#!/bin/env bash
-# Required for tqtc-boot2qt/qdb
-sudo yum install -y libusb1-devel
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh
@@ -41,4 +41,4 @@ echo "***** All installed RPM packages *****" >> ~/versions.txt
 rpm -q -a | sort >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt

-$(dirname $0)/../common/version.sh
+$(dirname $0)/../common/linux/version.sh
--- 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/02-android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-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/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
@@ -1,5 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo subscription-manager refresh
-sudo yum install -y python-devel python-virtualenv
--- 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
@@ -1,5 +0,0 @@
-# We need to disable selinux while we are overwriting some binaries
-# required by it. If this is not done, ICU provisioning will create
-# template that is not booting.
-
-sudo sed -i s/SELINUX=enforcing/SELINUX=disabled/g  /etc/selinux/config
--- 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-Ubuntu-14.04-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/02-disable-ntp.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
@@ -3,4 +3,6 @@
 # needed to build pyside

 sudo apt-get update
-sudo apt-get install -y python-dev
+sudo apt-get install -y python-dev python3-dev python3-pip
+
+sudo pip3 install virtualenv
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
@@ -1,53 +1 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs CMake 3.6.2
-
-# 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"
-
-version="3.6.2"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
-SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
-targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
-
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
-
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
+$(dirname $0)/../common/linux/cmake_linux.sh
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh
@@ -1,3 +0,0 @@
-#!/bin/env bash
-# Required for tqtc-boot2qt/qdb
-sudo apt-get install -y libusb-1.0-0-dev
--- a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# Disable questions on shutdown.
-gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh
@@ -1,87 +0,0 @@
-#!/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 modifies system settings for automated use
-
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-
-NTS_IP=10.212.2.216
-
-ExceptionGsettings1=100
-ExceptionGsettings2=101
-ExceptionGsettings3=102
-ExceptionNTS=103
-ExceptionDISPLAY=104
-
-try
-(
-    echo "Timeout for blanking the screen (0 = never)"
-    gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1
-    echo "Prevents screen lock when screesaver goes active."
-    gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2
-    echo "Disable questions on shutdown."
-    gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3
-
-    echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
-    echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
-    echo "Set DISPLAY"
-    echo 'export DISPLAY=":0"' >> ~/.bashrc || throw $ExceptionDISPLAY
-)
-catch || {
-    case $ex_code in
-        $ExceptionGsettings1)
-            echo "Failed to disable black screen."
-            exit 1;
-        ;;
-        $ExceptionGsettings2)
-            echo "Failed to prevent screen lock."
-            exit 1;
-        ;;
-        $ExceptionGsettings3)
-            echo "Failed to disable questions on shutdown."
-            exit 1;
-        ;;
-        $ExceptionNTS)
-            echo "Failed to set network teset server address into /etc/hosts."
-            exit 1;
-        ;;
-        $ExceptionDISPLAY)
-            echo "Failed to set DISPLAY into ~/.bashrc."
-            exit 1;
-        ;;
-    esac
-}
-
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh
@@ -1,102 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-# Install required packages with APT
-
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-
-ExceptionAPTUpdate=100
-ExceptionAPT=101
-ExceptionSED=102
-
-try
-(
-    echo "Disabling auto update"
-    sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED
-    echo "Running update for apt"
-    sudo apt update
-    echo "Installing packages"
-    # Git is not needed by builds themselves, but is nice to have
-    # immediately as one starts debugging
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install git || throw $ExceptionAPT
-    # 7zip is a needed decompressing tool
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install p7zip || throw $ExceptionAPT
-    # libssl-dev provides headers for OpenSSL
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libssl-dev || throw $ExceptionAPT
-    # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT
-    # Enable linking to system dbus
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libdbus-1-dev || throw $ExceptionAPT
-    # Needed libraries for WebEngine
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT
-    # Common event loop handling
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libglib2.0-dev || throw $ExceptionAPT
-    # MySQL support
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libmysqlclient-dev || throw $ExceptionAPT
-    # PostgreSQL support
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libpq-dev || throw $ExceptionAPT
-    # SQLite support
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libsqlite3-dev || throw $ExceptionAPT
-    # ODBC support
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install unixodbc-dev || throw $ExceptionAPT
-    # Support for FreeType font engine
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libfreetype6-dev || throw $ExceptionAPT
-    # Enable the usage of system jpeg libraries
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libjpeg-dev || throw $ExceptionAPT
-    # Enable support for printer driver
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libcups2-dev || throw $ExceptionAPT
-    # Install libraries needed for QtMultimedia to be able to support all plugins
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT
-    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install g++-multilib || throw $ExceptionAPT
-)
-catch || {
-    case $ex_code in
-        $ExceptionAPTUpdate)
-            echo "Failed to run APT update."
-            exit 1;
-        ;;
-        $ExceptionAPT)
-            echo "Failed to install package."
-            exit 1;
-        ;;
-        $ExceptionSED)
-            echo "Failed to disable auto update."
-            exit 1;
-        ;;
-    esac
-}
-
--- a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Read .bashrc if exist
-printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile
-
--- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh
@@ -1,117 +0,0 @@
-#!/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 modified system settings for automated use
-
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-
-VNCPassword=qt
-NTS_IP=10.212.2.216
-
-ExceptionDisableScreensaver=100
-ExceptionSetInitialDelay=101
-ExceptionSetDelay=102
-ExceptionVNC=103
-ExceptionNTS=104
-
-try
-(
-    echo "Disable Screensaver"
-    mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
-    (
-        cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT
-    ) || throw $ExceptionDisableScreensaver
-
-    echo "Set keyboard type rates and delays"
-    # normal minimum is 15 (225 ms)
-    defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
-    # normal minimum is 2 (30 ms)
-    defaults write -g KeyRepeat -int 2 || throw $ExceptionSetDelay
-
-    echo "Enable remote desktop sharing"
-    sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all || throw $ExceptionVNC
-
-    echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
-    echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
-
-)
-catch || {
-    case $ex_code in
-        $ExceptionDisableScreensaver)
-            echo "Failed to disable screensaver."
-            exit 1;
-        ;;
-        $ExceptionSetInitialDelay)
-            echo "Failed to set initial delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionSetDelay)
-            echo "Failed to set delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionVNC)
-            echo "Failed to enable VNC."
-            exit 1;
-        ;;
-        $ExceptionNTS)
-            echo "Failed to set NTS."
-            exit 1;
-        ;;
-    esac
-}
--- a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh
@@ -1,2 +0,0 @@
-#!/bin/sh
-defaults write com.apple.CrashReporter DialogType server
--- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
@@ -1,128 +0,0 @@
-#!/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
-
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-# shellcheck source=../common/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
-
-targetFolder="/opt/android"
-sdkTargetFolder="$targetFolder/sdk"
-
-baseUrl="http://ci-files01-hki.ci.local/input/android"
-baseAltUrl="https://dl.google.com/android/repository/"
-
-toolsVersion="r25.2.5"
-toolsFile="tools_$toolsVersion-macosx.zip"
-ndkVersion="r10e"
-ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="25.0.2"
-sdkApiLevel="android-21"
-
-toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659"
-ndkSha1="6be8598e4ed3d9dd42998c8cb666f0ee502b1294"
-
-toolsDlUrl="$baseUrl/$toolsFile"
-ndkDlUrl="$baseUrl/$ndkFile"
-toolsAltDlUrl="$baseAltUrl/$toolsFile"
-ndkAltDlUrl="$baseAltUrl/$ndkFile"
-
-toolsTargetFile="/tmp/$toolsFile"
-ndkTargetFile="/tmp/$ndkFile"
-
-ExceptionUnzipTools=100
-ExceptionUnzipNdk=101
-ExceptionRmTools=102
-ExceptionRmNdk=103
-ExceptionSdkManager=104
-
-try
-(
-    DownloadURL "$toolsDlUrl" "$toolsAltDlUrl" "$toolsSha1" "$toolsTargetFile"
-    DownloadURL "$ndkDlUrl" "$ndkAltDlUrl" "$ndkSha1" "$ndkTargetFile"
-    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
-
-    echo "Removing temporary files."
-    rm "$toolsTargetFile" || throw $ExceptionRmTools
-    rm "$ndkTargetFile" || throw $ExceptionRmNdk
-
-    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_ROOT=$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
-)
-catch || {
-        case $ex_code in
-            $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/qtci-osx-10.10-x86_64/001-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/system_updates.sh
--- a/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 BASEDIR=$(dirname "$0")
-source "$BASEDIR/../common/01-macos-removethemall.sh"
+source "$BASEDIR/../common/macos/01-macos-removethemall.sh"

--- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"
--- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh
@@ -0,0 +1 @@
+source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
--- a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh
--- a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/macos/system_updates.sh
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`"${BASH_SOURCE%/*}/../common/linux-removethemall.sh"`
				`@@ -0,0 +1 @@`
				`source "${BASH_SOURCE%/*}/../common/macos/python3.sh"`