8 files changed, 69 insertions, 75 deletions
diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index 4248d0ed..b24de870 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -116,6 +116,7 @@ function Add-Path
 
     $oldPath = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
     [Environment]::SetEnvironmentVariable("Path", $oldPath + ";$Path", [EnvironmentVariableTarget]::Machine)
+    $Env:PATH = [System.Environment]::GetEnvironmentVariable('Path', 'Machine')
 }
 
 function is64bitWinHost
diff --git a/coin/provisioning/common/windows/icu.ps1 b/coin/provisioning/common/windows/icu.ps1
index c08748d8..be0f7277 100644
--- a/coin/provisioning/common/windows/icu.ps1
+++ b/coin/provisioning/common/windows/icu.ps1
@@ -39,51 +39,7 @@ $version = "53_1"
 
 if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
 
-   $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
-   $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
-   $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
-
-   $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
-
-   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
-      echo "Fetching from URL ..."
-      Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
-      Verify-Checksum $icuPackage_msvc2013_64 $sha1_2013
-      Get-ChildItem $icuPackage_msvc2013_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_64_devel\""}
-
-      echo "Cleaning $icuPackage_msvc2013_64..."
-      Remove-Item -Recurse -Force $icuPackage_msvc2013_64
-
-      echo "ICU MSVC2013 = $version" >> ~\versions.txt
-   }
-
-# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
-
 # FIXME: do we really want to use the 4.8.2 ICU build?
 [Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine")
 
-} else {
-
-   $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
-   $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
-   $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
-
-   $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
-
-   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
-      echo "Fetching from URL ..."
-      Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
-      Verify-Checksum $icuPackage_msvc2013_32 $sha1_2013_32
-      Get-ChildItem $icuPackage_msvc2013_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2013_32_devel\""}
-
-      echo "Cleaning $icuPackage_msvc2013_32..."
-      Remove-Item -Recurse -Force $icuPackage_msvc2013_32
-
-      echo "ICU MSVC2013 = $version" >> ~\versions.txt
-   }
-
-# FIXME: do we really want to have it per MSVC version? What about MSVC2015?
-[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
-
 }
diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1
index 9609336e..f3e96318 100644
--- a/coin/provisioning/common/windows/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
@@ -58,7 +58,7 @@ function InstallMinGW
     Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
 
     echo "Adding MinGW environment variable."
-    [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
+    [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2), [EnvironmentVariableTarget]::Machine)
 
     echo "Cleaning $mingwPackage.."
     Remove-Item -Recurse -Force "$mingwPackage"
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 208d1ed4..5a25d2eb 100644
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -4,29 +4,39 @@ param([Int32]$archVer=32)
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
 # The Clang library (C-bindings), version 3.9 or higher is required for building.
 
+# Starting from Qt 5.11 QDoc requires Clang to parse C++
+
 Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
     New-Variable -Name $var[0] -Value $var[1]
     $libclang_version = $libclang_version -replace '["."]'
 }
 
+$zip = "c:\users\qt\downloads\libclang.7z"
+$baseDestination = "C:\Utils\libclang-" + $libclang_version
 if ( $archVer -eq 64 ) {
     $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
     $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z"
-} else {
-    $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
-    $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
+    $destination = $baseDestination + "-64"
+
+    Download $url $url $zip
+    Verify-Checksum $zip $sha1
+
+    C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\
+    Rename-Item C:\Utils\libclang $destination
+    del $zip
 }
 
-$zip = "c:\users\qt\downloads\libclang.7z"
-$destination = "C:\Utils\libclang-" + $libclang_version
+$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
+$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
+$destination = $baseDestination + "-32"
 
 Download $url $url $zip
 Verify-Checksum $zip $sha1
 
 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\
 Rename-Item C:\Utils\libclang $destination
-
-[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine)
 del $zip
+
+[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $baseDestination + "-_ARCH_", [EnvironmentVariableTarget]::Machine)
 echo "libClang = $libclang_version" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/patch_qnx.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1
index 632859a0..35bb9823 100644
--- a/coin/provisioning/common/windows/patch_qnx.ps1
+++ b/coin/provisioning/common/windows/mqtt_broker.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## 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.
@@ -31,21 +31,20 @@
 ##
 #############################################################################
 
-# Patch QNX SDK due to issues in the standard library.
-# The patches are available here:
-# http://www.qnx.com/download/feature.html?programid=27555
-# A copy of the patch must be in the root of the Coin path in
-# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip
-
-
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip"
-$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565"
-$tempDir = "C:\temp\qnx_path"
+echo "MQTT: Downloading Paho test broker..."
+$zip = "c:\users\qt\downloads\pahotest.zip"
+$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
+$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
+$sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
 
-Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip
+Download $externalUrl $internalUrl $zip
 Verify-Checksum $zip $sha1
-Extract-Zip $zip $tempDir
-Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force
-Remove-Item $tempDir -recurse
+
+echo "MQTT: Installing $zip..."
+Extract-Zip $zip C:\Utils
+Remove-Item $zip
+
+echo "MQTT: Updating environment..."
+[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine")
diff --git a/coin/provisioning/common/windows/install-qnx660.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1
index bf9c9d09..bade33ef 100644
--- a/coin/provisioning/common/windows/install-qnx660.ps1
+++ b/coin/provisioning/common/windows/vulkansdk.ps1
@@ -33,14 +33,16 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script will install QNX 6.6.0
+# This script will install Vulkan SDK
 
-$version = "6.6.0"
-$nondottedversion = $version -replace '[.]',''
-$targetFolder = "c:"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip"
+$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"
 
-Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"}
+Copy-Item $url_cache $vulkanPackage
+cmd /c "$vulkanPackage /S"
 
-[Environment]::SetEnvironmentVariable("QNX_660", "$targetFolder", "Machine")
-echo "QNX = $version" >> ~\versions.txt
+echo "Cleaning $vulkanPackage.."
+Remove-Item -Recurse -Force "$vulkanPackage"
+
+echo "Vulkan SDK = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/windows/win10-enable-devmode.ps1 b/coin/provisioning/common/windows/win10-enable-devmode.ps1
new file mode 100644
index 00000000..2d7733c0
--- /dev/null
+++ b/coin/provisioning/common/windows/win10-enable-devmode.ps1
@@ -0,0 +1,16 @@
+# Turning on developer mode.
+#
+# In order to run auto tests for UWP, we have to enable developer mode on Windows 10 machines.
+# https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development
+
+if ([environment]::Is64BitOperatingSystem) {
+    $bitness = "/reg:64"
+} else {
+    $bitness = "/reg:32"
+}
+
+REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /V  AllowDevelopmentWithoutDevLicense /T REG_DWORD /D 1 /F $bitness
+if ($LastExitCode -ne 0) {
+    Write-Host "Could not enable Developer Mode."
+    exit 1
+}
diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1
new file mode 100644
index 00000000..f433ac7a
--- /dev/null
+++ b/coin/provisioning/common/windows/winrtrunner.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$zip = "c:\users\qt\downloads\winrtrunner.zip"
+
+Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip
+Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42"
+Extract-Zip $zip C:\Utils\winrtrunner
+Remove-Item $zip
+
+[Environment]::SetEnvironmentVariable("CI_WINRTRUNNER_PATH", "C:\Utils\winrtrunner", "Machine")