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

Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250

21 files changed, 51 insertions, 0 deletions

diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
index f92acd91..f92acd91 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
index ae3f327d..ae3f327d 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1
index c19bf6cd..c19bf6cd 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/04-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/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
index 167cfd35..167cfd35 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
index b0c21996..b0c21996 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
index f3906f78..f3906f78 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1
index 325be36a..325be36a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/10-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..37af7119 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
diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
index 82cee080..82cee080 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1
index 39627626..39627626 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
index 41210dcb..41210dcb 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
index 842c65dd..842c65dd 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
index 8dbe0372..8dbe0372 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
index 3bc58072..3bc58072 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1
index 1f26c731..1f26c731 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-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..4d09becf
--- /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\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/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
index a853ffef..a853ffef 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
index f6902153..f6902153 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1
index c1d8e13e..c1d8e13e 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-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..882bd1de 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1