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-Ubuntu-16.04-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-Ubuntu-16.04-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh index 1589b004..331a14d9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash BASEDIR=$(dirname "$0") -. $BASEDIR/../common/shared/sw_versions.txt -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" - -$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" |