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

Also update to pyro toolchain in QEMU way. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt coin/platform_configs/qtdeclarative.txt coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Task-number: QTBUG-64384 Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
author: Liang Qi <liang.qi@qt.io> 2017-11-08 12:31:35 +0100
committer: Liang Qi <liang.qi@qt.io> 2017-11-09 14:05:56 +0100
commit: 90272a84aeeb02d5121a1b86dba607dfb57db45f (patch)
tree: 0e6424005020faeb0712ef55e39691c19765a743 /coin
parent: f1a9b684bf72282204987b3ed33922e36d693884 (diff)
parent: 207494b1d32ec331383d08e6f490cd0b4cfcb82e (diff)
103 files changed, 1161 insertions, 423 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 605bc71c..06a17b54 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -1,22 +1,24 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release DisableTests
-qtci-windows-10-x86_64-7                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
-qtci-windows-7-x86-2                                                Mingw53     DeveloperBuild Release OpenGLDynamic
-qtci-windows-10-x86_64-7                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-7            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-7-x86-3                                                Mingw53     DeveloperBuild Release OpenGLDynamic
+qtci-windows-10-x86_64-10                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
+qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
-qtci-linux-RHEL-7.2-x86_64                                          GCC         Packaging Release NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64                                          GCC         Packaging Release NoUseGoldLinker
 qtci-macos-10.12-x86_64-8                                           Clang       Packaging DebugAndRelease Release
 qtci-osx-10.11-x86_64-3                                             Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
 qtci-macos-10.12-x86_64-8           IOS_ANY             x86_64      Clang       Release DisableTests Static
-qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64-1    Boot2Qt_Pyro        armv7       GCC         Release
+qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                arm64       GCC         Release
 qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         TestOnly LicenseCheck
 qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 23858e68..5412748f 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -2,24 +2,26 @@ Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8.1-x86_64                         x86         MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-8.1-x86_64                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-7    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-7    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-2                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-7    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-RHEL-7.2-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.2-x86_64  QNX_700             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.2-x86_64  QNX_700             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-7    QNX_700             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-7    QNX_700             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
 qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
 qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
-qtci-linux-RHEL-7.2-x86_64  INTEGRITY_11_04     armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-windows-10-x86_64-10    QNX_700             armv7       Mingw53     Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_700             x86         Mingw53     Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-linux-RHEL-7.4-x86_64  QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  QNX_700             armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  INTEGRITY_11_04     armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt
index aa718d0c..3139af8b 100644
--- a/coin/platform_configs/qtdeclarative.txt
+++ b/coin/platform_configs/qtdeclarative.txt
@@ -1,3 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-1  Boot2Qt_Pyro        armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                arm64       GCC         DeveloperBuild
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt
index 7c8e8ac5..521191bb 100644
--- a/coin/platform_configs/qtwebkit.txt
+++ b/coin/platform_configs/qtwebkit.txt
@@ -2,4 +2,4 @@ Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-7                        x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-7                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-7-x86-2                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
index 556a352f..0c00ba71 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1
@@ -36,7 +36,7 @@
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
 
 $version = "2017_version_15.0"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
 $sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
 $msvcPackage = "C:\Windows\Temp\$version.exe"
 
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
index fb6a6594..2ad479c8 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1
@@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB
 
 $msvc_web_installer = "vs" + $version + "_" + $update_version
 $package = "C:\Windows\temp\$msvc_web_installer.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
 $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
 $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
 
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
index 01442324..cf00ee88 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1
@@ -36,7 +36,7 @@
 # This script will install Visual Studio 2017
 
 $version = "2017"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
 $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
 $msvcPackage = "C:\Windows\Temp\$version.exe"
 
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
index 556a352f..0c00ba71 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1
@@ -36,7 +36,7 @@
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
 
 $version = "2017_version_15.0"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
 $sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
 $msvcPackage = "C:\Windows\Temp\$version.exe"
 
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
index fb6a6594..2ad479c8 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB
 
 $msvc_web_installer = "vs" + $version + "_" + $update_version
 $package = "C:\Windows\temp\$msvc_web_installer.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
 $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
 $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
 
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
index 01442324..cf00ee88 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
@@ -36,7 +36,7 @@
 # This script will install Visual Studio 2017
 
 $version = "2017"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
 $sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
 $msvcPackage = "C:\Windows\Temp\$version.exe"
 
diff --git a/coin/provisioning/common/3dstudio_3rdparty.ps1 b/coin/provisioning/common/3dstudio_3rdparty.ps1
index 36816438..f9c8faa7 100644
--- a/coin/provisioning/common/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/common/3dstudio_3rdparty.ps1
@@ -2,7 +2,7 @@
 
 $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip"
 
-Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.ci.local/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
+Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
 Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty
 Remove-Item $zip
diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
index bee16dd2..2af2db10 100644
--- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh
@@ -42,6 +42,7 @@ source "${BASH_SOURCE%/*}/try_catch.sh"
 # shellcheck source=DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
+ExceptionDownload=99
 ExceptionCreateTmpFile=100
 ExceptionCreateTmpDirectory=101
 ExceptionUncompress=102
@@ -80,7 +81,7 @@ function InstallAppFromCompressedFileFromURL {
         else
             targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
         fi
-        DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
+        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
         echo "Uncompress $targetFile"
         case $extension in
             "tar.gz")
@@ -103,6 +104,9 @@ function InstallAppFromCompressedFileFromURL {
 
     catch || {
         case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
             $ExceptionCreateTmpFile)
                 echo "Failed to create temporary file"
                 exit 1;
diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
index e3716597..df84431a 100644
--- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
+++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh
@@ -38,6 +38,7 @@ source "${BASH_SOURCE%/*}/try_catch.sh"
 # shellcheck source=DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
+ExceptionDownload=99
 ExceptionCreateTmpFile=100
 ExceptionCreateTmpDirectory=101
 ExceptionUncompress=102
@@ -66,7 +67,7 @@ function InstallFromCompressedFileFromURL {
         echo "Creating temporary file and directory"
         targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile
         targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
+        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
         echo "Uncompress $targetFile"
         case $extension in
             "tar.gz")
@@ -90,6 +91,9 @@ function InstallFromCompressedFileFromURL {
 
     catch || {
         case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
             $ExceptionCreateTmpFile)
                 echo "Failed to create temporary file"
                 exit 1;
diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh
new file mode 100644
index 00000000..ee3008c1
--- /dev/null
+++ b/coin/provisioning/common/android_linux.sh
@@ -0,0 +1,124 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install Android sdk and ndk.
+
+# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
+
+source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+targetFolder="/opt/android"
+sdkTargetFolder="$targetFolder/sdk"
+
+basePath="http://ci-files01-hki.intra.qt.io/input/android"
+
+toolsVersion="r25.2.5"
+toolsFile="tools_$toolsVersion-linux.zip"
+ndkVersion="r10e"
+ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
+sdkBuildToolsVersion="25.0.2"
+sdkApiLevel="android-21"
+
+toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"
+ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
+
+toolsTargetFile="/tmp/$toolsFile"
+toolsSourceFile="$basePath/$toolsFile"
+ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"
+
+ExceptionDownload=99
+ExceptionUnzipTools=100
+ExceptionUnzipNdk=101
+ExceptionRmTools=102
+ExceptionRmNdk=103
+ExceptionSdkManager=104
+
+try
+(
+    (DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload
+    (DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload
+    echo "Unzipping Android NDK to '$targetFolder'"
+    sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
+    echo "Unzipping Android Tools to '$sdkTargetFolder'"
+    sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
+    rm "$ndkTargetFile" || throw $ExceptionRmNdk
+    rm "$toolsTargetFile" || throw $ExceptionRmTools
+
+    echo "Changing ownership of Android files."
+    sudo chown -R qt:wheel "$targetFolder"
+
+    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+
+    echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
+    echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
+    echo "export ANDROID_NDK_HOST=linux-x86_64" >> ~/.bashrc
+    echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc
+
+    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+    echo "Android NDK = $ndkVersion" >> ~/versions.txt
+)
+catch || {
+        case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
+            $ExceptionUnzipTools)
+                echo "Failed to unzip Android SDK Tools."
+                exit 1;
+            ;;
+            $ExceptionUnzipNdk)
+                echo "Failed to unzip Android NDK."
+                exit 1;
+            ;;
+            $ExceptionRmTools)
+                echo "Failed to remove temporary tools package '$toolsTargetFile'."
+                exit 1;
+            ;;
+            $ExceptionRmNdk)
+                echo "Failed to remove temporary NDK package '$ndkTargetFile'."
+                exit 1;
+            ;;
+            $ExceptionSdkManager)
+                echo "Failed to run sdkmanager."
+                exit 1;
+            ;;
+        esac
+}
+
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1
index 8a94dc5d..1716467c 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -44,12 +44,6 @@ Download $officialurl $cachedurl $zip
 Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
 
 Extract-Zip $zip C:
-# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS
-if((Test-Path -Path "C:\CMake" )){
-    try {
-        Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old
-    } catch {}
-}
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
 Rename-Item $defaultinstallfolder C:\CMake
 
diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh
index c23cf9b2..701d9081 100755
--- a/coin/provisioning/common/cmake_linux.sh
+++ b/coin/provisioning/common/cmake_linux.sh
@@ -37,8 +37,8 @@
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
-# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 
 version="3.6.2"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh
index 30162166..30162166 100644
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/disable_selinux.sh
+++ b/coin/provisioning/common/disable_selinux.sh
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index d901e370..f6a9fd90 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -28,7 +28,10 @@ function Extract-7Zip
         if (-not (test-path $zipExe)) {
             $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe'
             if (-not (test-path $zipExe)) {
-                throw "Could not find 7-zip."
+                $zipExe = "C:\Utils\sevenzip\7z.exe"
+                if (-not (test-path $zipExe)) {
+                    throw "Could not find 7-zip."
+                }
             }
         }
     } else {
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1
index 4b9dd097..50f12c89 100644
--- a/coin/provisioning/common/install-java.ps1
+++ b/coin/provisioning/common/install-java.ps1
@@ -36,6 +36,8 @@
 # This script will install Java RE
 # Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.
 
+$installdir = "C:\Program Files\Java\jre7"
+
 $version = "7u7"
 if( (is64bitWinHost) -eq 1 ) {
     $arch = "x64"
@@ -53,4 +55,8 @@ Copy-Item $url_cache $javaPackage
 cmd /c "$javaPackage /s SPONSORS=0"
 echo "Cleaning $javaPackage.."
 Remove-Item -Recurse -Force "$javaPackage"
+
+[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
+Add-Path "$installdir\bin"
+
 echo "Java = $version $arch" >> ~\versions.txt
diff --git a/coin/provisioning/common/install-jdk.ps1 b/coin/provisioning/common/install-jdk.ps1
new file mode 100644
index 00000000..e4260deb
--- /dev/null
+++ b/coin/provisioning/common/install-jdk.ps1
@@ -0,0 +1,78 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script will install Java SE
+
+$installdir = "C:\Program Files\Java\jdk1.8.0_144"
+
+$version = "8u144"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "x64"
+    $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858"
+}
+else {
+    $arch = "i586"
+    $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
+}
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
+$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
+$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
+
+echo "Fetching Java SE $version..."
+$ProgressPreference = 'SilentlyContinue'
+try {
+    echo "...from local cache"
+    Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage
+} catch {
+    echo "...from oracle.com"
+    $client = new-object System.Net.WebClient
+    $cookie = "oraclelicense=accept-securebackup-cookie"
+    $client.Headers.Add("Cookie", $cookie)
+    $client.DownloadFile($official_url, $javaPackage)
+
+    Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage
+}
+
+Verify-Checksum $javaPackage $sha1
+
+cmd /c "$javaPackage /s SPONSORS=0"
+echo "Cleaning $javaPackage.."
+Remove-Item -Recurse -Force "$javaPackage"
+
+[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
+Add-Path "$installdir\bin"
+
+echo "Java SE = $version $arch" >> ~\versions.txt
diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1
index 1db41cc1..5f19543f 100644
--- a/coin/provisioning/common/install-sevenzip.ps1
+++ b/coin/provisioning/common/install-sevenzip.ps1
@@ -35,7 +35,8 @@
 
 # This script installs 7-Zip
 
-$version = "1604"
+$version = "16.04"
+$nonDottedVersion = "1604"
 
 if( (is64bitWinHost) -eq 1 ) {
     $arch = "-x64"
@@ -46,15 +47,18 @@ else {
     $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4"
 }
 
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe"
-$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe"
-$7zPackage = "C:\Windows\Temp\7zip-$version.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $nonDottedVersion + $arch + ".exe"
+$url_official = "http://www.7-zip.org/a/7z" + $nonDottedVersion + $arch + ".exe"
+$7zPackage = "C:\Windows\Temp\7zip-$nonDottedVersion.exe"
+$7zTargetLocation = "C:\Utils\sevenzip\"
 
 Download $url_official $url_cache $7zPackage
 Verify-Checksum $7zPackage $sha1
-cmd /c "$7zPackage /S /D=C:\Utils\sevenzip\"
+Start-Process -FilePath $7zPackage -ArgumentList "/S","/D=$7zTargetLocation" -Wait
 
 echo "Cleaning $7zPackage.."
 Remove-Item -Recurse -Force "$7zPackage"
 
+Add-Path $7zTargetLocation
+
 echo "7-Zip = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh b/coin/provisioning/common/integrity.sh
index ae637a44..6998866a 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/30-integrity.sh
+++ b/coin/provisioning/common/integrity.sh
@@ -38,7 +38,7 @@
 source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
 
 version="11.4.4"
-PrimaryUrl="http://ci-files01-hki.ci.local/input/integrity/ghs_$version.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
 AltUrl="$PrimaryUrl" # we lack an external source for this
 SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
 targetFolder="/opt/ghs"
diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1
index e300566e..63088861 100644
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/mysql.ps1
@@ -57,11 +57,6 @@ function DownloadAndInstall
     Remove-Item $package
 }
 
-# Remove any leftovers
-try {
-    Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
-} catch {}
-
 if( (is64bitWinHost) -eq 1 ) {
     # Install x64 bit version
     $architecture = "x64"
diff --git a/coin/provisioning/common/ninja.ps1 b/coin/provisioning/common/ninja.ps1
index 75d74d36..08bf2579 100644
--- a/coin/provisioning/common/ninja.ps1
+++ b/coin/provisioning/common/ninja.ps1
@@ -2,11 +2,10 @@
 
 $zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip"
 
-Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.ci.local\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
+Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
 Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
 
 Extract-Zip $zip C:\Utils\Ninja
 Remove-Item $zip
 
-$machinePath = [Environment]::GetEnvironmentVariable('Path', [EnvironmentVariableTarget]::Machine)
-[Environment]::SetEnvironmentVariable("Path", $machinePath + ";C:\Utils\Ninja", [EnvironmentVariableTarget]::Machine)
+Add-Path "C:\Utils\Ninja"
diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/openssl_for_android_linux.sh
new file mode 100644
index 00000000..70684eaf
--- /dev/null
+++ b/coin/provisioning/common/openssl_for_android_linux.sh
@@ -0,0 +1,85 @@
+#!/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install OpenSSL from sources.
+# Requires GCC and Perl to be in PATH.
+
+source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
+version="1.0.2g"
+officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
+targetFile="/tmp/openssl-$version.tar.gz"
+installFolder="/home/qt/"
+sha="36af23887402a5ea4ebef91df8e61654906f58f2"
+# Until every VM doing Linux Android builds have provisioned the env variable
+# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
+# QTQAINFRA-1436
+opensslHome="${installFolder}openssl-1.0.2"
+
+ExceptionDownload=99
+ExceptionTar=100
+ExceptionConfig=101
+
+try
+(
+    (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload
+
+    tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar
+    # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
+    mv "${opensslHome}g" "${opensslHome}"
+    pushd "$opensslHome"
+    perl Configure shared android || throw $ExceptionConfig
+
+    echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc
+    echo "OpenSSL for Android = $version" >> ~/versions.txt
+)
+catch || {
+    case $ex_code in
+        $ExceptionDownload)
+            exit 1;
+        ;;
+        $ExceptionTar)
+            echo "Failed to extract $targetFile"
+            exit 1;
+        ;;
+        $ExceptionConfig)
+            echo "Failed to run 'config'."
+            exit 1;
+        ;;
+    esac
+
+}
diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1
index dd5858a3..ca47f078 100644
--- a/coin/provisioning/common/postgresql.ps1
+++ b/coin/provisioning/common/postgresql.ps1
@@ -48,11 +48,6 @@ if( (is64bitWinHost) -eq 1 ) {
     $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
diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/python3.ps1
index 3c565874..316b567a 100644
--- a/coin/provisioning/common/python3.ps1
+++ b/coin/provisioning/common/python3.ps1
@@ -46,12 +46,12 @@ $install_path = "C:\Python36"
 if ( $archVer -eq 64 ) {
     echo "Running in 64 bit system"
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe"
     $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff"
 }
 else {
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe"
     $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1"
 }
 
diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh
index 56e82386..31591339 100755
--- a/coin/provisioning/common/python3.sh
+++ b/coin/provisioning/common/python3.sh
@@ -38,7 +38,7 @@
 
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
 AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
 SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9"
 DestDir="/"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh b/coin/provisioning/common/qnx_700.sh
index 8a38c054..1f1c0f3f 100644
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/10-qnx_700.sh
+++ b/coin/provisioning/common/qnx_700.sh
@@ -35,21 +35,18 @@
 
 # This script installs QNX 7.
 
-set -e
+set -ex
 targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.ci.local/input/qnx/qnx700.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
 sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
 folderName="qnx700"
 targetFile="qnx700.tar.xz"
-wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" || echo "Failed to download '$url' multiple times"
-echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
   mkdir -p $targetFolder
 fi
-if [ -d "$targetFolder/$folderName" ]; then
-  rm -rf $targetFolder/$folderName
-fi
-sudo tar -C $targetFolder -Jxf $targetFile|| echo "Failed to extract $targetFile"
+sudo tar -C $targetFolder -Jxf $targetFile
 sudo chown -R qt:users "$targetFolder"/"$folderName"
 
 # Verify that we have last file in tar
@@ -60,5 +57,5 @@ fi
 
 rm -rf $targetFile
 # Set env variables
-echo 'export QNX_700=$targetFolder/$folderName' >> ~/.bashrc
+echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc
 echo "QNX SDP = 7.0.0" >> ~/versions.txt
diff --git a/coin/provisioning/common/ruby.ps1 b/coin/provisioning/common/ruby.ps1
index 343bacfc..f7813c20 100644
--- a/coin/provisioning/common/ruby.ps1
+++ b/coin/provisioning/common/ruby.ps1
@@ -2,6 +2,6 @@
 
 $installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
 
-Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.ci.local/input/ruby/rubyinstaller-2.3.1.exe $installer
+Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer
 Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
 & $installer /DIR=C:\ruby /VERYSILENT
diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1
index 4213dde9..4a8376b6 100644
--- a/coin/provisioning/common/vc_redist.ps1
+++ b/coin/provisioning/common/vc_redist.ps1
@@ -43,13 +43,13 @@ if ( $archVer -eq 64 ) {
     echo "Running in 64 bit system"
     $arch = "x64"
     $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x64.exe"
     $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c"
 }
 else {
     $arch = "x86"
     $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe"
-    $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/vc_redist.x86.exe"
     $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1"
 }
 
diff --git a/coin/provisioning/common/windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1
deleted file mode 100644
index 0e584900..00000000
--- a/coin/provisioning/common/windows_removethemall.ps1
+++ /dev/null
@@ -1,61 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-Function Remove {
-Param (
-        [string]$1
-    )
-        If (Test-Path $1){
-        echo "Remove $1"
-        Remove-Item -Recurse -Force $1
-    }Else{
-        echo "'$1' does not exists or already removed !!"
-    }
-
-}
-
-Function Remove-Path {
-    Param (
-        [string]$Path
-    )
-    echo "Remove $path from Path"
-    $name = "Path"
-    $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";"
-    $type = "Machine"
-    [System.Environment]::SetEnvironmentVariable($name,$value,$type)
-}
-
-# Remove Android sdk and ndk
-dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
-[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
-[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
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 fb8679f2..69b3c10e 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
@@ -43,7 +43,7 @@
 # E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
-set -e
+set -ex
 targetFolder="/opt/android"
 baseUrl="http://ci-files01-hki.intra.qt.io/input/android"
 
@@ -78,8 +78,8 @@ function InstallAndroidPackage {
     folderName=$7
     name=$8
 
-    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times"
-    echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
+    echo "$sha1  $targetFile" | sha1sum --check
     sudo chmod 755 "$targetFile"
     sudo $extract || echo "Failed to extract $url"
     sudo chown -R qt:users "$targetFolder"/"$folderName"
@@ -89,10 +89,10 @@ function InstallAndroidPackage {
 
 if [ -d "$targetFolder" ]; then
     echo "Removing old Android installation"
-    sudo rm -fr "$targetFolder" || ( echo "Can't remove $targetFolder" ; exit 1; )
+    sudo rm -fr "$targetFolder"
 fi
 
-sudo mkdir "$targetFolder" || ( echo "Can't create $targetFolder" ; exit 1; )
+sudo mkdir "$targetFolder"
 
 # Install Android SDK
 echo "Installing Android SDK version $sdkPackage..."
@@ -104,7 +104,7 @@ InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFil
 
 # run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
 echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
+echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion
 
 echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
 
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
index 42db3716..03a69edb 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
@@ -35,7 +35,7 @@
 
 # This script installs the right ICU version
 
-set -e
+set -ex
 icuVersion="56.1"
 icuLocation="/usr/lib64"
 sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
@@ -45,10 +45,10 @@ function Install7ZPackageFromURL {
     expectedSha1=$2
     targetDirectory=$3
 
-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
+    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile
     rm $targetFile
 }
 
@@ -61,7 +61,7 @@ echo "Installing custom ICU devel packages on RHEL"
 
 sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
 develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
-tempDir=`mktemp -d` || echo "Failed to create temporary directory"
+tempDir=`mktemp -d`
 trap "sudo rm -fr $tempDir" EXIT
 Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
 sudo cp -a $tempDir/lib/* /usr/lib64
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
index ad5c90d3..27c7137b 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh
@@ -39,7 +39,7 @@
 # A copy of the patch must be in the root of the Coin path in
 # provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
 
-set -e
+set -ex
 sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565"
 
 function InstallZipPackageFromURL {
@@ -47,12 +47,12 @@ function InstallZipPackageFromURL {
     expectedSha1=$2
     targetDirectory=$3
 
-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
+    targetFile=`mktemp`
+    wget --tries=5 --waitretry=5 --output-document=$targetFile $url
+    echo "$expectedSha1  $targetFile" | sha1sum --check
 
-    tempDir=`mktemp -d` || echo "Failed to create temporary directory"
-    /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive"
+    tempDir=`mktemp -d`
+    /usr/bin/unzip -o -d $tempDir $targetFile
     trap "sudo rm -fr $targetFile $tempDir" EXIT
 
     sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh
deleted file mode 100644
index 38194671..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/01-linux-removethemall.sh
+++ /dev/null
@@ -1 +0,0 @@
-"${BASH_SOURCE%/*}/../common/linux-removethemall.sh"
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/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
deleted file mode 100644
index d7abd285..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh
+++ /dev/null
@@ -1 +0,0 @@
-$(dirname $0)/../common/cmake_linux.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh
deleted file mode 100644
index 87569d72..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/40-android_linux.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3
-
-# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6.
-
-# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
-# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
-# That's why we need to use Andoid-21 API version in Qt 5.9.
-
-set -e
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.ci.local/input/android"
-
-# SDK
-sdkPackage="android-sdk_r24.4.1-linux.tgz"
-sdkBuildToolsVersion="23.0.3"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkPackage"
-sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
-sdkTargetFile="$targetFolder/$sdkPackage"
-sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
-sdkFolderName="android-sdk-linux"
-sdkName="sdk"
-
-# NDK
-ndkVersion="r10e"
-ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip"
-ndkUrl="$baseUrl/$ndkPackage"
-ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
-ndkTargetFile="$targetFolder/$ndkPackage"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-$ndkVersion"
-ndkName="ndk"
-
-function InstallAndroidPackage {
-    targetFolder=$1
-    version=$2
-    url=$3
-    sha1=$4
-    targetFile=$5
-    extract=$6
-    folderName=$7
-    name=$8
-
-    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" || echo "Failed to download '$url' multiple times"
-    echo "$sha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-    sudo chmod 755 "$targetFile"
-    sudo $extract || echo "Failed to extract $url"
-    sudo chown -R qt:users "$targetFolder"/"$folderName"
-    sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name"
-    sudo rm -fr "$targetFolder"/"$version"
-}
-
-sudo mkdir "$targetFolder"
-
-# Install Android SDK
-echo "Installing Android SDK version $sdkPackage..."
-InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-echo "Installing Android NDK version $ndkPackage..."
-InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
-
-# run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
-
-# For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18
-# From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one.
-# echo 'export ANDROID_API_VERSION=$sdkApiLevel' >> ~/.bashrc
-
-# Storage version information to ~/versions.txt, which is used to print version information to provision log.
-echo "***** Android SDK *****" >> ~/versions.txt
-echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
-echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt
-platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)"
-echo "Android Platform Tools = $platformTools" >> ~/versions.txt
-sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)"
-echo "Android SDK Tools = $sdkTools" >> ~/versions.txt
-echo "***** Android NDK *****" >> ~/versions.txt
-echo "Android NDK Version = $ndkVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh
deleted file mode 100644
index daf3efab..00000000
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/rhel_packages.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# gstreamer 1 for QtMultimedia
-# gtk3 style for QtGui/QStyle
-# libusb1 for tqtc-boot2qt/qdb
-# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
-
-sudo yum install -y \
-    gstreamer1-devel gstreamer1-plugins-base-devel \
-    gtk3-devel \
-    libusb1-devel \
-    speech-dispatcher-devel
-
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh
new file mode 100755
index 00000000..a76a8638
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# refresh local certificates
+sudo subscription-manager refresh
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1 b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh
index d4439856..22bf19a3 100644..100755
--- a/coin/provisioning/qtci-windows-10-x86_64/05-mingw53.ps1
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -31,18 +33,19 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script installs MinGW 5.3
-
+set -e
 
-$zip = "c:\users\qt\downloads\i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z"
+BASEDIR=$(dirname "$0")
+source $BASEDIR/../common/network_test_server_ip.txt
 
-Invoke-WebRequest -UseBasicParsing  http://download.qt.io/development_releases/prebuilt/mingw_32/i686-5.3.0-release-posix-dwarf-rt_v4-rev0.7z -OutFile $zip
-Verify-Checksum $zip "d4f21d25f3454f8efdada50e5ad799a0a9e07c6a"
-Extract-7Zip $zip C:\
-Rename-Item -path C:\mingw32 -newName C:\MinGW530
+echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
+echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
+echo "Set DISPLAY"
+echo 'export DISPLAY=":0"' >> ~/.bashrc
+# for current session
+export DISPLAY=:0
 
-[Environment]::SetEnvironmentVariable("MINGW530", "C:\MinGW530", "Machine")
-echo "MinGW = 5.3.0" >> ~/versions.txt
-del $zip
+# disable Automatic screen lock
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+# disable blank screen power saving
+gsettings set org.gnome.desktop.session idle-delay 0
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh
new file mode 100755
index 00000000..2697de04
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms
diff --git a/coin/provisioning/common/linux-removethemall.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh
index 4386ec74..ef65b881 100755
--- a/coin/provisioning/common/linux-removethemall.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset6.sh
@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -33,17 +33,8 @@
 ##
 #############################################################################
 
-# This script removes preinstalled sw.
-# NOTE! Make sure that ALL software which are removed here have provision script under platrom folders which calls this script
+sudo yum-config-manager --enable rhel-server-rhscl7-rpms
+sudo yum -y install devtoolset-6
 
-function RemoveDir {
-    targetFolder=$1
+echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc
 
-    if [ -d "$targetFolder" ]; then
-        echo "Removing existing $targetFolder..."
-        sudo rm -fr "$targetFolder"
-    fi
-}
-
-# Android
-RemoveDir /opt/android
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
new file mode 100755
index 00000000..f7c6b694
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+set -e
+
+sudo yum -y update
+
+sudo yum -y install git
+sudo yum -y install zlib-devel
+sudo yum -y install glib2-devel
+sudo yum -y install openssl-devel
+sudo yum -y install freetype-devel
+sudo yum -y install fontconfig-devel
+
+# EGL support
+sudo yum -y install mesa-libEGL-devel
+sudo yum -y install mesa-libGL-devel
+
+sudo yum -y install libxkbfile-devel
+
+# Xinput2
+sudo yum -y install libXi-devel
+
+sudo yum -y install python-devel
+sudo yum -y install mysql-server mysql
+sudo yum -y install mysql-devel
+sudo yum -y install postgresql-devel
+sudo yum -y install cups-devel
+sudo yum -y install dbus-devel
+
+# We have to downgrade to an older version of graphite2
+# to avoid a dependency version mismatch with gtk3-devel package.
+
+sudo yum -y downgrade graphite2-1.3.6-1.el7_2
+
+# gstreamer 1 for QtMultimedia
+sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel
+
+# gtk3 style for QtGui/QStyle
+sudo yum -y install gtk3-devel
+
+# libusb1 for tqtc-boot2qt/qdb
+sudo yum -y install libusb-devel
+
+# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
+sudo yum -y install speech-dispatcher-devel
+
+# Python
+sudo yum -y install python-devel python-virtualenv
+
+# WebEngine
+sudo yum -y install bison
+sudo yum -y install flex
+sudo yum -y install gperf
+sudo yum -y install alsa-lib-devel
+sudo yum -y install pulseaudio-libs-devel
+sudo yum -y install libXtst-devel
+
+# For Android builds
+sudo yum -y install java-1.8.0-openjdk-devel
+
+# For receiving shasum
+sudo yum -y install perl-Digest-SHA
+
+# INTEGRITY requirements
+sudo yum -y install glibc.i686
diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh
index ee101fa5..966f3045 100644..100755
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -30,23 +32,24 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+name="p7zip"
+version="7-11"
+package="epel-release-$version.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
+sha1="5512b80e5b71f2370d8419fa16a0bc14c5edf854"
+targetFile="/tmp/$package"
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
 
-$version = "11_2_2"
-$openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
+sudo rpm -ivh "$targetFile"
+sudo yum -y install "$name"
+sudo rm "$targetFile"
 
-$openglUrl = "\\ci-files01-hki.intra.qt.io\provisioning\mesa3d\windows\32bit\opengl32.dll"
-$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
+# Link 7za to 7z so we can use existing installation scripts
+sudo ln -s /usr/bin/7za /usr/bin/7z
 
-echo "Take ownership of existing opengl32.dll from SysWOW64"
-takeown /f $openglPackage
-icacls $openglPackage /grant Administrators:F
-echo "Remove existing opengl32.dll from SysWOW64"
-Remove-Item -Recurse -Force $openglPackage
-echo "Add new opengl32.dll to SysWOW64"
-Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage
-Verify-Checksum $openglPackage $openglSha1
+echo "$name = $version" >> ~/versions.txt
 
-# Store version information to ~/versions.txt
-echo "OpenGL x86 = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh
index abbda212..abbda212 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-libclang.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh
new file mode 100755
index 00000000..46976e9a
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs CMake 3.6.2
+
+# CMake is needed for autotests that verify that Qt can be built with CMake
+
+source "${BASH_SOURCE%/*}/../common/cmake_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh
new file mode 100755
index 00000000..4a4031cc
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/qnx_700.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh
new file mode 100755
index 00000000..56b1556d
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/integrity.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh
new file mode 100755
index 00000000..3eced1a4
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh
index 682ea91c..9447c43f 100644..100755
--- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh
@@ -1,11 +1,11 @@
-#!/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the test suite of the Qt Toolkit.
+## This file is part of the provisioning scripts of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -33,38 +33,41 @@
 ##
 #############################################################################
 
-# This script installs the right ICU version
+set -ex
+
+# This script will install ICU
 
-set -e
 icuVersion="56.1"
 icuLocation="/usr/lib64"
 sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
+baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
 
-function Install7ZPackageFromURL {
-    url=$1
-    expectedSha1=$2
-    targetDirectory=$3
-
-    targetFile=`mktemp` || echo "Failed to create temporary file"
-    wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times"
-    echo "$expectedSha1  $targetFile" | sha1sum --check || echo "Failed to check sha1sum"
-    sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive"
-    rm $targetFile
-}
+sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
+develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
 
 echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
 
-baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
-Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64"
+targetFile=`mktemp`
+wget --tries=5 --waitretry=5 --output-document=$targetFile $baseBinaryPackageURL
+echo "$sha1  $targetFile" | sha1sum --check
+sudo 7z x -y -o"/usr/lib64" $targetFile
+sudo rm $targetFile
 
 echo "Installing custom ICU devel packages on RHEL"
 
-sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
-develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
-tempDir=`mktemp -d` || echo "Failed to create temporary directory"
-trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir
+tempDir=`mktemp -d`
+
+targetFile=`mktemp`
+wget --tries=5 --waitretry=5 --output-document=$targetFile $develPackageURL
+echo "$sha1Dev $targetFile" | sha1sum --check
+7z x -y -o$tempDir $targetFile
+
 sudo cp -a $tempDir/lib/* /usr/lib64
 sudo cp -a $tempDir/* /usr/
 
+sudo rm $targetFile
+sudo rm -fr $tempDir
+
 sudo /sbin/ldconfig
+
+echo "ICU = $icuVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh
new file mode 100755
index 00000000..05b73729
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source /opt/rh/devtoolset-6/enable
+source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh
new file mode 100755
index 00000000..637c4224
--- /dev/null
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+source "${BASH_SOURCE%/*}/../common/android_linux.sh"
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 20fb83ad..74ef2b4e 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
@@ -32,18 +32,18 @@
 ##
 #############################################################################
 
-set -e
+set -ex
 # build latest qemu to usermode
 sudo apt-get -y install automake autoconf libtool
 
-tempDir=$(mktemp -d) || echo "Failed to create temporary directory"
+tempDir=$(mktemp -d)
 git clone git://git.qemu.org/qemu.git "$tempDir"
 cd "$tempDir"
 
 #latest commit from the master proven to work
 git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f
 git submodule update --init pixman
-./configure --target-list=arm-linux-user --static
+./configure --target-list=arm-linux-user,aarch64-linux-user --static
 make
 sudo make install
 rm -rf "$tempDir"
@@ -51,13 +51,19 @@ rm -rf "$tempDir"
 # Enable binfmt support
 sudo apt-get -y install binfmt-support
 
-# Install qemu binfmt
+# Install qemu binfmt for 32bit and 64bit arm architectures
 sudo update-binfmts --package qemu-arm --install arm \
 /usr/local/bin/qemu-arm \
 --magic \
 "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \
 --mask \
 "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"
+sudo update-binfmts --package qemu-aarch64 --install aarch64 \
+/usr/local/bin/qemu-aarch64 \
+--magic \
+"\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \
+--mask \
+"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"
 
 # First test using QFont fails if fonts-noto-cjk is installed. This happens because
 # running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
new file mode 100755
index 00000000..ad4e25a9
--- /dev/null
+++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs the Yocto toolchain
+
+set -e
+
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+echo "Installing Yocto toolchain for 32-bit b2qt..."
+
+versionARM="2.3.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
+SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45"
+yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
+yoctoLocationARMv7="/opt/yocto-armv7"
+sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi"
+crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-"
+
+DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller"
+chmod +x "$yoctoInstaller"
+
+/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7"
+rm -rf "$yoctoInstaller"
+
+echo "Installing Yocto toolchain for 64-bit b2qt..."
+
+versionARM64="2.3.1"
+package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package"
+SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d"
+yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
+yoctoLocationARM64="/opt/yocto-arm64"
+sysrootARM64="sysroots/aarch64-poky-linux"
+crosscompileARM64="sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-"
+
+DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller"
+chmod +x "$yoctoInstaller"
+
+/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64"
+rm -rf "$yoctoInstaller"
+
+if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then
+    echo "export QEMUARMV7_TOOLCHAIN_SYSROOT=$yoctoLocationARMv7/$sysrootARMv7" >> ~/.profile
+    echo "export QEMUARMV7_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARMv7/$crosscompileARMv7" >> ~/.profile
+    echo "export QEMUARM64_TOOLCHAIN_SYSROOT=$yoctoLocationARM64/$sysrootARM64" >> ~/.profile
+    echo "export QEMUARM64_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARM64/$crosscompileARM64" >> ~/.profile
+else
+    echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2
+    exit 1
+fi
+
+echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt
+echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
index 1f6b9070..fb2b81dd 100755
--- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh
@@ -44,3 +44,5 @@ sudo zypper -nq install libXcomposite-devel
 sudo zypper -nq install libXcursor-devel
 sudo zypper -nq install libXrandr-devel
 sudo zypper -nq install libXtst-devel
+sudo zypper -nq install mozilla-nspr-devel
+sudo zypper -nq install mozilla-nss-devel
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh
new file mode 100755
index 00000000..4933269a
--- /dev/null
+++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install Intel Parallel Studio XE Composer Edition for C++ Linux
+
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
+set -e
+
+mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
+localMount="/mnt/storage/"
+
+iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz"
+iccPackageSource="$localMount/intel/$iccPackage"
+iccInstallPath="/opt/intel"
+iccTmpPath="/tmp/icc"
+
+iccLicense="l_icc.lic"
+iccLicenseSource="$localMount/semisecure/$iccLicense"
+iccLicenseTarget="/home/qt/$iccLicense"
+
+iccInstallInstructions="$iccTmpPath/instructions.txt"
+
+sudo mkdir -p "$localMount"
+sudo mount "$mainStorage" "$localMount"
+mkdir -p "$iccTmpPath"
+tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1
+
+cp "$iccLicenseSource" "$iccLicenseTarget"
+
+sudo umount "$localMount"
+
+cat >"$iccInstallInstructions" <<EOT
+ACCEPT_EULA=accept
+CONTINUE_WITH_OPTIONAL_ERROR=yes
+PSET_INSTALL_DIR=$iccInstallPath
+CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
+PSET_MODE=install
+ACTIVATION_LICENSE_FILE=$iccLicenseTarget
+ACTIVATION_TYPE=license_file
+PHONEHOME_SEND_USAGE_DATA=no
+ARCH_SELECTED=ALL
+COMPONENTS=;intel-comp__x86_64;intel-comp-32bit__x86_64;intel-comp-doc__noarch;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps-32bit__x86_64;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-comp-ps-ss-bec-32bit__x86_64;intel-openmp__x86_64;intel-openmp-32bit__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs-32bit__x86_64;intel-tbb-libs__x86_64;intel-idesupport-icc-common-ps__noarch;intel-icc__x86_64;intel-icc-32bit__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-doc-ps__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-icc-ps-ss-bec-32bit__x86_64;intel-tbb-devel-32bit__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-tbb-doc__noarch;intel-ism__noarch;intel-ccompxe__noarch;intel-psxe-common__noarch;intel-psxe-doc__noarch;intel-psxe-common-doc__noarch;intel-ccompxe-doc__noarch;intel-psxe-licensing__noarch;intel-psxe-licensing-doc__noarch;intel-icsxe-pset
+EOT
+
+(cd "$iccTmpPath" && sudo ./install.sh --silent $iccInstallInstructions --ignore-cpu)
+
+# Export LD_LIBRARY_PATH to Coin
+echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc
+echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc
+echo "ICC = 18.0.0 20170811" >> ~/versions.txt
+
+rm -rf "$iccTmpPath"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
index eca6858c..ef676ab3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/XZ.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
 AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
 SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
 DestDir="/"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
index a9776ba6..743cc9da 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh
@@ -49,7 +49,7 @@ ExceptionRemoveTmpFile=106
 ExceptionDisableAutoUpdate=107
 
 
-url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg
+url=http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/jdk-8u102-macosx-x64.dmg
 url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
 targetFile=/tmp/jdk-8u102-macosx-x64.dmg
 expectedSha1=1405af955f14e32aae187b5754a716307db22104
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 ea8613ad..6d57bfaa 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.3.xz 8.3.3
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
index 54389916..ca21f481 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
 appPrefix=""
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
index e699933d..cb5c1852 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh
@@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 
 psqlVersion="9.6.0"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/Postgres-$psqlVersion.zip"
 AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/$psqlVersion/Postgres-$psqlVersion.zip"
 SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
 appPrefix=""
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
index c6a17530..e041027d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh
@@ -43,7 +43,7 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-basePath="/net/ci-files01-hki.ci.local/hdd/www/input/android"
+basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
 
 toolsVersion="r25.2.5"
 toolsFile="tools_$toolsVersion-macosx.zip"
@@ -79,15 +79,15 @@ try
     echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
     echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
 
-    echo "export ANDROID_SDK_ROOT=$sdkTargetFolder" >> ~/.bashrc
+    echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
     echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
     echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc
     echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc
 
-    echo "Android SDK tools = $toolsVersion" >> ~/version.txt
-    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/version.txt
-    echo "Android SDK API level = $sdkApiLevel" >> ~/version.txt
-    echo "Android NDK = $ndkVersion" >> ~/version.txt
+    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+    echo "Android NDK = $ndkVersion" >> ~/versions.txt
 )
 catch || {
         case $ex_code in
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
index a6563ae5..d109051d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh
@@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
 
 opensslVersion="1.0.2k"
 opensslFile="openssl-$opensslVersion.tar.gz"
-opensslDlUrl="http://ci-files01-hki.ci.local/input/openssl/$opensslFile"
+opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
 opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
 opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
 
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
index dcd8fead..8a3999b9 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/XZ.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/XZ.pkg"
 AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg"
 SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67"
 DestDir="/"
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
index 7555c752..37acc2ee 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
@@ -50,4 +50,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 # shellcheck source=../common/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.2.xz 8.2
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
index 4d938890..1e4de16a 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
 SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
 appPrefix=""
diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
index 381fedf2..a990829e 100755
--- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
+++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh
@@ -40,7 +40,7 @@
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 
-PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
 AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"
 SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
 appPrefix=""
diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
deleted file mode 100644
index dfca166f..00000000
--- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
deleted file mode 100644
index dfca166f..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
index cc00fe0d..3ffe1a06 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1
@@ -37,7 +37,7 @@
 
 $zip = "c:\users\qt\downloads\qnx700.7z"
 
-Invoke-WebRequest -UseBasicParsing  http://ci-files01-hki.ci.local/input/qnx/qnx700.7z -OutFile $zip
+Invoke-WebRequest -UseBasicParsing  http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip
 Verify-Checksum $zip "2eab8bcf993056f79c9e2585c9c05e05658ba8bb"
 Extract-7Zip $zip C:\
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1
new file mode 100644
index 00000000..41210dcb
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\patch_qnx.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
new file mode 100644
index 00000000..e8e24995
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1 b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
new file mode 100644
index 00000000..2303699c
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/01-disable-uac.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
deleted file mode 100644
index dfca166f..00000000
--- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
new file mode 100644
index 00000000..ae3f327d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1
new file mode 100644
index 00000000..1f26c731
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
new file mode 100644
index 00000000..ee3f36a9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
index f92acd91..f92acd91 100644
--- a/coin/provisioning/qtci-windows-7-x86/004-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1
diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
new file mode 100644
index 00000000..c19bf6cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
index 167cfd35..167cfd35 100644
--- a/coin/provisioning/qtci-windows-7-x86/005-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
deleted file mode 100644
index 553f9560..00000000
--- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
+++ /dev/null
@@ -1,32 +0,0 @@
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# OpenSSL need to be configured from sources for Android build in windows 7
-# Msys need to be installed to target machine
-# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
-
-$version = "1.0.2j"
-$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.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
-Verify-Checksum $zip $sha1
-
-C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
-C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils
-Remove-Item $destination -Force -Recurse
-Rename-Item C:\Utils\openssl-$version $destination
-Remove-Item $zip
-Remove-Item C:\Utils\openssl-$version.tar
-
-set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc
-set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar
-set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr
-$env:Path = $env:Path + ";C:\msys\1.0\bin"
-
-echo "Configuring OpenSSL $version for Android..."
-cd $destination
-C:\msys\1.0\bin\bash.exe -c "perl Configure shared android"
-
-# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
-# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
new file mode 100644
index 00000000..f9129cff
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-install-git.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
new file mode 100644
index 00000000..3b64ffec
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/08-install-jdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
index 8dbe0372..8dbe0372 100644
--- a/coin/provisioning/qtci-windows-7-x86/cmake.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-cmake.ps1
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
new file mode 100644
index 00000000..8d549455
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
new file mode 100644
index 00000000..7c4cd8ac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\..\common\install-mingw.ps1"
+
+# This script will install MinGW 5.3.0
+
+$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0"
+$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A"
+
+InstallMinGW $release $sha1
+
+
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1
new file mode 100644
index 00000000..0d28ea1e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
new file mode 100644
index 00000000..18109622
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-strawberry-perl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
index 842c65dd..842c65dd 100644
--- a/coin/provisioning/qtci-windows-7-x86/jom.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-jom.ps1
diff --git a/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
new file mode 100644
index 00000000..a41035da
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-mysql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
new file mode 100644
index 00000000..f3906f78
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
new file mode 100644
index 00000000..92339a45
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-postgresql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
new file mode 100644
index 00000000..16d2e180
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/09-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
new file mode 100644
index 00000000..ba194de6
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1
@@ -0,0 +1,19 @@
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# This script installs DirectX SDK
+
+$package = "DXSDK_Jun10.exe"
+
+$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
+$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
+$exe = "C:\Windows\Temp\$package"
+
+Download $officialUrl $cachedUrl $exe
+
+echo "Installing DirectX SDK"
+cmd /c "$exe /u"
+
+Remove-Item $exe
+
+echo "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/12-icu.ps1
index 325be36a..325be36a 100644
--- a/coin/provisioning/qtci-windows-7-x86/icu.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/12-icu.ps1
diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1
new file mode 100644
index 00000000..5f8aa2f8
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/25-python.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/python3.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python3.ps1
index 164fbe43..164fbe43 100644
--- a/coin/provisioning/qtci-windows-7-x86/python3.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/25-python3.ps1
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/30-android.ps1
index 5dcc21ac..f355a5de 100644
--- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/30-android.ps1
@@ -1,3 +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$
+##
+#############################################################################
+
 . "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script installs Android sdk and ndk
diff --git a/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
new file mode 100644
index 00000000..4f2b74eb
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/31-android_openssl.ps1
@@ -0,0 +1,69 @@
+############################################################################
+##
+## 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$
+##
+#############################################################################
+
+# Requires: 7z, perl and msys
+
+. "$PSScriptRoot\..\common\helpers.ps1"
+
+# OpenSSL need to be configured from sources for Android build in windows 7
+# Msys need to be installed to target machine
+# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
+
+$version = "1.0.2j"
+$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.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+Verify-Checksum $zip $sha1
+
+C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils
+C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-$version.tar -oC:\Utils
+Rename-Item C:\Utils\openssl-$version $destination
+Remove-Item $zip
+Remove-Item C:\Utils\openssl-$version.tar
+
+set CC=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc
+set AR=C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar
+set ANDROID_DEV=C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr
+
+# Make sure configure for openssl has a "make" and "perl" available
+$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
+
+echo "Configuring OpenSSL $version for Android..."
+pushd $destination
+C:\msys\1.0\bin\bash.exe -c "c:/strawberry/perl/bin/perl Configure shared android"
+popd
+
+# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
+# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
diff --git a/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1
index cc8be923..cc8be923 100644
--- a/coin/provisioning/qtci-windows-8-x86/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-libclang.ps1
diff --git a/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1
index 7eeb0a37..7eeb0a37 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-libclang.ps1
author	Liang Qi <liang.qi@qt.io>	2017-11-08 12:31:35 +0100
committer	Liang Qi <liang.qi@qt.io>	2017-11-09 14:05:56 +0100
commit	90272a84aeeb02d5121a1b86dba607dfb57db45f (patch)
tree	0e6424005020faeb0712ef55e39691c19765a743 /coin
parent	f1a9b684bf72282204987b3ed33922e36d693884 (diff)
parent	207494b1d32ec331383d08e6f490cd0b4cfcb82e (diff)