Provisioning: Use bullseye-backports repo from archive

Bullseye-backports has reached end-of-life and is no longer supported or updated. Change-Id: If154155507e159333c0d0b638fc6910b1814665a Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io> (cherry picked from commit 8882c8cac4) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Update Java in Linux targets
2025-12-27 02:15:59 +08:00 · 2025-08-04 06:53:11 +00:00 · 2024-11-20 13:17:05 +02:00 · 2024-11-20 13:16:53 +02:00 · 2024-11-19 10:57:38 +00:00 · 2024-11-19 10:57:33 +00:00
54 changed files with 117 additions and 105 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.7.3
+	branch = 6.7
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.7.3
+	branch = 6.7
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.7.3
+	branch = 6.7
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.7.3
+	branch = 6.7
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.7.3
+	branch = 6.7
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.7.3
+	branch = 6.7
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,87 +252,87 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.7.3
+	branch = 6.7
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.7.3
+	branch = 6.7
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.7.3
+	branch = 6.7
 	status = preview
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.7.3
+	branch = 6.7
 	status = preview
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.7.3
+	branch = 6.7
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.7.3
+	branch = 6.7
 	status = preview
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -5,7 +5,6 @@ Include: [
    integrity.yaml,
    ios-tests.yaml,
    address_sanitizer_platforms.yaml,
-    linux_android_tests_multi_abi.yaml,
-    wasm_qtbase_tests.yaml
+    linux_android_tests_multi_abi.yaml
 ]
 Configurations: []
--- a/coin/provisioning/common/macos/java.sh
+++ b/coin/provisioning/common/macos/java.sh
@@ -1,17 +1,20 @@
 #!/usr/bin/env bash
-# Copyright (C) 2021 The Qt Company Ltd.
+# Copyright (C) 2024 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # This script installs JDK

 set -ex

+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
 echo "Installing Java Development Kit"
-version=11.0.12
-targetFile=jdk-${version}_osx-x64_bin.dmg
+version=17.0.12
+targetFile=jdk-${version}_macos-x64_bin.dmg
+expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb"

 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux
+# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac

 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -19,6 +22,8 @@ sudo mount -o locallocks "$url" /Volumes/files

 sudo cp "/Volumes/files/$targetFile" /tmp
 sudo umount /Volumes/files
+cd /tmp
+VerifyHash "$targetFile" "$expectedHash"
 sudo hdiutil attach "/tmp/$targetFile"

 echo Installing JDK
--- a/coin/provisioning/common/macos/java_arm.sh
+++ b/coin/provisioning/common/macos/java_arm.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2021 The Qt Company Ltd.
+# Copyright (C) 2024 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # This script installs JDK
@@ -8,10 +8,10 @@ set -ex

 echo "Installing Java Development Kit"

-targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
+targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg

 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
+# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg

 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"

 echo Installing JDK
-cd /Volumes/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target /
+cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /

 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force
+sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force

 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false

-echo "JDK Version = 15.0.2" >> ~/versions.txt
+echo "JDK Version = 17.0.13" >> ~/versions.txt
--- a/coin/provisioning/common/windows/mimersql.ps1
+++ b/coin/provisioning/common/windows/mimersql.ps1
@@ -16,7 +16,7 @@ $mimer_dir="c:\MimerSQL"

 Download $url_official $url_cache $mimersqlPackage
 Verify-Checksum $mimersqlPackage $sha1
-Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive"
+Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive ExcludeDbVisualizer=1 ExcludeJava=1 ExcludeServer=1 ExcludeDocumentation=1 ExcludeReplication=1"

 Set-EnvironmentVariable "MIMERSQL_DEV_ROOT" "$mimer_dir\dev"

--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -21,9 +21,9 @@ done

 echo "Using public repositories for now. Repo-clones isn't set yet for Debian use"
 # (ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
-echo "deb http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
-echo "deb-src http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list

+echo "deb https://archive.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
+echo "deb-src https://archive.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
 # Make sure needed ca-certificates are available
 installPackages+=(ca-certificates)
 # Git is not needed by builds themselves, but is nice to have
@@ -111,7 +111,7 @@ installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
-installPackages+=(openjdk-11-jdk)
+installPackages+=(openjdk-17-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
@@ -137,8 +137,8 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
-#Java 11 for Android
-installPackages+=(openjdk-11-jdk)
+#Java 17 for Android
+installPackages+=(openjdk-17-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
@@ -139,8 +139,8 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
-#Java 11 for Android
-installPackages+=(openjdk-11-jdk)
+#Java 17 for Android, needed by RTA
+installPackages+=(openjdk-17-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
@@ -66,6 +66,9 @@ sudo zypper -nq install make
 # Tools to build Git
 sudo zypper -nq install autoconf libcurl-devel libexpat-devel

+# Java
+sudo zypper -nq install java-17-openjdk
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh
@@ -72,6 +72,9 @@ sudo zypper -nq install openssl-3
 # Valgrind (Needed for testlib selftests)
 sudo zypper -nq install valgrind-devel

+# Java
+sudo zypper -nq install java-17-openjdk
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh
@@ -72,6 +72,8 @@ sudo zypper -nq install valgrind-devel
 # cifs-utils, for mounting smb drive
 sudo zypper -nq install cifs-utils

+# Java
+sudo zypper -nq install java-17-openjdk
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Simo Fält	050897a64b	Provisioning: Use bullseye-backports repo from archive Bullseye-backports has reached end-of-life and is no longer supported or updated. Change-Id: If154155507e159333c0d0b638fc6910b1814665a Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io> (cherry picked from commit `8882c8cac4`) Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2025-08-04 06:53:11 +00:00
Matti Paaso	8e921c3ad6	Update Java in Linux targets Jenkins needs Java 17 Task-number: QTQAINFRA-6263 Change-Id: Ia6438ecadbf98dc2c27e4efc863133ab5bbb668c Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> Reviewed-by: Juho Lääkkö <juho.laakko@qt.io>	2024-11-20 13:17:05 +02:00
Matti Paaso	409ffc507b	Remove wasm test targets from qtbase Still needs Java 17 update provisioning change for Jenkins. After provisioning wasm tests are failing and commits will never end into baseline. Task-number: QTQAINFRA-6263 Change-Id: Ie450af80a66ab6623d6daff1c63761c301151808 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>	2024-11-20 13:16:53 +02:00
Fredrik Ålund	1499e6ebdf	Only install necessary Mimer SQL components When installing Mimer SQL only install the parts that we need for the build. Avoid the Mimer SQL Server, DbVisuzlier, Java, documentation, and replication support. Pick-to: 6.8 Change-Id: I4cc3fb6f77469a2a566d35483034fe1eea9d6ffd Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `37be28e63e`) Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> Reviewed-by: Fredrik Ålund <fredrik.alund@mimer.com> Reviewed-by: Matti Paaso <matti.paaso@qt.io>	2024-11-19 10:57:38 +00:00
Matti Paaso	b5637bcffc	Update Java version into 17 Jenkins needs version 17 to get agent running in VM Task-number: QTQAINFRA-6263 Change-Id: I57daadad6baa2e7e538874769af3fbe0cdd42878 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> (cherry picked from commit `5128df0130`) Reviewed-by: Aku Pietikäinen <aku.pietikainen@qt.io> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>	2024-11-19 10:57:33 +00:00
Matti Paaso	d2e90f7b0e	Update java in macOS x64 Android requires java 17 in Qt 6.8 and RTA needs java 17 into VMs to compile Qt examples. Task-number: QTQAINFRA-6492 Pick-to: 6.8 Change-Id: I873c188154c2eae2a9eebddb94279c41ca822576 Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io> Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit `73cc61c389`) Reviewed-by: Juho Lääkkö <juho.laakko@qt.io>	2024-11-19 10:57:30 +00:00