summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2022-11-11 19:15:05 +0000
committerKai Köhne <kai.koehne@qt.io>2022-12-23 06:35:15 +0000
commit04a8c2fe49c52ee9e2d69d5a0544a4d88431c9fc (patch)
tree205c31de4c1562b0a3da7907fc89b46cc3914c62
parent2db3661e5675a4a3a57c51aede2854f78f1cb613 (diff)
downloadqt5-04a8c2fe49c52ee9e2d69d5a0544a4d88431c9fc.tar.gz
coin: Update provisioned qdoc, qtattributionsscanner binaries
Update qdoc to a version that queries system include paths from the compiler, avoiding spurious documentation warnings in some environments. Update qtattributionsscanner to a version that fails the documentation build on incorrect input, i.e. incorrectly formatted qt_attribution.json files. Fixes: QTBUG-108353 Change-Id: I3a64f7810cddafcbf9de66bd1d848c18f5677ad0 Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit 31c4ad1686cdc3df337a9cc05afb6b9433b21415) Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
-rwxr-xr-xcoin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh
index b2c8556e..144a8434 100755
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh
@@ -48,8 +48,8 @@ set -e
"${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-version="cc30cd5c91c8ae4bfe3736a2294969781bd48cc9"
-sha1="1779d5c18183e689a732bf015e99113dae9d7a16"
+version="39fad60085501729985888d3f546c7b8d897a394"
+sha1="b3bc413866951807fe2e87e84394cd6f69904718"
url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"