diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-04-28 14:58:26 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-04-30 14:37:00 +0200 |
| commit | c6539583014e34fa04cd7226c3e385d30f14abf1 (patch) | |
| tree | 7062c71003b9632441ee9af2a1a8edd0d5c64729 /coin | |
| parent | 6ae5052d57ad2438813a5d824ef601aab8c06935 (diff) | |
Update QDoc libclang to 12.0
Task-number: QTBUG-93203
Change-Id: I58b9af361b8e02b7210286ff3cfd6ca07ebb9610
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'coin')
| -rwxr-xr-x | coin/provisioning/common/unix/libclang.sh | 12 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/libclang.ps1 | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 60946e3a..2993f49c 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -47,23 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -libclang_version=11.0 +libclang_version=12.0 if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" - sha1="2ea23914089df532385a527861feb010a867000b" + sha1="bb9223450c1c36ee37d8c91e876dba82db117a7a" elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | grep -v "8" ; then version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" - sha1="eeb9b9bed81308cc4c7a7ac177e15baec7214d5e" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-x86_64.7z" + sha1="d02e4dd30fe3f810c3a0cdcbed5870dec56ed91b" else version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" - sha1="57ebaac89bbe51a661f31a13c5e3829e34aa8b80" + sha1="81b3e640befa23b5cdebd59e206dc79e4de20ba3" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 2aa72ba8..ba7a7d80 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -5,7 +5,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$libclang_version="11.0" +$libclang_version="12.0" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -39,7 +39,7 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2019" ) { if ( $archVer -eq 64 ) { - $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a" + $sha1 = "44fabbd45b4b7e659c49347c156bae09d7aaffdc" } else { $sha1 = "" @@ -49,7 +49,7 @@ if ( $toolchain -eq "vs2019" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b" + $sha1 = "9333170111aa90af6e1db824cd964dba227a4710" } else { $sha1 = "" @@ -64,7 +64,7 @@ if ( $setDefault ) { } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer") -if ( $libclang_version -eq "110" ) { +if ( $libclang_version -eq "120" ) { # This is a hacked static build of libclang which requires special # handling on the qdoc side. Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1" |