aboutsummaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorCristian Adam <cristian.adam@qt.io>2020-10-20 22:54:58 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-05 21:12:54 +0000
commit4e3b53f22838c194ca74cf0e2309e36d51563e13 (patch)
tree7b994ecc08fa46ead1dad70ed34e891850f21ada /coin
parentefb6f87cf645df763b9521260ff247d86b763ddb (diff)
Update QDoc libclang to 11.0
Change-Id: I1cc74a1efb702d32d99749ec681e37345579c5b7 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit d3406fedd1d373cda78afb84b69b7077c3be8029) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
-rwxr-xr-xcoin/provisioning/common/unix/libclang.sh15
-rw-r--r--coin/provisioning/common/windows/libclang.ps112
2 files changed, 16 insertions, 11 deletions
diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh
index 1c9f1597..a1ec670f 100755
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -47,18 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
-libclang_version=10.0
+libclang_version=11.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="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
+ sha1="2ea23914089df532385a527861feb010a867000b"
+elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; 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"
else
version=$libclang_version
- url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
- url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
- sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d"
+ 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"
fi
zip="/tmp/libclang.7z"
diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1
index 676a7d25..2aa72ba8 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="10.0"
+$libclang_version="11.0"
Write-Output "libClang = $libclang_version" >> ~/versions.txt
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -39,20 +39,20 @@ $toolchainSuffix = ""
if ( $toolchain -eq "vs2019" ) {
if ( $archVer -eq 64 ) {
- $sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3"
+ $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a"
}
else {
- $sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c"
+ $sha1 = ""
}
$toolchainSuffix = "msvc"
}
if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) {
- $sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842"
+ $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b"
}
else {
- $sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612"
+ $sha1 = ""
}
$toolchainSuffix = "mingw"
}
@@ -64,7 +64,7 @@ if ( $setDefault ) {
}
Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")
-if ( $libclang_version -eq "100" ) {
+if ( $libclang_version -eq "110" ) {
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"