Merge remote-tracking branch 'origin/5.9' into dev

Conflicts: .gitmodules coin/platform_configs/qt5.txt coin/provisioning/common/system_updates.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
author: Liang Qi <liang.qi@qt.io> 2017-08-24 09:12:33 +0200
committer: Liang Qi <liang.qi@qt.io> 2017-08-24 09:12:33 +0200
commit: ebf8aa15e67caacab514ea93782ff0783d60af2d (patch)
tree: ecbaf2c3669d1de878ead56e8b44a83bff65efdc
parent: d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff)
parent: dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff)
101 files changed, 894 insertions, 390 deletions
diff --git a/.gitattributes b/.gitattributes
index 084cdfd6..11a643c0 100644
--- 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
diff --git a/.gitmodules b/.gitmodules
index 0def5d8d..b5637093 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -38,7 +38,7 @@
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
-	recommends = qtdeclarative qtactiveqt qtwebkit
+	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
 	branch = dev
@@ -69,21 +69,6 @@
 	branch = master
 	status = essential
 	project = -
-[submodule "qtwebkit"]
-	depends = qtbase
-	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
-	path = qtwebkit
-	url = ../qtwebkit.git
-	branch = dev
-	status = obsolete
-	project = WebKit.pro
-	priority = 20
-[submodule "qtwebkit-examples"]
-	depends = qtwebkit qttools
-	path = qtwebkit-examples
-	url = ../qtwebkit-examples.git
-	branch = dev
-	status = obsolete
 [submodule "qtqa"]
 	depends = qtbase
 	path = qtqa
@@ -146,8 +131,8 @@
 	branch = dev
 	status = addon
 [submodule "qt3d"]
-	depends = qtdeclarative
-	recommends = qtimageformats qtgamepad
+	depends = qtbase
+	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
 	branch = dev
@@ -238,7 +223,6 @@
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
-	serialize = qtwebkit
 	path = qtwebengine
 	url = ../qtwebengine.git
 	branch = dev
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 7ee4df05..b3d564c5 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,6 +1,6 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release DisableTests
+qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release DisableTests
 qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-7-x86-2                                                Mingw53     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-7                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
@@ -8,7 +8,7 @@ qtci-windows-10-x86_64-7                                            MSVC2015
 qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
 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
@@ -20,4 +20,4 @@ qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang
 qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-16.04-x86_64-1    Boot2Qt_Jethro      armv7       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         TestOnly LicenseCheck
-qtci-linux-RHEL-7.2-x86_64          QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 8e030bbd..60a99694 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,7 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8-x86-2                                        MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-8-x86_64-2                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
@@ -15,8 +15,8 @@ qtci-windows-7-x86-2        Android_ANY         x86         Mingw53     Packagin
 qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-6.6-x86_64  QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-RHEL-7.2-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.2-x86_64  QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
 qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
diff --git a/coin/provisioning/common/allow-remote-desktop-access.ps1 b/coin/provisioning/common/allow-remote-desktop-access.ps1
new file mode 100644
index 00000000..06ea20a4
--- /dev/null
+++ b/coin/provisioning/common/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
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1
index 88e2a10c..197eec57 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -2,7 +2,7 @@
 
 $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 \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip
+Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip
 Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
 
 Extract-Zip $zip C:
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/common/cmake.sh
index dd35e01d..fe84cd0e 100644..100755
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh
+++ b/coin/provisioning/common/cmake.sh
@@ -2,10 +2,10 @@
 
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -33,21 +33,19 @@
 ##
 #############################################################################
 
-# This script installs CMake 3.6.2
+# This script installs CMake
 
 # 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=./InstallAppFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.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"
+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"
 
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
 
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
+echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc
+echo "CMake = 3.6.2" >> ~/versions.txt
diff --git a/coin/provisioning/common/disable-sleep.ps1 b/coin/provisioning/common/disable-sleep.ps1
new file mode 100644
index 00000000..dda785ac
--- /dev/null
+++ b/coin/provisioning/common/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
diff --git a/coin/provisioning/common/disable-uac.ps1 b/coin/provisioning/common/disable-uac.ps1
new file mode 100644
index 00000000..757c4a7e
--- /dev/null
+++ b/coin/provisioning/common/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
diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/common/disable-windefender.ps1
index 2d1f0783..2d1f0783 100644
--- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1
+++ b/coin/provisioning/common/disable-windefender.ps1
diff --git a/coin/provisioning/common/disable-windows-updates.ps1 b/coin/provisioning/common/disable-windows-updates.ps1
new file mode 100644
index 00000000..1a014733
--- /dev/null
+++ b/coin/provisioning/common/disable-windows-updates.ps1
@@ -0,0 +1,37 @@
+############################################################################
+##
+## 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
+
+stop-service wuauserv
+set-service wuauserv �startup disabled
diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/install-dependencywalker.ps1
new file mode 100644
index 00000000..a9a56f7a
--- /dev/null
+++ b/coin/provisioning/common/install-dependencywalker.ps1
@@ -0,0 +1,56 @@
+############################################################################
+##
+## 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 Dependency Walker 2.2.6000
+
+$version = "2.2.6000"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip"
+$url_official = "http://www.dependencywalker.com/depends22_x64.zip"
+$dependsPackage = "C:\Windows\Temp\depends-$version.zip"
+$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
+
+$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
diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/install-git.ps1
new file mode 100644
index 00000000..d3543138
--- /dev/null
+++ b/coin/provisioning/common/install-git.ps1
@@ -0,0 +1,50 @@
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# Install Git version 2.13.0
+
+$version = "2.13.0"
+$gitPackage = "C:\Windows\Temp\Git-" + $version + "-64-bit.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + "-64-bit.exe"
+$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + "-64-bit.exe"
+$sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
+
+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
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1
new file mode 100644
index 00000000..06bcf6a1
--- /dev/null
+++ b/coin/provisioning/common/install-java.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\..\common\helpers.ps1"
+
+# This script will install Java
+
+$version = "7u7"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe"
+$javaPackage = "C:\Windows\Temp\java-$version.exe"
+
+Copy-Item $url_cache $javaPackage
+cmd /c "$javaPackage /s SPONSORS=0"
+echo "Cleaning $javaPackage.."
+Remove-Item -Recurse -Force "$javaPackage"
+echo "Java = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/install-notepad++.ps1
new file mode 100644
index 00000000..15a8c004
--- /dev/null
+++ b/coin/provisioning/common/install-notepad++.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$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Notepad++
+
+$version = "7.3"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer.x64.exe"
+$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer.x64.exe"
+$sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA"
+$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 (x86)\Notepad++\updater" -NewName "updater_disabled"
+echo "Auto-updating disabled."
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1
new file mode 100644
index 00000000..332a3a89
--- /dev/null
+++ b/coin/provisioning/common/install-ruby.ps1
@@ -0,0 +1,51 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Ruby
+
+$version = "2.2.6"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + "-x64.exe"
+$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + "-x64.exe"
+$rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
+$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
+
+Download $url_official $url_cache $rubyPackage
+Verify-Checksum $rubyPackage $sha1
+cmd /c "$rubyPackage /silent"
+
+echo "Cleaning $rubyPackage.."
+Remove-Item -Recurse -Force "$rubyPackage"
+
+echo "Ruby = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1
new file mode 100644
index 00000000..91442500
--- /dev/null
+++ b/coin/provisioning/common/install-sevenzip.ps1
@@ -0,0 +1,51 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script installs 7-Zip
+
+$version = "1604"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + "-x64.exe"
+$url_official = "http://www.7-zip.org/a/7z" + $version + "-x64.exe"
+$7zPackage = "C:\Windows\Temp\7zip-$version.exe"
+$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"
+
+Download $url_official $url_cache $7zPackage
+Verify-Checksum $7zPackage $sha1
+cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\"
+
+echo "Cleaning $7zPackage.."
+Remove-Item -Recurse -Force "$7zPackage"
+
+echo "7-Zip = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/install-strawberry-perl.ps1
new file mode 100644
index 00000000..83b63897
--- /dev/null
+++ b/coin/provisioning/common/install-strawberry-perl.ps1
@@ -0,0 +1,51 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script installs Strawberry Perl
+
+$version = "5.26.0.1"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + "-64bit.msi"
+$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" +$version+ "-64bit.msi"
+$strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi"
+$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
+
+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
diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh
index f8336bad..c6f00ee7 100755
--- a/coin/provisioning/common/install_xcode.sh
+++ b/coin/provisioning/common/install_xcode.sh
@@ -51,6 +51,7 @@ 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;
diff --git a/coin/provisioning/common/libusb.ps1 b/coin/provisioning/common/libusb.ps1
index ed575886..38d8b8e6 100644
--- a/coin/provisioning/common/libusb.ps1
+++ b/coin/provisioning/common/libusb.ps1
@@ -31,17 +31,17 @@
 #
 ############################################################################
 
-# lisbusb-1.0 is needed by tqtc-boot2qt/qdb
+# libusb-1.0 is needed by qt-apps/qdb
 
 . "$PSScriptRoot\helpers.ps1"
 
-$archive = "C:\users\qt\downloads\libusb-1.0.21.7z"
+$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.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"
+Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
+Verify-Checksum $archive "396a3224c306480f24a583850d923d06aa4377c1"
 
 Extract-7Zip $archive $libusb_location
 
-# Tell tqtc-boot2qt/qdb build system where to find libusb
+# Tell qt-apps/qdb build system where to find libusb
 [Environment]::SetEnvironmentVariable("LIBUSB_PATH", $libusb_location, "Machine")
diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/msvc_2015_update3_patch.ps1
index 6a02f6bd..02c5e61e 100644
--- a/coin/provisioning/common/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/common/msvc_2015_update3_patch.ps1
@@ -37,10 +37,10 @@
 
 $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.ci.local\provisioning\windows\vs14-kb3165756-update"
+$preparedPackage="\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update"
 
 if (Test-Path $preparedPackage) {
     echo "Using prepared package"
diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1
new file mode 100644
index 00000000..9bd9929b
--- /dev/null
+++ b/coin/provisioning/common/mysql.ps1
@@ -0,0 +1,88 @@
+#############################################################################
+##
+## 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 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-winx64.zip"
+$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
+
+function DownloadAndInstall
+{
+    Param (
+        [string]$internalUrl,
+        [string]$package,
+        [string]$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
+}
+
+# Remove any leftovers
+try {
+    Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
+} catch {}
+
+# Install x64 bit version
+$architecture = "x64"
+$installFolder = "C:\Utils\my_sql\my_sql"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
+
+DownloadAndInstall $internalUrl $packagex64 $installFolder
+
+echo "Set environment variables ..."
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+
+# Install x86 bit version
+$architecture = "x86"
+$installFolder = "C:\Utils\my_sql\my_sql$architecture"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
+
+DownloadAndInstall $internalUrl $packagex86 $installFolder
+
+echo "Set environment variables ..."
+[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
diff --git a/coin/provisioning/common/network_test_server_ip.txt b/coin/provisioning/common/network_test_server_ip.txt
new file mode 100644
index 00000000..ec3d058a
--- /dev/null
+++ b/coin/provisioning/common/network_test_server_ip.txt
@@ -0,0 +1 @@
+network_test_server_ip=10.212.2.216
diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/common/openssl.ps1
index cd0115d2..2d63106f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
+++ b/coin/provisioning/common/openssl.ps1
@@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 $architecture = "x64"
 $installFolder = "C:\openssl"
 $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
-$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
 $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
 
 echo "Fetching from URL ..."
@@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..."
 $architecture = "x86"
 $installFolder = "C:\openssl$architecture"
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
-$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
 
 echo "Fetching from URL ..."
diff --git a/coin/provisioning/common/pip.sh b/coin/provisioning/common/pip.sh
new file mode 100755
index 00000000..c9af5fbc
--- /dev/null
+++ b/coin/provisioning/common/pip.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Will install pip utility for python
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+sudo python get-pip.py
+rm get-pip.py
diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1
new file mode 100644
index 00000000..2ff97761
--- /dev/null
+++ b/coin/provisioning/common/postgresql.ps1
@@ -0,0 +1,89 @@
+#############################################################################
+##
+## 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 postgresql $version.
+# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
+
+$version = "9.1.9-1"
+$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip"
+$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
+
+# Install x64 bit versions
+$architecture = "x64"
+$installFolder = "C:\Utils\postgresql\pgsql"
+$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
+$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
+
+# Delete any leftovers
+try {
+    Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
+} catch {}
+
+echo "Fetching from URL ..."
+Download $externalUrl $internalUrl $packagex64
+Verify-Checksum $packagex64 $sha1
+echo "Installing $packagex64 ..."
+Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
+
+echo "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\pgsql"
+$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip"
+$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
+
+echo "Fetching from URL..."
+Download $externalUrl $internalUrl $packagex86
+Verify-Checksum $packagex86 $sha1
+echo "Installing $packagex86 ..."
+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\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
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1
index ef4be200..6c88689a 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi"
 if ( $archVer -eq 64 ) {
     echo "Running in 64 bit system"
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
-    $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi"
     $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 }
 else {
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
-    $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi"
     $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
 }
 
diff --git a/coin/provisioning/common/set-network-test-server.ps1 b/coin/provisioning/common/set-network-test-server.ps1
new file mode 100644
index 00000000..1a1f50b7
--- /dev/null
+++ b/coin/provisioning/common/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\..\common\helpers.ps1"
+
+# This script will set the network test server IP in to hosts file
+
+$n = Get-Content "$PSScriptRoot\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"
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/common/system_updates.sh
index dd35e01d..2dee2708 100644..100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh
+++ b/coin/provisioning/common/system_updates.sh
@@ -2,10 +2,10 @@
 
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -33,21 +33,8 @@
 ##
 #############################################################################
 
-# This script installs CMake 3.6.2
+# Disable "Download newly available updates in the background" from App Store
+sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE
 
-# 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
+# Disable "Install system data files and security updates" from App Store
+sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate CriticalUpdateInstall -boolean FALSE
diff --git a/coin/provisioning/common/virtualenv.sh b/coin/provisioning/common/virtualenv.sh
new file mode 100755
index 00000000..b6a9a796
--- /dev/null
+++ b/coin/provisioning/common/virtualenv.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+# Will install virtual env for python
+sudo pip install virtualenv
diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/common/wsearch-off.ps1
index 09c45bbd..09c45bbd 100644
--- a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1
+++ b/coin/provisioning/common/wsearch-off.ps1
diff --git 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
index dd35e01d..7cdfc25c 100644
--- 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
@@ -41,7 +41,7 @@
 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"
+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"
diff --git 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
index 6bb7a37e..37b8c4be 100644
--- 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
@@ -45,7 +45,7 @@
 
 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"
diff --git 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
deleted file mode 100644
index ff25f463..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo yum install -y python-devel python-virtualenv
-
-# install the EPEL repository which provides python3
-wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-sudo rpm -Uvh epel-release-latest-7.noarch.rpm
-sudo rm -f epel-release-latest-7.noarch.rpm
-
-# install python3
-sudo yum install -y python34-devel
-
-# install pip3
-wget https://bootstrap.pypa.io/get-pip.py
-sudo python3 get-pip.py
-sudo rm -f get-pip.py
-sudo pip3 install virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh
index 87569d72..87569d72 100644
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/02-android_linux.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh
deleted file mode 100644
index f11263b7..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/001-suppress-shutdown-indicator.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# Disable questions on shutdown.
-gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git 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
deleted file mode 100644
index d4cd60e8..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-
-sudo apt-get update
-sudo apt-get install -y python-dev python3-dev python3-pip
-
-sudo pip3 install virtualenv
diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh
deleted file mode 100644
index f48a6e36..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/libusb.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/env bash
-# Required for tqtc-boot2qt/qdb
-sudo apt-get install -y libusb-1.0-0-dev
diff --git 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
deleted file mode 100644
index f11263b7..00000000
--- a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/001-suppress-shutdown-indicator.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-
-# Disable questions on shutdown.
-gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
index 9c906562..20fb83ad 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh
@@ -66,13 +66,23 @@ sudo update-binfmts --package qemu-arm --install arm \
 sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk
 
 # If normal fontconfig paths are used, qemu parses what ever files it finds from
-# the toolchain sysroot and the rest from the system fonts. Fix by copying the
-# system font configurations to a location which prefix that can't be found from
-# the toolchain sysroot. Links must also be dereferenced or their targets remain
-# pointing to the toolchain sysroot.
+# the toolchain sysroot and the rest from the system fonts.
 QEMU_FONTCONFPATH=~/qemu_fonts
 QEMU_FONTCONFFILE=$QEMU_FONTCONFPATH/fonts.qemu.conf
 mkdir -p $QEMU_FONTCONFPATH
+
+# Copy system font configuration files from system to a location with prefix that can't be found from
+# the toolchain sysroot
 cp -Lr /etc/fonts/* $QEMU_FONTCONFPATH
+
+# Create links to the actual system font files
+ln -s /usr/share/fonts $QEMU_FONTCONFPATH/fonts
+ln -s /usr/local/share/fonts $QEMU_FONTCONFPATH/local_fonts
+
+# Change font configuration file to point to files that can't be found from the toolchain sysroot
 sed $QEMU_FONTCONFPATH/fonts.conf -e "s:conf.d:$QEMU_FONTCONFPATH/conf.d:" > $QEMU_FONTCONFFILE
+sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i
+sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i
+
+# Set QEMU font configuration variables
 echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh
new file mode 100755
index 00000000..abbda212
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-libclang.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+. $BASEDIR/../common/sw_versions.txt
+VERSION=$libclang_version
+URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
+
+$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
index 272952ed..ea8613ad 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
@@ -48,4 +48,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 # shellcheck source=../common/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.1.xz 8.3.1
+InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh
new file mode 100755
index 00000000..63ec9b69
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/homebrew.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh
new file mode 100755
index 00000000..07c9a617
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/pip.sh
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh
new file mode 100755
index 00000000..4fb9ddbc
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Install 7z to be used from command line
+brew update
+brew install p7zip
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh
new file mode 100755
index 00000000..9e4f1d3e
--- /dev/null
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/virtualenv.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh
index d257ffa1..d257ffa1 100755
--- a/coin/provisioning/qtci-osx-10.8-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh
diff --git 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
new file mode 100755
index 00000000..b05dcf1c
--- /dev/null
+++ 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/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh
new file mode 100755
index 00000000..ddb01d64
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/cmake.sh
diff --git 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
new file mode 100755
index 00000000..b05dcf1c
--- /dev/null
+++ 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/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
index 085225d7..ddb01d64 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh
@@ -1,51 +1,4 @@
-#!/bin/bash
+#!/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$
-##
-#############################################################################
-
-# This script installs CMake
-
-# 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"
-
-PrimaryUrl="http://ci-files01-hki.ci.local/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 "CMake = 3.6.2" >> ~/versions.txt
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/cmake.sh
diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
new file mode 100755
index 00000000..b05dcf1c
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
new file mode 100755
index 00000000..b05dcf1c
--- /dev/null
+++ b/coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/system_updates.sh
diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
new file mode 100644
index 00000000..f92acd91
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
new file mode 100644
index 00000000..167cfd35
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
new file mode 100644
index 00000000..f92acd91
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
new file mode 100644
index 00000000..167cfd35
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
new file mode 100644
index 00000000..f3906f78
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1
deleted file mode 100644
index 2d1f0783..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
deleted file mode 100644
index 09c45bbd..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index 56b78f47..f6902153 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -1,88 +1,2 @@
-#############################################################################
-##
-## 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\mysql.ps1"
 
-. "$PSScriptRoot\..\common\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-winx64.zip"
-$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
-
-function DownloadAndInstall
-{
-    Param (
-        [string]$internalUrl,
-        [string]$package,
-        [string]$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
-}
-
-# Remove any leftovers
-try {
-    Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
-} catch {}
-
-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\Utils\my_sql\my_sql"
-$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip"
-
-DownloadAndInstall $internalUrl $packagex64 $installFolder
-
-echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
-
-# Install x86 bit version
-$architecture = "x86"
-$installFolder = "C:\Utils\my_sql\my_sql$architecture"
-$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip"
-
-DownloadAndInstall $internalUrl $packagex86 $installFolder
-
-echo "Set environment variables ..."
-[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
diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
index bd9afd5a..ee101fa5 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -36,7 +36,7 @@
 $version = "11_2_2"
 $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
 
-$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
+$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll"
 $openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
 
 echo "Take ownership of existing opengl32.dll from SysWOW64"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
index b73c3778..c1d8e13e 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -1,89 +1,2 @@
-#############################################################################
-##
-## 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\postgresql.ps1"
 
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script installs postgresql $version.
-# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
-
-$version = "9.1.9-1"
-$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip"
-$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
-
-# Install x64 bit versions
-$architecture = "x64"
-$installFolder = "C:\Utils\postgresql\pgsql"
-$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
-$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
-
-# Delete any leftovers
-try {
-    Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
-} catch {}
-
-echo "Fetching from URL ..."
-Download $externalUrl $internalUrl $packagex64
-Verify-Checksum $packagex64 $sha1
-echo "Installing $packagex64 ..."
-Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
-
-echo "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\pgsql"
-$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
-$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip"
-$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
-
-echo "Fetching from URL..."
-Download $externalUrl $internalUrl $packagex86
-Verify-Checksum $packagex86 $sha1
-echo "Installing $packagex86 ..."
-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\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
diff --git a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
new file mode 100644
index 00000000..f92acd91
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
new file mode 100644
index 00000000..167cfd35
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
deleted file mode 100644
index 2d1f0783..00000000
--- a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index fdb70ef8..9c1d90d4 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -3,7 +3,7 @@
 # This script will install msys which is needed for configuring openssl for Android
 
 $version = "1.0.11"
-$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z"
+$url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z"
 
 $zip = "c:\users\qt\downloads\msys-$version.7z"
 $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
diff --git a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
deleted file mode 100644
index 09c45bbd..00000000
--- a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
index 23d98847..5dcc21ac 100644
--- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
@@ -8,7 +8,7 @@
 
 # NDK
 $ndkVersion = "r10e"
-$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
+$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
 $ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
 $ndkFolder = "c:\utils\android-ndk-$ndkVersion"
@@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1"
 $sdkApi = "ANDROID_API_VERSION"
 $sdkApiLevel = "android-21"
 $sdkBuildToolsVersion = "23.0.3"
-$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip"
+$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip"
 $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
 $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
 $sdkFolder = "c:\utils\android-sdk-windows"
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
index 14a5a085..553f9560 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
@@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
 $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
 $destination = "C:\Utils\openssl-android-master"
 
-Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip
+Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
 Verify-Checksum $zip $sha1
 
 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
diff --git a/coin/provisioning/qtci-windows-7-x86/libusb.ps1 b/coin/provisioning/qtci-windows-7-x86/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-7-x86/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-8-x86/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
deleted file mode 100644
index dfca166f..00000000
--- a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1
deleted file mode 100644
index 2d1f0783..00000000
--- a/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
diff --git a/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1
deleted file mode 100644
index 09c45bbd..00000000
--- a/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled
diff --git a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
new file mode 100644
index 00000000..2303699c
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
new file mode 100644
index 00000000..c19bf6cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
new file mode 100644
index 00000000..16d2e180
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
new file mode 100644
index 00000000..e8e24995
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
new file mode 100644
index 00000000..ae3f327d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
new file mode 100644
index 00000000..1f26c731
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
new file mode 100644
index 00000000..ee3f36a9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
new file mode 100644
index 00000000..f92acd91
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
new file mode 100644
index 00000000..167cfd35
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
index 44c1c5ff..44c1c5ff 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
index b405191e..b405191e 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/07-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/07-mesa_llvmpipe.ps1
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
new file mode 100644
index 00000000..f9129cff
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-git.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1
new file mode 100644
index 00000000..07c4f487
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-install-java.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-java.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
new file mode 100644
index 00000000..8d549455
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
new file mode 100644
index 00000000..0d28ea1e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
new file mode 100644
index 00000000..18109622
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-install-strawberry-perl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
new file mode 100644
index 00000000..a41035da
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-mysql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
new file mode 100644
index 00000000..92339a45
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/09-postgresql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
index 8dbe0372..8dbe0372 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
index 325be36a..325be36a 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
index 842c65dd..842c65dd 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
index dd35e01d..8540c67d 100644
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1
@@ -1,11 +1,9 @@
-#!/bin/bash
-
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -32,22 +30,22 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+. "$PSScriptRoot\..\common\helpers.ps1"
 
-# This script installs CMake 3.6.2
+# Install Visual Studio 2013 update 5
 
-# CMake is needed for autotests that verify that Qt can be built with CMake
+$version = "2013 Update 5 (KB2829760)"
+$package = "C:\Windows\Temp\vs12-kb2829760.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
 
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+echo "Fetching patch for Visual Studio $version..."
+Copy-Item $url_cache $package
+$commandLine = $package
 
-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"
+echo "Installing Update 5 for Visual Studio $version..."
+. $commandLine /norestart /passive
 
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+echo "Removing $package ..."
+remove-item $package
 
-echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc
+echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
new file mode 100644
index 00000000..f3906f78
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/qtwebkit b/qtwebkit
deleted file mode 160000
-Subproject db2ecc45564609f940ff564e777f76a1a4b734d
diff --git a/qtwebkit-examples b/qtwebkit-examples
deleted file mode 160000
-Subproject 2d68492004bf4ba49cf58c9bd72706cb282cf59
author	Liang Qi <liang.qi@qt.io>	2017-08-24 09:12:33 +0200
committer	Liang Qi <liang.qi@qt.io>	2017-08-24 09:12:33 +0200
commit	ebf8aa15e67caacab514ea93782ff0783d60af2d (patch)
tree	ecbaf2c3669d1de878ead56e8b44a83bff65efdc
parent	d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff)
parent	dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff)