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

Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d

1 files changed, 48 insertions, 0 deletions

diff --git a/coin/provisioning/common/windows/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1
new file mode 100644
index 00000000..bade33ef
--- /dev/null
+++ b/coin/provisioning/common/windows/vulkansdk.ps1
@@ -0,0 +1,48 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install Vulkan SDK
+
+$version = "1.0.51.0"
+$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe"
+$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
+
+Copy-Item $url_cache $vulkanPackage
+cmd /c "$vulkanPackage /S"
+
+echo "Cleaning $vulkanPackage.."
+Remove-Item -Recurse -Force "$vulkanPackage"
+
+echo "Vulkan SDK = $version" >> ~\versions.txt