diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:22:02 +0200 |
| commit | 74eb853384473dbe18123f9731b6f9529d68d2cf (patch) | |
| tree | af5f2be1057f4a80f331bb5d81caa0af6c35aac8 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | |
| parent | c2493f9d6dcd0bdcf028dfce9b7b8f6356fa9eea (diff) | |
| parent | 5df417aeb9fe5fa8b8613abdd3b32bc79e32f49e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh')
| -rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index dd35e01d..7cdfc25c 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -41,7 +41,7 @@ source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" version="3.6.2" -PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" targetFolder="/opt/cmake-$version" |