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/qtci-linux-RHEL-6.6-x86_64 | |
| 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/qtci-linux-RHEL-6.6-x86_64')
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh index 19993ecc..ad5c90d3 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -60,5 +60,5 @@ function InstallZipPackageFromURL { echo "Patching QNX" -baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/qnx/patch-660-4367-RS6069_cpp-headers.zip" InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" |