diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-24 09:12:33 +0200 |
commit | ebf8aa15e67caacab514ea93782ff0783d60af2d (patch) | |
tree | ecbaf2c3669d1de878ead56e8b44a83bff65efdc /coin/provisioning/common/cmake.ps1 | |
parent | d18d7aaa40cfd92279bec558e980ff6c58c49340 (diff) | |
parent | dfaabde5dcbdecf24d24dce4172c976687085bb6 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
coin/provisioning/common/system_updates.sh
coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
Diffstat (limited to 'coin/provisioning/common/cmake.ps1')
-rw-r--r-- | coin/provisioning/common/cmake.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 88e2a10c..197eec57 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -2,7 +2,7 @@ $zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" -Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: |