diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 21:36:03 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-12 21:36:03 +0200 |
| commit | 20113e48724e303e40f6930d44b0999e965ea67a (patch) | |
| tree | 7499419f896dd1504fff531a1bee3a18dc289bfc /coin/provisioning/qtci-windows-10-x86 | |
| parent | 9b0e908aca19d58a0d6b6eefebeb7e184437ada5 (diff) | |
| parent | 5bc43f0cc3cfe047dcdbe2a293f4ed6885d8a637 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 | 2 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 | 18 |
2 files changed, 2 insertions, 18 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 index f16b5ef4..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 @@ -30,21 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx -# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe - -$version = "2015 update3 (KB3165756)" -$package = "C:\Windows\Temp\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" - -echo "Fetching patch for Visual Studio $version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing patch for Visual Studio $version..." -cmd /c "$package /norestart /Quiet" -remove-item $package |