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/qtci-linux-RHEL-6.6-x86_64 | |
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/qtci-linux-RHEL-6.6-x86_64')
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh | 2 |
2 files changed, 2 insertions, 2 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" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh index 6bb7a37e..37b8c4be 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh @@ -45,7 +45,7 @@ set -e targetFolder="/opt/android" -baseUrl="http://ci-files01-hki.ci.local/input/android" +baseUrl="http://ci-files01-hki.intra.qt.io/input/android" # SDK sdkPackage="android-sdk_r24.4.1-linux.tgz" |