diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-09 10:33:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-14 07:24:32 +0000 |
| commit | d615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch) | |
| tree | 0d809a18ab4cc1295ec473d3819b56d5ff0900df /coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 | |
| parent | bded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff) | |
| parent | bbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 index f16b5ef4..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/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 |