diff options
author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 | |
parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1')
-rw-r--r-- | coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 index fb6a6594..2ad479c8 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -44,7 +44,7 @@ $parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BB $msvc_web_installer = "vs" + $version + "_" + $update_version $package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" $url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" $sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" |