diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-18 13:48:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-18 13:51:35 +0200 |
| commit | 356b20feed27e97fa71db5ba8c11c9343e6b26cc (patch) | |
| tree | e368c6a15c41c4d87aad36f09174b1bd70ef816f /coin/provisioning/common | |
| parent | f02c2e2fdeb3777a065f0d0a7d3c486efc648c87 (diff) | |
| parent | 6dd41c84067a213fa98d9b59aed2601a982bf665 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh
Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
Diffstat (limited to 'coin/provisioning/common')
| -rw-r--r-- | coin/provisioning/common/patch_qnx.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 index 2fca7b67..632859a0 100644 --- a/coin/provisioning/common/patch_qnx.ps1 +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -44,7 +44,7 @@ $zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" $sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" $tempDir = "C:\temp\qnx_path" -Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip Verify-Checksum $zip $sha1 Extract-Zip $zip $tempDir Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force |