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

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10

57 files changed, 90 insertions, 40 deletions

diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
deleted file mode 100644
index ae3f327d..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
deleted file mode 100644
index f92acd91..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
deleted file mode 100644
index c19bf6cd..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
deleted file mode 100644
index 167cfd35..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
deleted file mode 100644
index f3906f78..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
index e8e24995..af05e838 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-allow-remote-desktop-access.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
+. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
new file mode 100644
index 00000000..8f94b3d5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
index 1042c846..ee3b3b7d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-ntp.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\disable-ntp.ps1"
+. "$PSScriptRoot\..\common\windows\disable-ntp.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
new file mode 100644
index 00000000..5bf811ef
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
deleted file mode 100644
index 1f26c731..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
index 44c1c5ff..e2e9be9c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\python.ps1" 64
+. "$PSScriptRoot\..\common\windows\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
index 65aee221..c2068666 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-conan.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\03-conan.ps1"
+. "$PSScriptRoot\..\common\windows\03-conan.ps1"
 
 Run-Conan-Install `
     -ConanfilesDir "$PSScriptRoot\conanfiles" `
diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
index ee3f36a9..a9044256 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-sevenzip.ps1"
+. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1
deleted file mode 100644
index 82cee080..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\fbx_windows.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
new file mode 100644
index 00000000..57428310
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1
index 1de57a66..1de57a66 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.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 3ffe1a06..18ce0581 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
@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # This script installs QNX SDP 7.0
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
new file mode 100644
index 00000000..eed6b734
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
index b405191e..1b1a07e9 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
+. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
index e46361a0..ba571a1e 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/06-ninja.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\ninja.ps1"
+. "$PSScriptRoot\..\common\windows\ninja.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
index f9129cff..38106de7 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-git.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-git.ps1"
+. "$PSScriptRoot\..\common\windows\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1
index 3b64ffec..15065b55 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-install-jdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-jdk.ps1"
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
index 7eeb0a37..b6e3582c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\libclang.ps1" 64
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
new file mode 100644
index 00000000..3201032d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
index 8d549455..331de489 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-dependencywalker.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
index 18f67d66..00392e4c 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
 
 # This script will install 64-bit MinGW 5.3.0
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
index 490d1f10..2986db90 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\common\install-mingw.ps1"
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
 
 # This script will install 64-bit MinGW 6.3.0
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
index 0d28ea1e..875b426f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-ruby.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-ruby.ps1"
+. "$PSScriptRoot\..\common\windows\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
index 18109622..2b5756be 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-strawberry-perl.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
+. "$PSScriptRoot\..\common\windows\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
new file mode 100644
index 00000000..d57ad1cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\openssl.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
index 16d2e180..7918fabf 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-set-network-test-server.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\set-network-test-server.ps1"
+. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1
index 38185051..54a3d563 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\vulkansdk.ps1"
+. "$PSScriptRoot\..\common\windows\vulkansdk.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
new file mode 100644
index 00000000..074a7a6d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
index 37af7119..fe1aec7d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1
@@ -30,5 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1"
+. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1"
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1
new file mode 100644
index 00000000..71deb0d4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1
new file mode 100644
index 00000000..078f862e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winrtrunner.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
new file mode 100644
index 00000000..468b0433
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\fbx_windows.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
deleted file mode 100644
index 3bc58072..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\3dstudio_3rdparty.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
new file mode 100644
index 00000000..b246ce25
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
new file mode 100644
index 00000000..73dc7bc2
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
new file mode 100644
index 00000000..114f52f9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\3dstudio_3rdparty.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1
new file mode 100644
index 00000000..455d92bf
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
new file mode 100644
index 00000000..298375a3
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1
@@ -0,0 +1,51 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
+
+# This script will install VirtualBox
+
+$version = "5.2.4"
+$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe"
+$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe"
+$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe"
+
+Download $url_official $url_cache $virtualboxPackage
+Verify-Checksum $virtualboxPackage $sha1
+Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait
+
+echo "Cleaning $virtualboxPackage.."
+Remove-Item -Recurse -Force "$virtualboxPackage"
+
+echo "VirtualBox = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
new file mode 100644
index 00000000..29a1cfa4
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
new file mode 100644
index 00000000..864a79a5
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\mysql.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1
new file mode 100644
index 00000000..0e0d87be
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1
@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\postgresql.ps1"
+
diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1
index 882bd1de..7d01edac 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1
@@ -32,7 +32,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # Signing tools are needed to sign offline installers when releasing
 
diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1
deleted file mode 100644
index a853ffef..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\libusb.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1
deleted file mode 100644
index df466d52..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mqtt_broker.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
deleted file mode 100644
index f6902153..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\mysql.ps1"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
deleted file mode 100644
index c1d8e13e..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\postgresql.ps1"
-
diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
deleted file mode 100644
index b0c21996..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python3.ps1" 64
diff --git a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1 b/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
deleted file mode 100644
index 587a4c10..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/ruby.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1
deleted file mode 100644
index 4de520b2..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\winrtrunner.ps1"