Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e

67 files changed, 205 insertions, 68 deletions

diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt
index 0072dfe3..1001d869 100644
--- a/coin/platform_configs/qt3d-runtime.txt
+++ b/coin/platform_configs/qt3d-runtime.txt
@@ -1,7 +1,6 @@
 Template                    Target OS           Target arch Compiler    Target Compiler Features
 --------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-14   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-14                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-14   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-14                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 0072dfe3..1001d869 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -1,7 +1,6 @@
 Template                    Target OS           Target arch Compiler    Target Compiler Features
 --------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
 qtci-windows-10-x86_64-14   WinRT_10                        MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-14                       x86         MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-14   WinRT_10            x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-14                                   Mingw73                     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh
index 3515b870..7ccfe0a5 100755
--- a/coin/provisioning/common/linux/emsdk.sh
+++ b/coin/provisioning/common/linux/emsdk.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -76,3 +76,6 @@ EOM
 SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
 SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
 SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
+
+echo "Emsdk = $version" >> ~/versions.txt
+echo "Emsdk node = $version_node" >> ~/versions.txt
diff --git a/coin/provisioning/common/macos/install_openssl.sh b/coin/provisioning/common/macos/install_openssl.sh
index 15f02ffd..3b1978e2 100755
--- a/coin/provisioning/common/macos/install_openssl.sh
+++ b/coin/provisioning/common/macos/install_openssl.sh
@@ -73,8 +73,8 @@ SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
 SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
 SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
 
-security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
-security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem
+security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
+security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
 
 sudo rm -rf /tmp/openssl-$opensslVersion
 
diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh
index 669469be..b05b3510 100755
--- a/coin/provisioning/common/unix/install-breakpad.sh
+++ b/coin/provisioning/common/unix/install-breakpad.sh
@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
     )
 
 
-SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
+SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
 
 echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
 echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1
index 4a9544cc..7db6d8ac 100644
--- a/coin/provisioning/common/windows/install-breakpad.ps1
+++ b/coin/provisioning/common/windows/install-breakpad.ps1
@@ -87,7 +87,7 @@ catch {
     git checkout $linux_syscall_support_commit_sha1
 }
 
-Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
+Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
 
 # Write HEAD commit sha to versions txt, so build can be repeated at later date
 Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/install-gnuwin32.ps1 b/coin/provisioning/common/windows/install-gnuwin32.ps1
new file mode 100644
index 00000000..99862b3c
--- /dev/null
+++ b/coin/provisioning/common/windows/install-gnuwin32.ps1
@@ -0,0 +1,46 @@
+############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install gnuwin32
+
+$prog = "gnuwin32"
+$zipPackage = "$prog.zip"
+$temp = "$env:tmp"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
+$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
+Download $externalUrl $internalUrl "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
+Extract-7Zip "$temp\$zipPackage" C:\Utils
+
+Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt
diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1
index 8b7fe41d..bc05ba91 100644
--- a/coin/provisioning/common/windows/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
@@ -37,7 +37,8 @@ function InstallMinGW
 {
     Param (
         [string] $release = $(BadParam("release file name")),
-        [string] $sha1    = $(BadParam("SHA1 checksum of the file"))
+        [string] $sha1    = $(BadParam("SHA1 checksum of the file")),
+        [string] $suffix  = ""
     )
 
     $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
@@ -45,7 +46,7 @@ function InstallMinGW
     if ($arch -eq "i686") { $win_arch = "Win32" }
     elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
 
-    $envvar = "MINGW$version"
+    $envvar = "MINGW$version$suffix"
     $envvar = $envvar -replace '["."]'
     $targetdir = "C:\$envvar"
     $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
index addfb673..e86870c0 100755
--- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh
@@ -124,7 +124,8 @@ sudo pip install virtualenv wheel
 
 sudo /usr/local/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
-/usr/local/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
index f0585186..949de904 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -175,7 +175,7 @@ waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
 # Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
index e3faa20e..4ca84072 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh
@@ -34,6 +34,7 @@
 
 set -ex
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 # build latest qemu to usermode
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
index e5514332..df0a10ae 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
@@ -37,7 +37,9 @@
 
 set -ex
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."
@@ -96,7 +98,7 @@ rm -rf "$yoctoInstaller"
 
 
 
-if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" -a -e "$yoctoLocationMIPS64/$sysrootMIPS64" -a -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then
+if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ] && [ -e "$yoctoLocationMIPS64/$sysrootMIPS64" ] && [ -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then
     SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7"
     SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7"
     SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
index e4d988fc..a6aa3b10 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto_ssh_configurations.sh
@@ -35,6 +35,7 @@
 
 set -ex
 
+# shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
 url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
index 0f89e72c..81ea3b17 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/10-openssl_for_android_linux.sh
@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/openssl_for_android_linux.sh
 source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
index 4527e984..7c58c478 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh
@@ -33,4 +33,7 @@
 ##
 #############################################################################
 
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
 source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
index 1a185223..4dd1d40e 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh
@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_660.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
index 24ac2ac0..1d7a3968 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh
@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/qnx_700.sh
 source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
index 4a6681f3..82c2c659 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/docker.sh
+"$BASEDIR/../common/linux/docker.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
index 43790efd..fcc7d31c 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
+# shellcheck source=../common/linux/squish-coco.sh
 source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh"
diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
index b062800a..c8f3ac03 100644
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/linux/ubuntu-version.sh
+"$BASEDIR/../common/linux/ubuntu-version.sh"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
index 208762d3..6c5d2a0f 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh
@@ -12,7 +12,8 @@ sudo pkcon -y install python-devel python-virtualenv
 sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
 
 # Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
+# shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
index ecce5ae7..09a76778 100755
--- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh
@@ -35,4 +35,5 @@
 
 set -ex
 
+# shellcheck source=../common/linux/emsdk.sh
 source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
index 58a40af4..52650fea 120000..100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh
@@ -1 +1,41 @@
-../common/macos/sha1sum-compatibility.sh
\ No newline at end of file
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/macos/sha1sum-compatibility.sh
+source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
index 32528873..3304cc3e 100644..100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/02-disable-ntp.sh
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
+set -ex
 
-$(dirname $0)/../common/unix/disable-ntp_macos.sh
+# shellcheck source=../common/unix/disable-ntp_macos.sh
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
index d991e6c0..67e2c1f6 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-disable_spotlight.sh
@@ -1,2 +1,5 @@
 #!/usr/bin/env bash
-$(dirname "$0")/../common/macos/disable_spotlight.sh
+set -ex
+
+# shellcheck source=../common/macos/disable_spotlight.sh
+source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
index 6d3a2bb5..6e47f6a5 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh
@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=../common/macos/InstallPKGFromURL
+# shellcheck source=../common/macos/InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
index 8877c40b..dcfcb93b 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
+set -ex
+
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/java.sh
+"$BASEDIR/../common/macos/java.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
index f7aba0dc..1fa8b05d 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh
@@ -35,6 +35,7 @@
 
 set -ex
 
+# shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
 
 version="9.2"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
index e5dd1910..4f4d405e 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/cmake.sh
+"$BASEDIR/../common/macos/cmake.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
index 0ead5a58..06e984ec 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/homebrew.sh
+"$BASEDIR/../common/macos/homebrew.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
index ef65edad..7ebb8825 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 
+# shellcheck source=../common/macos/python2.sh
 source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
index 92b05bf3..eb2a4863 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 
+# shellcheck source=../common/macos/python3.sh
 source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
index 469901b5..2aedfe7b 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-odbc.sh
@@ -4,4 +4,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/libiodbc.sh
+"$BASEDIR/../common/macos/libiodbc.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
index a35d26ca..eaabce82 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/virtualenv.sh
+"$BASEDIR/../common/macos/virtualenv.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
index d68bf90a..33795b08 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ set -ex
 
 BASEDIR=$(dirname "$0")
 # There is only one mac package
-$BASEDIR/../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
index 9ce5d9ff..34eefeb6 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh
@@ -3,5 +3,5 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/fbx_macos.sh
+"$BASEDIR/../common/macos/fbx_macos.sh"
 
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
index 36bcf53c..963f48d6 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh
@@ -2,4 +2,5 @@
 
 set -ex
 
+# shellcheck source=../common/macos/install_openssl.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
index e1a41835..5bc77ad3 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh
@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
 # Login keychain
 sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
+loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt")
 loginKeychain=$keychains/login.keychain
 
 echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
 
 sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
 Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
+DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
 
 echo "Unlocking $devIDKeychain with password.."
 security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
 
 sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
-iosPassword=$(<"$targetFolder/ios_password.txt")
+iosPassword=$(cat "$targetFolder/ios_password.txt")
 
 iPhoneDeveloper="iosdevelopment.p12"
 shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
-security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
 
 iPhoneDistribution="iosdistribution.p12"
 shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
-security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
+security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign
 
 # Mobileprovision
 echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
index 27ff15c3..17a0c38e 100755
--- a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -ex
+
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"
 
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh
index c3936499..52650fea 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-sha1sum-compatibility.sh
@@ -33,18 +33,9 @@
 ##
 #############################################################################
 
-# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
-# In order to make all unix provioning scripts run on macOS without special case handling
-# a symbolic link is created.
-# The shasum tool is a perl script which does some globbing to determine the perl version. The
-# symbolic link has to point directly to the binary including the perl version.
-# Additionally the CI seems to have multiple parallel perl versions installed which causes
-# multiple shasum tools to be present (shasum5.16, shasum5.18).
-#
-# Currently this is
-#     /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
+#!/usr/bin/env bash
+
+set -ex
 
-[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
-# shellcheck disable=SC2012
-SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
-sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum
+# shellcheck source=../common/macos/sha1sum-compatibility.sh
+source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
index 32528873..64d43d83 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/02-disable-ntp.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
-$(dirname $0)/../common/unix/disable-ntp_macos.sh
+# shellcheck source=../common/unix/disable-ntp_macos.sh
+source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
index d991e6c0..67e2c1f6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/06-disable_spotlight.sh
@@ -1,2 +1,5 @@
 #!/usr/bin/env bash
-$(dirname "$0")/../common/macos/disable_spotlight.sh
+set -ex
+
+# shellcheck source=../common/macos/disable_spotlight.sh
+source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
index 06437ee1..9a667c64 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/15-xz.sh
@@ -39,7 +39,7 @@
 
 set -ex
 
-# shellcheck source=../common/macos/InstallPKGFromURL
+# shellcheck source=../common/macos/InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/XZ.pkg"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
index 8877c40b..dcfcb93b 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-java.sh
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
+set -ex
+
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/java.sh
+"$BASEDIR/../common/macos/java.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
index f7c251b1..d4708031 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh
@@ -35,6 +35,7 @@
 
 set -ex
 
+# shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
 
 version="10.1"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
index e5dd1910..4f4d405e 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/cmake.sh
+"$BASEDIR/../common/macos/cmake.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
index 0ead5a58..06e984ec 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/homebrew.sh
+"$BASEDIR/../common/macos/homebrew.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
index 69c6b318..86db3e27 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-pip.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/pip.sh
+"$BASEDIR/../common/macos/pip.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
index ef65edad..7ebb8825 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 
+# shellcheck source=../common/macos/python2.sh
 source "${BASH_SOURCE%/*}/../common/macos/python2.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
index 92b05bf3..eb2a4863 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-python3.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -ex
 
+# shellcheck source=../common/macos/python3.sh
 source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
index 469901b5..2aedfe7b 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-odbc.sh
@@ -4,4 +4,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/libiodbc.sh
+"$BASEDIR/../common/macos/libiodbc.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
index a35d26ca..eaabce82 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-virtualenv.sh
@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/virtualenv.sh
+"$BASEDIR/../common/macos/virtualenv.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
index fea11e01..aad628cb 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/27-libclang.sh
@@ -4,4 +4,4 @@ set -ex
 
 BASEDIR=$(dirname "$0")
 # There is only one mac package and common script uses it as a default
-$BASEDIR/../common/unix/libclang.sh
+"$BASEDIR/../common/unix/libclang.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
index 97df7e57..d0acdd45 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
@@ -57,12 +57,7 @@ sdkBuildToolsVersion="28.0.3"
 # this is compile sdk version
 sdkApiLevel="android-28"
 
-toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad"
-ndkSha1="f46b8193109bba8a58e0461c1a48f4534051fb25"
-
-toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
-ndkTargetFile="/tmp/$ndkFile"
 ndkSourceFile="$basePath/$ndkFile"
 
 echo "Unzipping Android NDK to '$targetFolder'"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
index 9ce5d9ff..34eefeb6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-fbx.sh
@@ -3,5 +3,5 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/fbx_macos.sh
+"$BASEDIR/../common/macos/fbx_macos.sh"
 
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh
index 74dd1579..74dd1579 100644..100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
index 36bcf53c..963f48d6 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh
@@ -2,4 +2,5 @@
 
 set -ex
 
+# shellcheck source=../common/macos/install_openssl.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_openssl.sh"
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
index d9caff91..0b8595a0 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh
@@ -62,7 +62,7 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen
 # Login keychain
 sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null
+{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
 loginKeychain=$keychains/login.keychain
 
 echo "Setting login.keychain as default keychain.."
@@ -104,7 +104,7 @@ open "$keychains/$devIDKeychain"
 
 sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
 Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
+{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
 
 echo "Unlocking $devIDKeychain with password.."
 { security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
@@ -112,19 +112,19 @@ security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
 
 sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
-{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
+{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
 
 iPhoneDeveloper="iosdevelopment_2019.p12"
 shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
-{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
+{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
 
 iPhoneDistribution="iosdistribution_2019.p12"
 shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
-{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
+{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
 
 # Mobileprovision
 echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
index 27ff15c3..17a0c38e 100755
--- a/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
+++ b/coin/provisioning/qtci-macos-10.13-x86_64/90-squish.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+set -ex
+
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/unix/squishInstall.sh
+"$BASEDIR/../common/unix/squishInstall.sh"
 
diff --git a/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1
new file mode 100644
index 00000000..331de489
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
new file mode 100644
index 00000000..5401b36a
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install MinGW 7.3.0
+
+$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0"
+$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532"
+$suffix = "_i686"
+
+InstallMinGW $release $sha1 $suffix
+
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-7-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+
diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1
new file mode 100644
index 00000000..0e2abbac
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86_64/36-install-gnuwin32.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"
+