diff options
author | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
commit | c6d9e433dfa899890b4279c773779659f8cb2626 (patch) | |
tree | 1335a5742b5c6eed239f26e616fdad30e1af6271 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64 | |
parent | 7784f89036afca51292ab0cc3aadff59b3004f5f (diff) | |
parent | 3e044c71b92617eb8eb794edd30d94f57d9524ac (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index 5f3715de..9eb7e086 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -35,9 +35,5 @@ set -ex BASEDIR=$(dirname "$0") -# With RHEL 6.6 we are using different lib clang than others -VERSION=4.0 -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" -SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" - +# shellcheck source=../common/unix/libclang.sh "$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" |