From 47b58a4f6b79e7f409bf4d4903e9148027d5c2c3 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 18 Jun 2024 19:34:49 +0200 Subject: [PATCH] coin: Provision new QDoc and qtattributionsscanner binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update QDoc and qtattributionsscanner to the latest versions from qttools/dev. The QDoc binary is built against libClang v18.1.7. It supports new commands introduced in Qt 6.7 and 6.8. It also ignores duplicate warnings that QDoc issues for certain attribution files in CI only, which have been known to block qt5.git integrations previously. Fixes: QTBUG-126407 Change-Id: I69aad04bbe73e1fdf1d6cb4ff797616a23abcdaf Reviewed-by: Topi Reiniƶ (cherry picked from commit 957b74a7fa5ea28fbaba42c6eb9f04a5124bfc71) Reviewed-by: Qt Cherry-pick Bot --- .../85-qdoc_qtattributionsscanner.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh index fd2a3afd..d9b69da9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh @@ -11,8 +11,8 @@ set -e "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -version="68bdc5764da2d4e442181b408751b6572f36fa74" -sha1="dac76e8f6cb69990661e7d814bea6f32fea29bf4" +version="57a554131c468f45f36d7501d777fcc7bba597b0" +sha1="add45e09655314db4295a2d459ef2b13e1b6268f" url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z"