QtAA: Add "documentation-warnings" config

Starting from 6.9 the "ubuntu-22.04-documentation-x11-tests" config
was replaced by "ubuntu-22.04-developer-build-x11-tests". The new
configuration doesn't test the documentation for warnings which is
why we had failures in 6.8 where to docs were checked but not in 6.9
or dev.

This commit fixes the issue by adding the relatively new
"documentation-warnings" configuration, which will once again check
our documentation.

See also 434e4a224a .

Task-number: QAA-2878
Change-Id: I479a9606ab16f8b87009d26ab03636c4c658fcb5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit ea1abd55ce)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit f95d6b1fdb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.9
+	branch = 6.9.0
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.9
+	branch = 6.9.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.9
+	branch = 6.9.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.9
+	branch = 6.9.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.9
+	branch = 6.9.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.9
+	branch = 6.9.0
 	status = addon

coin/platform_configs/cmake_platforms.yaml

@@ -299,7 +299,19 @@ Configurations:
         'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
-
+-
+    Id: 'bookworm-gles-arm64-debian-pkg-packaging'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
+    Environment variables: [
+        'DEBIAN_RULES_REF=6.9_gles',
+        'COIN_TARGET_DIST=tqtc-bookworm',
+        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
+        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
+        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
+        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
+    ]
 -
     # This configuration runs for every submodule, using externally
     # built qdoc and qattributionscanner binaries, to ensure that no

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -15,6 +15,7 @@ Configurations:
         'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
         'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'QNX_QEMU={{.Env.QNX_710_QEMU}}',
     ]
 -
     Id: 'qnx-710-arm64-on-linux'

coin/platform_configs/tqtc-android-automotive.yaml

@@ -1,6 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
+        "documentation-warnings",
         "rhel-8.10",
         'windows-10_22h2-mingw13',
         'ubuntu-22.04-developer-build',

coin/provisioning/common/linux/android_linux.sh

@@ -26,8 +26,8 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r26b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="34.0.0"
-sdkApiLevel="android-34"
+sdkBuildToolsVersion="35.0.1"
+sdkApiLevel="android-35"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"

coin/provisioning/common/linux/configure-gnome-shell.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# 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 modifies GNOME based Linux configurations
+
+set -ex
+
+# Desktop
+echo "Disable blank screen power saving (timeout 0 = never)"
+gsettings set org.gnome.desktop.session idle-delay 0
+echo "Disable Automatic screen lock when screensaver goes active"
+gsettings set org.gnome.desktop.screensaver lock-enabled false
+echo "Disable window animations."
+gsettings set org.gnome.desktop.interface enable-animations false
+echo "Disable hot corner feature"
+gsettings set org.gnome.desktop.interface enable-hot-corners false

coin/provisioning/common/linux/qnx_710.sh

@@ -26,12 +26,12 @@ DownloadAndExtract () {
 aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
 armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
 x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
-QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"
+QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/710/"
 
 targetFolder="/opt/"
 folderName="qnx710"
 targetPath="$targetFolder$folderName"
-qemuTargetPath="$HOME/QNX"
+qemuTargetPath="$HOME/QNX710"
 qemuIpAddress="172.31.1.10"
 export qemuNetwork="172.31.1.1"
 qemuSSHuser="root"
@@ -81,7 +81,7 @@ fi
 
 # Set env variables
 SetEnvVar "QNX_710" "$targetPath"
-SetEnvVar "QNX_QEMU" "$qemuTargetPath"
+SetEnvVar "QNX_710_QEMU" "$qemuTargetPath"
 SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress"
 SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl"
 SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath"

coin/provisioning/common/linux/qnx_800.sh

@@ -26,12 +26,12 @@ DownloadAndExtract () {
 aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
 armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
 x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
-QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"
+QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/800/"
 
 targetFolder="/opt/"
 folderName="qnx800"
 targetPath="$targetFolder$folderName"
-qemuTargetPath="$HOME/QNX"
+qemuTargetPath="$HOME/QNX800"
 qemuIpAddress="172.31.1.10"
 export qemuNetwork="172.31.1.1"
 qemuSSHuser="root"
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi
 
 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-linux-20240510.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20240930.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="93245a5bc11b88563328f0763573942fd25b5e18"
+sha1="a86d6e001e4ad46f50ed430fb85e8230e730751b"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
 sudo cp "$aarch64le_toolchain" "$targetPath"
@@ -81,5 +81,11 @@ fi
 
 # Set env variables
 SetEnvVar "QNX_800" "$targetPath"
+SetEnvVar "QNX_800_QEMU" "$qemuTargetPath"
+# These are common defines with QNX710
+SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress"
+SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl"
+SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath"
+
 
 echo "QNX SDP = 8.0.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts

@@ -0,0 +1,19 @@
+# Need to add all testserver names statically
+# as current Docker uses Multicast DNS (mDNS) (avahi)
+# Which does not work with QNX qemu
+172.31.1.1  apache2     apache2.test-net.qt.local
+172.31.1.1  squid       squid.test-net.qt.local
+172.31.1.1  vsftpd      vsftpd.test-net.qt.local
+172.31.1.1  ftp-proxy   ftp-proxy.test-net.qt.local
+172.31.1.1  danted      danted.test-net.qt.local
+172.31.1.1  cyrus       cyrus.test-net.qt.local
+172.31.1.1  echo        echo.test-net.qt.local
+172.31.1.1  iptables    iptables.test-net.qt.local
+
+# For network test server which is still used on some test
+# like networkselftest for local dns resolution
+172.31.1.1  qt-test-server
+
+# QtCoap testservers
+172.31.1.1  californium     californium.test-net.qt.local
+172.31.1.1  freecoap        freecoap.test-net.qt.local

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf

@@ -0,0 +1,2 @@
+search test-net.qt.local
+nameserver 172.31.1.1

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+function brief()
+{
+    echo "--nfs=[<mount>|no]"
+}
+
+function help()
+{
+    brief
+    cat <<EOF
+    If yes, the given nfs share "<mount>" will be mounted at <mount>
+
+    The default is no.
+EOF
+}
+
+function validate() {
+    exit 0
+}
+
+function configure()
+{
+    if [ "$OPT_NFS_QT" != no ]; then
+        cat >output/option_files/post_start.opt_nfs <<EOF
+
+echo "---> Starting NFS"
+STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
+EOF
+    fi
+
+    exit 0
+}
+
+case "$1" in
+    brief)
+        brief;;
+    help)
+        help;;
+    validate)
+        validate;;
+    configure)
+        configure;;
+    default)
+        echo no;;
+esac

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options

@@ -0,0 +1,88 @@
+OPT_ABLELOCK='no'
+DEF_OPT_ABLELOCK='no'
+OPT_ARCH='x86_64'
+DEF_OPT_ARCH='x86_64'
+OPT_ASLR='yes'
+DEF_OPT_ASLR='yes'
+OPT_CERTICOM='no'
+DEF_OPT_CERTICOM='no'
+OPT_CRYPTODEV='no'
+DEF_OPT_CRYPTODEV='no'
+OPT_DATA_INODES='3000'
+DEF_OPT_DATA_INODES='3000'
+OPT_DATA_SIZE='512'
+DEF_OPT_DATA_SIZE='60'
+OPT_EXTRA_DIRS='none'
+DEF_OPT_EXTRA_DIRS='none'
+OPT_GRAPHICS='no'
+DEF_OPT_GRAPHICS='no'
+OPT_GUEST='none'
+DEF_OPT_GUEST='none'
+OPT_HOSTNAME='qnx_QEMU_CI'
+DEF_OPT_HOSTNAME='noname'
+OPT_IP='172.31.1.69'
+DEF_OPT_IP='dhcp'
+OPT_MACADDR='52:54:00:f1:c4:92'
+DEF_OPT_MACADDR='generate'
+OPT_NFS='no'
+DEF_OPT_NFS='no'
+OPT_NFS_QT='/home/qt/work'
+DEF_OPT_NFS_QT='/home/qt/work'
+OPT_PATHTRUST='no'
+DEF_OPT_PATHTRUST='no'
+OPT_PERL='no'
+DEF_OPT_PERL='no'
+OPT_POLICY='none'
+DEF_OPT_POLICY='none'
+OPT_PYTHON='no'
+DEF_OPT_PYTHON='no'
+OPT_QAUDIT='no'
+DEF_OPT_QAUDIT='no'
+OPT_QFIM='no'
+DEF_OPT_QFIM='no'
+OPT_QTD='no'
+DEF_OPT_QTD='no'
+OPT_QVM='no'
+DEF_OPT_QVM='no'
+OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET'
+DEF_OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET'
+OPT_ROOT='no'
+DEF_OPT_ROOT='no'
+OPT_SAFE='no'
+DEF_OPT_SAFE='no'
+OPT_SECPOL='no'
+DEF_OPT_SECPOL='no'
+OPT_SECURE_DATA='no'
+DEF_OPT_SECURE_DATA='no'
+OPT_SECURE_PROCFS='yes'
+DEF_OPT_SECURE_PROCFS='yes'
+OPT_SLM='no'
+DEF_OPT_SLM='no'
+OPT_SSHD_PREGEN='yes'
+DEF_OPT_SSHD_PREGEN='yes'
+OPT_SSH_IDENT='prompt'
+DEF_OPT_SSH_IDENT='prompt'
+OPT_SYS_INODES='1000'
+DEF_OPT_SYS_INODES='1000'
+OPT_SYS_SIZE='20'
+DEF_OPT_SYS_SIZE='20'
+OPT_TCG='no'
+DEF_OPT_TCG='no'
+OPT_TELNET='no'
+DEF_OPT_TELNET='no'
+OPT_TOMCRYPT='no'
+DEF_OPT_TOMCRYPT='no'
+OPT_TOYBOX='no'
+DEF_OPT_TOYBOX='no'
+OPT_TYPE='qemu'
+DEF_OPT_TYPE='qemu'
+OPT_TZ='UTC0'
+DEF_OPT_TZ='UTC0'
+OPT_UNION='yes'
+DEF_OPT_UNION='yes'
+OPT_USB='no'
+DEF_OPT_USB='no'
+OPT_VALGRIND='no'
+DEF_OPT_VALGRIND='no'
+OPT_ZONEINFO='no'
+DEF_OPT_ZONEINFO='no'

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom

@@ -0,0 +1,25 @@
+# local/snippets/data_files.custom
+# Placeholder for local list of files to add to data partition
+
+home/root/.ssh/environment = {
+TERM=qansi
+PATH=__IFS_PATH__:/system/xbin:.
+#LD_LIBRARY_PATH=__PROC_LIB__:/home/qt/work/install/target/lib
+#QSG_RHI_BACKEND=software
+#QT_QPA_PLATFORM=offscreen
+}
+
+[uid=0 gid=0 dperms=755 type=dir] var/share
+var/share/zoneinfo=usr/share/zoneinfo
+
+[uid=0 gid=0 dperms=755 type=dir] var/share/fonts
+var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/share/fonts=usr/share/fonts
+
+var/etc/hosts=local/misc_files/etc/hosts
+var/etc/resolv.conf=local/misc_files/etc/resolv.conf
+var/etc/nsswitch.conf=etc/nsswitch.conf
+
+[uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs
+var/share/ca-certificates=local/misc_files/ca-certificates
+var/etc/ssl/certs=local/misc_files/etc/ssl/certs

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom

@@ -0,0 +1,12 @@
+# Add root HOME env variable
+procmgr_symlink /data/home/root/ /home/root
+HOME=/home/root
+
+# Needed for timezone related tests
+TZ=Europe/Oslo
+procmgr_symlink /data/var/share /usr/share
+procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime
+
+# fontconfig
+#procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf
+#procmgr_symlink /data/var/share/fonts /usr/share/fonts

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin

@@ -0,0 +1,3 @@
+root:x:0:0:Superuser:/data/home/root:/bin/sh
+sshd:x:15:6:sshd:/data/var/chroot/sshd:/bin/false
+qnxuser:x:__QNXUSER_UID__:__QNXUSER_GID__:User9:/data/home/qnxuser:/bin/sh

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom

@@ -0,0 +1,29 @@
+# local/snippets/post_start.custom
+# Commands executed from post_startup.sh. Executed at the end of system startup whether slm is in use
+# or not
+#
+# To allow resource managers to be run properly with and without security policies, command lines
+# should be written in one of the following forms:
+#
+#     START(resmgr_t) resmgr DROPROOT(resmgr_uid)
+#     STARTU(resmgr_t, resmgr_uid) resmgr
+# Where resmgr_t is the security type name (arbitrary but usually the name of the resmgr with _t appended),
+# and resmgr_uid is the id to use for both uid and gid.  DROPROOT is used only in cases where the
+# resource manager supports a -U option for switching to non-root.
+echo "---> Starting Filesystem event manager (fsevmgr)"
+STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__
+
+echo "---> Remove large fonts"
+rm -rf /data/var/share/fonts/NotoSansCJK*
+rm -rf /data/var/share/fonts/NotoSansMonoCJK*
+echo "---> Create fontconfig cache"
+fc-cache &
+
+echo "---> Restart ssh daemon"
+slay sshd
+/system/xbin/sshd -f /system/data/etc/ssh/sshd_config
+
+# Add default route so QNX knows where to send
+# requests for unknown network
+echo "---> Add default route"
+route add default 172.31.1.1

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin

@@ -0,0 +1,2 @@
+root::1475759054:0:0
+qnxuser:@S@f0J4xZibUbKllVqPMzetauCHLRi+9C8wTsxYXE5r7Pfhda5FI7zkObEmKogy01pAX5f/1niG2S2eLXbLs3xoww==@YjBmOTQwNzZiNzYwMzY3N2RkMGQ1NTZmNzA5MDFhMWY=:1476890273:0:0

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom

@@ -0,0 +1,65 @@
+# local/snippets/system_files.custom
+# Placeholder for local list of files to add to system partition
+
+[perms=444] data/etc/ssh/sshd_config={
+HostKey /data/var/ssh/ssh_host_rsa_key
+HostKey /data/var/ssh/ssh_host_ed25519_key
+AuthorizedKeysFile .ssh/authorized_keys
+PermitUserEnvironment yes
+AuthenticationMethods none
+PermitEmptyPasswords yes
+PermitRootLogin yes
+PidFile none
+Subsystem sftp /system/xbin/sftp-server
+}
+
+# libraries Qt requires
+lib/libicuuc.so.67=usr/lib/libicuuc.so.67
+lib/libicudata.so.67=usr/lib/libicudata.so.67
+lib/libicui18n.so.67=usr/lib/libicui18n.so.67
+lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
+lib/libEGL.so.1=usr/lib/libEGL.so.1
+lib/libz.so.2=usr/lib/libz.so.2
+lib/libzstd.so.1=usr/lib/libzstd.so.1
+lib/libxml2.so.2=usr/lib/libxml2.so.2
+lib/libfreetype.so.24=usr/lib/libfreetype.so.24
+lib/libbz2.so.1=usr/lib/libbz2.so.1
+lib/liblzma.so.5=usr/lib/liblzma.so.5
+lib/libdbus-1.so=usr/lib//libdbus-1.so
+lib/libdbus-1.so.22=usr/lib//libdbus-1.so.22
+lib/libbacktrace.so.1=lib/libbacktrace.so.1
+lib/libm.so.3=lib/libm.so.3
+
+#############################################
+### Image support
+#############################################
+etc/system/config/img.conf=etc/system/config/img.conf
+lib/libpng16.so.16=usr/lib/libpng16.so.16
+lib/libjpeg.so.9=lib/libjpeg.so.9
+lib/libimg.so.1=lib/libimg.so.1
+lib/dll/img_codec_bmp.so=lib/dll/img_codec_bmp.so
+lib/dll/img_codec_gif.so=lib/dll/img_codec_gif.so
+lib/dll/img_codec_jpg.so=lib/dll/img_codec_jpg.so
+lib/dll/img_codec_png.so=lib/dll/img_codec_png.so
+lib/dll/img_codec_sgi.so=lib/dll/img_codec_sgi.so
+lib/dll/img_codec_tga.so=lib/dll/img_codec_tga.so
+lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so
+
+# for inotify
+xbin/fsevmgr=sbin/fsevmgr
+
+##############################################
+### Sreen support
+##############################################
+lib/libscreen.so.1=usr/lib/libscreen.so.1
+
+# for fontconfig
+lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
+xbin/fc-cache=bin/fc-cache
+xbin/fc-match=local/misc_files/fc-match
+
+# network
+lib/libssl.so=usr/lib/libssl.so
+xbin/nslookup=usr/bin/nslookup
+xbin/unbound=sbin/unbound
+xbin/curl=usr/bin/curl

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom

@@ -0,0 +1 @@
+#define __FSEVMG_ID__       50

coin/provisioning/common/macos/android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersionLatest="r26b"
 ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 

coin/provisioning/common/unix/install-ffmpeg-ios.sh

@@ -19,6 +19,7 @@ ffmpeg_name="FFmpeg-$version"
 target_dir="$HOME"
 ffmpeg_source_dir="$target_dir/$ffmpeg_name"
 prefix="/usr/local/ios/ffmpeg"
+dylib_regex="^@rpath/.*\.dylib$"
 
 if [ ! -d "$ffmpeg_source_dir" ];
 then

coin/provisioning/common/windows/android.ps1

@@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-34"
-$sdkBuildToolsVersion = "34.0.0"
+$sdkApiLevel = "android-35"
+$sdkBuildToolsVersion = "35.0.1"
 $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,9 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh

@@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
@@ -20,10 +18,8 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh

@@ -176,6 +176,9 @@ sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requi
 sudo /usr/bin/pip3 install wheel
 sudo /usr/bin/pip3 install dataclasses
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh

@@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
@@ -19,10 +17,8 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh

@@ -140,5 +140,8 @@ sudo pip3 install virtualenv wheel
 
 sudo /usr/bin/pip3 install wheel
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh

@@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
@@ -19,10 +17,8 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh

@@ -152,5 +152,8 @@ sudo python3.8 -m pip install virtualenv wheel
 
 sudo /usr/bin/pip3 install wheel
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh

@@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
@@ -20,10 +18,8 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh

@@ -162,5 +162,8 @@ sudo python3.8 -m pip install virtualenv wheel
 sudo /usr/bin/pip3 install wheel
 sudo /usr/bin/pip3 install dataclasses
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh

@@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"
@@ -20,10 +18,8 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh

@@ -177,6 +177,9 @@ sudo /usr/bin/pip3 install wheel
 sudo /usr/bin/pip3 install dataclasses
 # No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh

@@ -17,16 +17,11 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
-# Disable hot corner feature
-gsettings set org.gnome.desktop.interface enable-hot-corners false
-# Disable windows key from showing the GNOME Shell Activities overlay
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
+echo "Disable windows key from showing the GNOME Shell Activities overlay"
 gsettings set org.gnome.mutter overlay-key ""
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh

@@ -166,5 +166,8 @@ sudo /usr/bin/pip3 install wheel
 # Make FindPython3.cmake to find python3
 sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh

@@ -17,16 +17,11 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
-# Disable hot corner feature
-gsettings set org.gnome.desktop.interface enable-hot-corners false
-# Disable windows key from showing the GNOME Shell Activities overlay
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
+echo "Disable windows key from showing the GNOME Shell Activities overlay"
 gsettings set org.gnome.mutter overlay-key ""
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh

@@ -198,6 +198,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin"
 # Make FindPython3.cmake to find python3
 sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh

@@ -17,16 +17,11 @@ export DISPLAY=:0
 
 # Set timezone to UTC.
 sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
-# Disable hot corner feature
-gsettings set org.gnome.desktop.interface enable-hot-corners false
-# Disable windows key from showing the GNOME Shell Activities overlay
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
+echo "Disable windows key from showing the GNOME Shell Activities overlay"
 gsettings set org.gnome.mutter overlay-key ""
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 
 # Set Wayland enable as false.
 echo "Setting Wayland enable as false"

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh

@@ -200,6 +200,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin"
 # Make FindPython3.cmake to find python3
 sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh

@@ -12,13 +12,8 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true'
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh

@@ -99,5 +99,5 @@ sudo zypper -nq install nodejs16
 # OpenSSL 3
 sudo zypper -nq install openssl-3
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh

@@ -12,13 +12,8 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true'
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
 
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh

@@ -113,7 +113,7 @@ sudo zypper -nq install libtommath-devel
 # For tst_license.pl with all the machines generating SBOM
 sudo zypper -nq install perl-JSON
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"

coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh

@@ -14,13 +14,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true'
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
+echo "Disable windows key from showing the GNOME Shell Activities overlay"
+gsettings set org.gnome.mutter overlay-key ""
+
+# Disable windows key from showing the GNOME Shell Activities overlay
+gsettings set org.gnome.mutter overlay-key ""
 
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg

coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh

@@ -116,7 +116,7 @@ sudo zypper -nq install libtommath-devel
 # For tst_license.pl with all the machines generating SBOM
 sudo zypper -nq install perl-JSON
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
 OpenSSLVersion="$(openssl version |cut -b 9-14)"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,9 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,9 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,9 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh

@@ -63,6 +63,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,9 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh

@@ -265,5 +265,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
 SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,12 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
+echo "Disable windows key from showing the GNOME Shell Activities overlay"
+gsettings set org.gnome.mutter overlay-key ""
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh

@@ -260,5 +260,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
 SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh

@@ -6,6 +6,7 @@
 
 set -ex
 
+BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 
@@ -13,12 +14,12 @@ NTS_IP=10.212.2.216
 
 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
-echo "Timeout for blanking the screen (0 = never)"
-gsettings set org.gnome.desktop.session idle-delay 0
-echo "Prevents screen lock when screesaver goes active."
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
+echo "Disable windows key from showing the GNOME Shell Activities overlay"
+gsettings set org.gnome.mutter overlay-key ""
+
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh

@@ -271,5 +271,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
 SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
 
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
+echo "GCC = $gccVersion" >> versions.txt
+
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh

@@ -15,11 +15,11 @@ sudo btrfs quota disable /
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
 
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh

@@ -69,7 +69,7 @@ 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)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
 OpenSSLVersion="$(openssl version |cut -b 9-14)"

coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh

@@ -15,11 +15,11 @@ sudo btrfs quota disable /
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
 
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"

coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh

@@ -75,7 +75,7 @@ sudo zypper -nq install valgrind-devel
 # Java
 sudo zypper -nq install java-17-openjdk
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh

@@ -14,11 +14,11 @@ sudo btrfs quota disable /
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
 
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh

@@ -91,7 +91,7 @@ sudo zypper -nq install libtommath-devel
 # Java
 sudo zypper -nq install java-17-openjdk
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"

coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh

@@ -19,8 +19,8 @@ sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlock
 sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg
 
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
+"$BASEDIR/../common/linux/configure-gnome-shell.sh"
+
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 echo "Set DISPLAY"

coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh

@@ -90,7 +90,7 @@ sudo zypper -nq install java-17-openjdk
 # For tst_license.pl with all the machines generating SBOM
 sudo zypper -nq install perl-JSON
 
-gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
+gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
 echo "GCC = $gccVersion" >> versions.txt
 
 OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"

coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-11-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-11-x86_64/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-12-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-13-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-14-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-15-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="34.0.0"
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-34"
+sdkApiLevel="android-35"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"