Update submodules on '6.9.1 in qt/qt5'

Change-Id: I3bb20d29e111789d953c172e754a37d09f03c83a Reviewed-by: Qt Submodule Update Bot <[email protected]>
2026-09-22 00:16:54 +08:00 · 2025-05-29 10:31:10 +00:00 · 2025-05-22 15:04:01 +00:00 · 2025-05-21 04:31:43 +00:00 · 2025-05-17 17:37:55 +00:00 · 2025-05-16 12:36:14 +00:00
1967 changed files with 5469 additions and 17636 deletions
@@ -3,5 +3,4 @@
 .gitattributes          export-ignore
 .commit-template        export-ignore eol=lf
 init-repository         export-ignore
-*.bat                   text eol=crlf
-*.bat.in                text eol=crlf
+README.git              export-ignore
@@ -5,22 +5,9 @@ Makefile
 CMakeLists.txt.user*
 CMakeUserPresets.json
 .vscode
-build/
-build-*/
+build
+build-*
 .DS_Store
 init-repository.opt
 init-repository.opt.in
 config.tl.opt
-
-# CLion generated files
-.idea
-
-# Gradle generated files
-.gradle/
-local.properties
-
-# JDTLS generated files
-.project
-.classpath
-.settings/
-bin/
@@ -1,54 +1,61 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = essential
+[submodule "qtxmlpatterns"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtxmlpatterns
+	url = ../qtxmlpatterns.git
+	branch = dev
+	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtshadertools qttasktree
+	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,234 +76,264 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
+[submodule "qtsystems"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtsystems
+	url = ../qtsystems.git
+	branch = dev
+	status = ignore
+[submodule "qtfeedback"]
+	depends = qtdeclarative
+	recommends = qtmultimedia
+	path = qtfeedback
+	url = ../qtfeedback.git
+	branch = master
+	status = ignore
+[submodule "qtpim"]
+	depends = qtdeclarative
+	path = qtpim
+	url = ../qtpim.git
+	branch = dev
+	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
+[submodule "qtwebengine"]
+	depends = qtdeclarative
+	recommends = qtwebchannel qttools qtpositioning
+	path = qtwebengine
+	url = ../qtwebengine.git
+	branch = 6.9.1
+	status = addon
+	priority = 10
+[submodule "qtcanvas3d"]
+	depends = qtdeclarative
+	path = qtcanvas3d
+	url = ../qtcanvas3d.git
+	branch = dev
+	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
+	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.12.0
-	status = deprecated
+	branch = 6.9.1
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.12.0
-	status = deprecated
+	branch = 6.9.1
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
+[submodule "qtgamepad"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtgamepad
+	url = ../qtgamepad.git
+	branch = dev
+	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
+[submodule "qtwebglplugin"]
+	depends = qtbase qtwebsockets
+	recommends = qtdeclarative
+	path = qtwebglplugin
+	url = ../qtwebglplugin.git
+	branch = dev
+	status = ignore
 [submodule "qtlottie"]
-	depends = qtbase qtdeclarative qtquicktimeline
+	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.12.0
-	status = addon
-[submodule "qttasktree"]
-	depends = qtbase
-	path = qttasktree
-	url = ../qttasktree.git
-	branch = 6.12.0
-	status = preview
-[submodule "qtopenapi"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtopenapi
-	url = ../qtopenapi.git
-	branch = 6.12.0
-	status = preview
-[submodule "qtcanvaspainter"]
-	depends = qtbase qtdeclarative qtshadertools
-	path = qtcanvaspainter
-	url = ../qtcanvaspainter.git
-	branch = 6.12.0
+	branch = 6.9.1
 	status = addon
@@ -1,30 +0,0 @@
-# Changelog
-
-This repository does not keep a changelog of its own. Qt is released as a set
-of modules, and the change information for a release is published with that
-release rather than tracked here.
-
-## Where to look
-
-**Cumulative release notes** are published in
-[qt/qtreleasenotes](https://code.qt.io/cgit/qt/qtreleasenotes.git/tree/qt).
-
-**What changed in a Qt version.** Each minor release has a "What's New" page in
-the Qt documentation. It lists new modules, new and deprecated APIs, and the
-notable changes per module.
-See [What's New in Qt 6](https://doc.qt.io/qt-6/whatsnewqt6.html).
-
-**Release phases and schedule.** Each release has a wiki page with the
-release plan. See [Qt Releasing Wiki](https://wiki.qt.io/QtReleasing).
-
-**Moving between major versions.** The
-[Porting to Qt 6](https://doc.qt.io/qt-6/portingguide.html) guide covers the
-changes that affect existing code.
-
-## Qt 4 and Qt 5 changelogs
-
-Most module repositories feature a `dist` directory holding `changes-*` files.
-These are no longer maintained. They stop at `changes-6.0.0` and are kept only
-as a historical record of Qt 4 and Qt 5 releases. Do not add to them, and do
-not treat them as a current source of change information for Qt 6. Use the
-sources above instead.
@@ -1,23 +0,0 @@
-# Code of conduct
-
-The Qt Community Code of Conduct applies to everyone who takes part in the Qt
-Project. It covers any forum, mailing list, wiki, website, IRC channel, public
-meeting, or private correspondence in the context of the project and its
-services.
-
-[QUIP 12](https://contribute.qt-project.org/quips/12) is the Code of Conduct
-itself and is the authoritative text. It asks participants to be considerate,
-respectful, collaborative, pragmatic, and supportive of one another, and it
-explains what each of those means in practice.
-
-## If something goes wrong
-
-QUIP 12 describes how the community handles problems. In short: offer personal
-support to anyone who is being attacked, and remind those involved of the Code
-of Conduct. Moderators of a mailing list, channel, or forum can suspend access
-for anyone who persistently breaks it, so raise the matter with them when it
-needs to go further. Where a disagreement is technical, ask the community for
-advice or request mediation rather than escalating it into a public dispute.
-
-Read [QUIP 12](https://contribute.qt-project.org/quips/12) in full for the
-complete guidance.
@@ -4,4 +4,5 @@ We welcome contributions to Qt!

 Note that we cannot accept pull requests on GitHub. All contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).

-See [contribute.qt-project.org](https://contribute.qt-project.org/) to learn more.
+Read the
+[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.
@@ -1,29 +0,0 @@
-# Governance
-
-The Qt Project is a meritocratic, consensus-based community. Anyone with an
-interest in Qt can join it, take part in its decision-making, and contribute to
-Qt's development.
-
-[QUIP 2](https://contribute.qt-project.org/quips/2) is the Qt Governance Model
-and is the authoritative text. It describes five levels of involvement and how
-people move between them:
-
-* **Users** — community members who use Qt. They report bugs, help other
-  users, and advocate for the project.
-* **Contributors** — community members who provide input to the project, by
-  proposing changes in Gerrit, reviewing, writing documentation, or testing.
-  There is no selection process.
-* **Approvers** — contributors who have shown a sustained commitment to the
-  project and who can approve changes for inclusion.
-* **Maintainers** — approvers responsible for a specific area of Qt, who
-  decide what happens in the code they maintain.
-* **Chief Maintainer** — leads the maintainer group, sets the overall
-  direction of the project, and has the final say when the project fails to
-  reach consensus.
-
-The current maintainers are listed at
-[wiki.qt.io/Maintainers](https://wiki.qt.io/Maintainers).
-
-For the processes that sit alongside this model — the branch policy, the
-security policy, the code of conduct, and the rest — see
-[contribute.qt-project.org](https://contribute.qt-project.org/).
@@ -1,69 +0,0 @@
-Qt licensing
-============
-
-Qt is not distributed under a single license, and this file is not a license
-text. Qt is available under commercial terms and under several open source
-licenses, and which terms apply depends on the module and the file.
-
-The open source licenses in use across the Qt repositories include LGPL-3.0,
-GPL-2.0, and GPL-3.0 for module implementations, GFDL-1.3 for documentation,
-and BSD-3-Clause for build system files, examples, and tooling. Third-party
-code bundled inside a module carries its own terms.
-
-
-How licensing is declared
-------------------------
-
-Licensing is declared per file, following the
-[REUSE version 3.3 specification](https://reuse.software/spec-3.3/). Every file
-carries an SPDX-License-Identifier header, or is covered by an adjacent
-REUSE.toml file where an inline header is not possible. The full text of every
-license referenced this way is in the LICENSES directory of the repository it
-applies to.
-
-Those SPDX headers and the LICENSES directory are the authoritative,
-machine-readable record for the Qt sources. They are what the REUSE tool and
-Qt's software bill of materials pipeline read when generating the SBOM for the
-sources; they do not describe the licensing of Qt binaries.
-
-
-Finding the terms for a module
------------------------------
-
-Each Qt module carries its own licensing, and the terms are stated in the
-"Licenses and Attributions" section of that module's documentation overview
-page. For example, see:
-
-    https://doc.qt.io/qt-6/qtcore-index.html
-
-That section also lists the third-party code the module includes and the
-license of each such component.
-
-License of built modules and tools
----------------------------------
-
-When building Qt, you can build SBOM documents alongside (`-sbom` argument for
-`configure`). You can use the generated SBOM artifacts to query copyrights and
-licenses for built modules, and tools. For more details, see
-[Software Bill of Materials](https://doc.qt.io/qt-6/sbom.html}.
-
-Further information
-------------------
-
-Qt licensing overview
-    https://doc.qt.io/qt-6/licensing.html
-
-Licenses used in Qt
-    https://doc.qt.io/qt-6/licenses-used-in-qt.html
-
-All Qt modules
-    https://doc.qt.io/qt-6/qtmodules.html
-
-Commercial licensing
-    https://www.qt.io/licensing/
-
-Open source licensing and its obligations
-    https://www.qt.io/download-open-source
-
-Qt educational license
-    https://www.qt.io/qt-educational-license
@@ -0,0 +1,57 @@
+OBTAINING QT 6 FROM GIT
+=======================
+
+ Synopsis
+ ========
+
+ For a more in-depth description on how to build Qt 6 from git,
+ please see: http://wiki.qt.io/Building_Qt_6_from_Git
+
+ Note that, although the git module is called qt5.git, the dev and 6.x branches
+ do contain Qt 6!
+
+ Get The Submodules
+ ==================
+
+ Cloning qt5.git does not automatically clone all submodules.
+ To get the submodules, it is recommended to use the `init-repository' script.
+
+   ./init-repository
+
+ See `./init-repository -help' for full documentation on the many supported
+ options.
+
+
+ Update The Submodules (optional)
+ ================================
+
+ After a plain `git clone' and `init-repository', you will have each submodule
+ checked out to a particular SHA1.  This combination of SHA1s is guaranteed to
+ have passed some basic acceptance testing.
+
+ If (and only if!) you need newer versions of some submodules, you can manually
+ fetch and/or pull and/or reset any modules you like, or use the qt5_tool to
+ pull all modules:
+
+   ./qtrepotools/bin/qt5_tool -p
+
+ NOTE! As soon as you change the SHA1 of any submodule, you are using a
+ combination of modules which is potentially untested and broken!  If you want
+ something which is more likely to compile, stick to the module SHA1s provided
+ in this repository.
+
+
+ Install The Git Grafts (optional)
+ =================================
+
+ If you want to be able to connect the Qt5 and Qt4 development history, you
+ may set up git grafts with the following command:
+
+   git submodule foreach '../qtrepotools/bin/git-qt-grafts <path_to_history>'
+
+
+ Developing and Contributing to Qt
+ =================================
+
+ For more information on how to develop and contribute to Qt, please see:
+ http://wiki.qt.io/Category:Developing_Qt
@@ -1,80 +1,127 @@
-# Qt 6
+HOW TO BUILD Qt 6
+=================

-This repository, `qt5.git`, is the Qt super-repository. It records a git
-submodule pointer to each Qt module repository, such as `qtbase` and
-`qtdeclarative`, along with the build system, the `configure` scripts, and the
-continuous integration configuration that build those modules as a single tree.

-Each submodule points at a specific revision. The combination of revisions that
-a branch records is a snapshot that has passed Qt's continuous integration.
-Clone this repository first and let it select the module revisions for you. If
-you move a submodule to a different revision, you are building a combination
-that nobody has tested.
+Synopsis
+========

-> Despite the name `qt5.git`, the `dev` and `6.x` branches contain Qt 6.
+System requirements
+-------------------

-To use Qt rather than build it from sources, see
-[Get and Install Qt](https://doc.qt.io/qt-6/get-and-install-qt.html).
+* C++ compiler supporting the C++17 standard
+* CMake
+* Ninja
+* Python 3

-## Repository layout
+For more details, see also https://doc.qt.io/qt-6/build-sources.html

-Each Qt module lives in its own directory, such as `qtbase` or
-`qtdeclarative`. Those directories are git submodules.
+Linux, Mac:
+-----------

-The other top-level entries are:
+```
+cd <path>/<source_package>
+./configure -prefix $PWD/qtbase
+cmake --build .
+```

-| Entry | Purpose |
-| ----- | ------- |
-|`.gitmodules`| Lists modules for the current branch.|
-| `CMakeLists.txt` | Entry point for the top-level build of all modules. |
-| `configure`, `configure.bat` | Wrappers that configure that build. |
-| `init-repository` | Checks out the submodules. Git clones only. |
-| `cmake/` | CMake modules shared by the top-level build. |
-| `coin/` | Continuous integration configuration and provisioning. |
-| `LICENSES/`, `REUSE.toml` | License texts and per-file licensing metadata. |
+Windows:
+--------

-## Get the sources
+1. Open a command prompt.
+2. Ensure that the following tools can be found in the path:
+ * Supported compiler (Visual Studio 2022 or later, or MinGW-builds gcc 13.1 or later)
+ * Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)

-For instructions, see [Getting Qt Sources from the Git repository](https://doc.qt.io/qt-6/getting-sources-from-git.html).
+```
+cd <path>\<source_package>
+configure -prefix %CD%\qtbase
+cmake --build .
+```

-## Build Qt
+More details follow.

-For instructions, see [Build from sources](https://doc.qt.io/qt-6/build-sources.html).

-## Documentation
+Build!
+======

-The [Qt 6 documentation](https://doc.qt.io/qt-6/index.html) covers the
-framework itself.
+Qt is built with CMake, and a typical
+`configure && cmake --build .` build process is used.

-## Report an issue
+If Ninja is installed, it is automatically chosen as CMake generator.

-Report bugs at [bugreports.qt.io](https://bugreports.qt.io/), following
-[these steps](https://doc.qt.io/qt-6/bughowto.html).
+Some relevant configure options (see configure -help):

-## Security
+* `-release` Compile and link Qt with debugging turned off.
+* `-debug` Compile and link Qt with debugging turned on.

-To report a security vulnerability in Qt, and to read what the Qt Project
-commits to in response, see [SECURITY.md](SECURITY.md).
+Example for a release build:

-## Contribute to Qt
+```
+./configure -prefix $PWD/qtbase
+cmake --build .
+```

-The Qt Project does not accept pull requests on GitHub. Every contribution goes
-through [Gerrit](https://codereview.qt-project.org), so read
-[how to contribute](CONTRIBUTING.md) before you push a change. All
-participation in the project is subject to our
-[code of conduct](CODE_OF_CONDUCT.md). To learn who decides what, and how
-someone becomes an approver or a maintainer, see
-[how the project is governed](GOVERNANCE.md).
-Development discussions happens in the open on the
-[Qt Project mailing lists](https://lists.qt-project.org/).
+Example for a developer build:
+(enables more autotests, builds debug version of libraries, ...)

-## License
+```
+./configure -developer-build
+cmake --build .
+```

-Qt is available under both commercial and open source licenses, and the terms
-depend on the module you use. [LICENSE](LICENSE) explains how licensing is
-declared across the Qt repositories and where to find the terms that apply to
-a given module.
+ See output of `./configure -help` for documentation on various options to
+ configure.

-For the full picture, see the
-[Qt licensing overview](https://doc.qt.io/qt-6/licensing.html) and
-[qt.io/licensing](https://www.qt.io/licensing/).
+ The above examples will build whatever Qt modules have been enabled
+ by default in the build system.
+
+ It is possible to build selected repositories with their dependencies by doing
+ a `ninja <repo-name>/all`.  For example, to build only qtdeclarative,
+ and the modules it depends on:
+
+```
+./configure
+ninja qtdeclarative/all
+```
+
+This can save a lot of time if you are only interested in a subset of Qt.
+
+
+Hints
+=====
+
+The submodule repository `qtrepotools` contains useful scripts for
+developers and release engineers. Consider adding qtrepotools/bin
+to your `PATH` environment variable to access them.
+
+
+Building Qt from git
+====================
+
+See http://wiki.qt.io/Building_Qt_6_from_Git and [README.git](README.git)
+for more information.
+See http://wiki.qt.io/Qt_6 for the reference platforms.
+
+
+Documentation
+=============
+
+After configuring and compiling Qt, building the documentation is possible by running
+
+```
+cmake --build . --target docs
+```
+
+After having built the documentation, you need to install it with the following
+command:
+
+```
+cmake --build . --target install_docs
+```
+
+The documentation is installed in the path specified with the
+configure argument `-docdir`.
+
+Information about Qt's documentation is located in qtbase/doc/README
+
+Note: Building the documentation is only tested on desktop platforms.
@@ -34,6 +34,6 @@ We welcome contributions to Qt! If you'd like to contribute, read the
 Qt is available under various licenses. For details, check out the
 [license documentation](https://doc.qt.io/qt-6/licensing.html).

-*Note that this README.md.template serves as a guideline for the README.md
-files of Qt module repositories, and that further sections can be added to
-individual README.md files if necessary.*
+*Note that this README.md.template serves as a guideline for README.md files,
+and that further sections can be added to individual README.md files if
+necessary.*
@@ -10,8 +10,7 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
 [[annotations]]
 path = ["coin/**", "cmake/**", "**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml",
        "coin/axivion/ci_config_linux.json",
-        "**.cfg", "**.plist", "**.pri", "**.prf", "configure.json",
-        "settings.gradle", "gradle/libs.versions.toml"]
+        "**.cfg", "**.plist", "**.pri", "**.prf", "configure.json"]
 precedence = "closest"
 comment = "build system"
 SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@@ -26,9 +25,7 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
 SPDX-License-Identifier = "BSD-3-Clause"

 [[annotations]]
-path = ["**README*", "CONTRIBUTING.md", "CODE_OF_CONDUCT.md", "GOVERNANCE.md",
-        "SECURITY.md", "CHANGELOG.md", "LICENSE",
-        ".commit-template", ".github/pull_request_template.md"]
+path = ["**README*", "CONTRIBUTING.md", ".commit-template", ".github/pull_request_template.md"]
 comment = "documentation"
 precedence = "closest"
 SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
@@ -1,42 +0,0 @@
-# Security policy
-
-## Reporting a vulnerability
-
-Report suspected security vulnerabilities in Qt by email to
-<security@qt-project.org>. Do not report them in the public bug tracker at
-bugreports.qt.io.
-
-If you hold a commercial license, you can instead report the issue to the Qt
-Company support team through the support portal, using the "Security Issues"
-category.
-
-## The policy
-
-[QUIP 15](https://contribute.qt-project.org/quips/15) is the Qt Project
-Security Policy. It is the authoritative source for how the project handles
-security issues, and it covers:
-
-* How reports are received, acknowledged, and triaged, and in what time frame.
-* Who is responsible for addressing an issue, and how it is escalated.
-* How issues are disclosed, including CVE handling and notification of
-  packagers.
-* Which versions of Qt fixes are guaranteed for.
-
-Security announcements are published to the
-[announce mailing list](https://lists.qt-project.org/listinfo/announce).
-
-Qt customers with a commercial license now have the opportunity to subscribe to
-the Qt Early Warning List in the [Customer Portal](https://account.qt.io/). The
-EWL subscription requires an active
-[Commercial Qt license](https://www.qt.io/development/qt-framework/commercial-qt).
-
-## Related material
-
-* [Security in Qt](https://doc.qt.io/qt-6/security.html) — what Qt does and
-  does not protect against, and how to use Qt securely.
-* [QUIP 23](https://contribute.qt-project.org/quips/23) — the `Qt-Security`
-  header that marks how security-relevant a source file is.
-* [QUIP 16](https://contribute.qt-project.org/quips/16) — the branch policy,
-  which governs which branches accept which changes.
-* [Responsible Vulnerability Disclosure Agreement](https://www.qt.io/terms-conditions/responsible-vulnerability-disclosure-process) -
-  Terms and Conditions of Responsible Vulnerability Disclosure Process at Qt Group.
@@ -104,9 +104,6 @@ AlignEscapedNewlines: Left
 # initializer list in list-initialization.
 SpaceBeforeCpp11BracedList: false

-# Do not reflow any comment
-ReflowComments: false
-
 ---
 # Use the Google-based style for .proto files.
 Language: Proto
@@ -5,37 +5,6 @@
 # with renamed functions, because we need similar logic for init-repository, but
 # we can't access qtbase before we clone it.

-function(qt_ir_print_to_stdout text)
-    set(tmp_candidates
-        "${CMAKE_CURRENT_BINARY_DIR}"
-        "$ENV{TMPDIR}"
-        "$ENV{TEMP}"
-        "/tmp"
-    )
-    set(tmp "")
-    foreach(dir IN LISTS tmp_candidates)
-        if(dir STREQUAL "")
-            continue()
-        endif()
-        set(candidate "${dir}/.qt_configure_stdout_tmp")
-        execute_process(
-            COMMAND "${CMAKE_COMMAND}" -E touch "${candidate}"
-            RESULT_VARIABLE touch_result
-        )
-        if(touch_result EQUAL 0)
-            set(tmp "${candidate}")
-            break()
-        endif()
-    endforeach()
-    if(tmp STREQUAL "")
-        message("${text}")  # last resort fallback (stderr)
-        return()
-    endif()
-    file(WRITE "${tmp}" "${text}")
-    execute_process(COMMAND "${CMAKE_COMMAND}" -E cat "${tmp}")
-    file(REMOVE "${tmp}")
-endfunction()
-
 # Call a function with the given arguments.
 function(qt_ir_call_function func)
    set(call_code "${func}(")
@@ -209,6 +178,7 @@ function(qt_ir_command_line_set_input name val)
 endfunction()

 # Appends a value of a command line option into a global property.
+# Currently unused
 function(qt_ir_command_line_append_input name val)
    if(NOT "${commandline_option_${name}_alias}" STREQUAL "")
        set(name "${commandline_option_${name}_alias}")
@@ -270,22 +240,6 @@ function(qt_ir_commandline_string arg val nextok)
    endif()
 endfunction()

-# Like string, but appends to the existing value instead of overwriting.
-# Allows repeated flags like: -skip qtwebengine -skip qtwebview
-function(qt_ir_commandline_addString arg val nextok)
-    if(nextok)
-        qt_ir_args_get_next_command_line_arg(val)
-
-        if("${val}" MATCHES "^-")
-            qt_ir_add_error("No value supplied to command line options '${arg}'.")
-        endif()
-    endif()
-    qt_ir_validate_value("${arg}" "${val}" success)
-    if(success)
-        qt_ir_command_line_append_input("${arg}" "${val}")
-    endif()
-endfunction()
-
 # Sets / handles the value of a command line void option.
 # This is an option like --force, which doesn't take any arguments.
 # Currently unused
@@ -325,7 +279,6 @@ endfunction()
 #
 # Currently handles the following types of CLI arguments:
 #  string
-#  addString (like string, but accumulates values from repeated flags)
 #  boolean
 #  void
 #
@@ -399,17 +352,16 @@ endfunction()

 # Shows help for the command line options.
 function(qt_ir_show_help)
-    set(help "")
    set(help_file "${CMAKE_CURRENT_LIST_DIR}/QtIRHelp.txt")
    if(EXISTS "${help_file}")
        file(READ "${help_file}" content)
-        string(APPEND help "${content}")
+        message("${content}")
    endif()
-    string(APPEND help [[
+
+    message([[
 General Options:
 -help, -h ............ Display this help screen
 ]])
-    qt_ir_print_to_stdout("${help}")
 endfunction()

 # Gets the unhandled command line args.
@@ -469,19 +421,3 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
    endif()
    set(${out_var} "${cmake_option}" PARENT_SCOPE)
 endfunction()
-
-# Get the value of a command line option as existing absolute path.
-# Yield error if the path does not exist.
-# Convert to absolute path if necessary.
-function(qt_ir_get_option_as_existing_absolute_path name value)
-    qt_ir_get_option_value("${name}" path)
-    if(NOT "${path}" STREQUAL "")
-        if(NOT EXISTS "${path}")
-            qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
-        endif()
-        if(NOT IS_ABSOLUTE "${path}")
-            get_filename_component(path "${path}" ABSOLUTE)
-        endif()
-    endif()
-    set("${value}" "${path}" PARENT_SCOPE)
-endfunction()
@@ -102,27 +102,18 @@ endfunction()
 # - ../qt/qttools-litehtml.git
 function(qt_ir_add_git_remotes repo_relative_url working_directory)
    set(gerrit_ssh_base "ssh://@[email protected]@PORT@/")
-    set(gerrit_https_base "https://@[email protected]@AUTH@/")
+    set(gerrit_repo_url "${gerrit_ssh_base}")

    qt_ir_get_option_value(codereview-username username)
-    qt_ir_get_option_value(codereview-https https)
-
-    if(https)
-        set(gerrit_repo_url "${gerrit_https_base}")
-    else()
-        set(gerrit_repo_url "${gerrit_ssh_base}")
-    endif()

    # If given a username, make a "verbose" remote.
    # Otherwise, rely on proper SSH configuration.
    if(username)
        string(REPLACE "@USER@" "${username}@" gerrit_repo_url "${gerrit_repo_url}")
        string(REPLACE "@PORT@" ":29418" gerrit_repo_url "${gerrit_repo_url}")
-        string(REPLACE "@AUTH@" "/a" gerrit_repo_url "${gerrit_repo_url}")
    else()
        string(REPLACE "@USER@" "" gerrit_repo_url "${gerrit_repo_url}")
        string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
-        string(REPLACE "@AUTH@" ""   gerrit_repo_url "${gerrit_repo_url}")
    endif()

    set(namespace "qt")
@@ -324,7 +315,7 @@ function(qt_ir_get_already_initialized_submodules prefix
    )

    qt_ir_parse_git_config_file_contents("${prefix}"
-        READ_GIT_CONFIG_LOCAL
+        READ_GIT_CONFIG
        PARENT_REPO_BASE_GIT_PATH "${parent_repo_base_git_path}"
        WORKING_DIRECTORY "${working_directory}"
    )
@@ -98,9 +98,6 @@ Options:
        username and port number, and thus relies on a correct SSH
        configuration.

-    --codereview-https
-        Specify this option to use HTTPs instead of SSH.
-
    --alternates <path to other Qt5 repo>
        Adds alternates for each submodule to another full qt5 checkout.
        This makes this qt5 checkout very small, as it will use the object
@@ -89,26 +89,6 @@ function(qt_ir_handle_called_from_configure top_level_src_path out_var_exit_reas

    qt_ir_validate_options_for_configure()

-    # Convert -skip values to module-subset exclusions so init-repository respects them.
-    qt_ir_get_option_value(skip skip_modules)
-    if(skip_modules)
-        string(REPLACE "," ";" skip_modules "${skip_modules}")
-        list(TRANSFORM skip_modules STRIP)
-        list(TRANSFORM skip_modules PREPEND "-")
-
-        qt_ir_get_option_value(module-subset existing_subset)
-        if(NOT existing_subset)
-            set(existing_subset "default")
-        endif()
-
-        list(APPEND skip_modules "${existing_subset}")
-        list(REMOVE_DUPLICATES skip_modules)
-        list(JOIN skip_modules "," merged_subset)
-
-        qt_ir_set_option_value(module-subset "${merged_subset}")
-        message(DEBUG "Preprocessed -skip option: module-subset is now: ${merged_subset}")
-    endif()
-
    # -init_submodules implies --force
    qt_ir_set_option_value(force TRUE)

@@ -130,11 +110,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
    set(extra_configure_args "")
    set(extra_cmake_args "")

-    # Collect modules to skip. These may come from:
-    # 1. The -skip option (consumed by init-repository's option parser)
-    # 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
-    qt_ir_get_option_value(skip skip_modules)
-
    # If the -submodules or --module-subset options were specified, transform
    # the values into something configure understands and pass them to configure.
    qt_ir_get_option_value(module-subset submodules)
@@ -142,7 +117,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        qt_ir_get_top_level_submodules(include_submodules exclude_submodules)
        if(NOT include_submodules AND arg_ALREADY_INITIALIZED)
            string(REPLACE "," ";" include_submodules "${submodules}")
-            list(FILTER include_submodules EXCLUDE REGEX "^$")
        endif()

        # qtrepotools is always implicitly cloned, but it doesn't actually
@@ -159,10 +133,25 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        endif()

        list(JOIN include_submodules "," include_submodules)
+        list(JOIN exclude_submodules "," exclude_submodules)

-        # Merge exclusions from module-subset into the skip list.
-        if(exclude_submodules)
-            list(APPEND skip_modules ${exclude_submodules})
+        # Handle case when the -skip argument is already passed.
+        # In that case read the passed values, merge with new ones,
+        # remove both the -skip and its values, and re-add it later.
+        list(FIND filtered_args "-skip" skip_index)
+        if(exclude_submodules AND skip_index GREATER -1)
+            list(LENGTH filtered_args filtered_args_length)
+            math(EXPR skip_args_index "${skip_index} + 1")
+
+            if(skip_args_index LESS filtered_args_length)
+                list(GET filtered_args "${skip_args_index}" skip_args)
+                string(REPLACE "," ";" skip_args "${skip_args}")
+                list(APPEND skip_args ${exclude_submodules})
+                list(REMOVE_DUPLICATES skip_args)
+                list(JOIN skip_args "," exclude_submodules)
+                list(REMOVE_AT filtered_args "${skip_args_index}")
+                list(REMOVE_AT filtered_args "${skip_index}")
+            endif()
        endif()

        # Handle case when only '-submodules existing' is passed and the
@@ -170,13 +159,9 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        if(include_submodules)
            list(APPEND extra_configure_args "-submodules" "${include_submodules}")
        endif()
-    endif()
-
-    # Forward all collected skip modules to configure.
-    if(skip_modules)
-        list(REMOVE_DUPLICATES skip_modules)
-        list(JOIN skip_modules "," skip_csv)
-        list(APPEND extra_configure_args "-skip" "${skip_csv}")
+        if(exclude_submodules)
+            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
+        endif()
    endif()

    # Insert the extra arguments into the proper positions before and after '--'.
@@ -310,7 +295,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
        "${working_directory}")

    # Get some additional options to pass down.
-    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
+    qt_ir_get_option_value(alternates alternates)
    qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)

    # The prefix for the cmake-style 'dictionary' that will be used by various functions.
@@ -14,7 +14,6 @@ macro(qt_ir_set_known_command_line_options)
    qt_ir_commandline_option(berlin TYPE boolean)
    qt_ir_commandline_option(branch TYPE boolean)
    qt_ir_commandline_option(codereview-username TYPE string)
-    qt_ir_commandline_option(codereview-https TYPE boolean)
    qt_ir_commandline_option(copy-objects TYPE boolean)
    qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
    qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)
@@ -38,7 +37,6 @@ macro(qt_ir_set_known_command_line_options)
    qt_ir_commandline_option(init-submodules TYPE boolean)
    # We alias qtbase's submodules option to init-repository module-subset.
    qt_ir_commandline_option(submodules ALIAS module-subset TYPE string)
-    qt_ir_commandline_option(skip TYPE addString)

    set_property(GLOBAL PROPERTY _qt_ir_known_command_line_options "${commandline_known_options}")
 endmacro()
@@ -60,7 +60,7 @@ endfunction()
 # Populates $out_module_list with all subdirectories that have a CMakeLists.txt file
 function(qt_internal_find_modules out_module_list)
    set(module_list "")
-    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" qt* tqtc-*)
+    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *)
    foreach(directory IN LISTS directories)
        if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${directory}"
           AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${directory}/CMakeLists.txt")
@@ -169,9 +169,6 @@ endfunction()
 # EXCLUDE_OPTIONAL_DEPS is a boolean that controls whether optional dependencies are excluded from
 # the final result.
 #
-# EXCLUDE_OPTIONAL_DEPS_VAR is an output variable where to save the list of optional dependencies
-# that were excluded due to EXCLUDE_OPTIONAL_DEPS.
-#
 # GITMODULES_PREFIX_VAR is the prefix of all the variables containing dependencies for the
 # PARSE_GITMODULES mode.
 # The function expects the following variables to be set in the parent scope
@@ -192,7 +189,7 @@ endfunction()
 function(qt_internal_resolve_module_dependencies module out_ordered out_revisions)
    set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED PARSE_GITMODULES
                EXCLUDE_OPTIONAL_DEPS)
-    set(oneValueArgs REVISION SKIPPED_VAR GITMODULES_PREFIX_VAR EXCLUDE_OPTIONAL_DEPS_VAR)
+    set(oneValueArgs REVISION SKIPPED_VAR GITMODULES_PREFIX_VAR)
    set(multiValueArgs PARSED_DEPENDENCIES SKIP_MODULES)
    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

@@ -234,12 +231,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
                        list(GET dependency_split 2 required)
                        if(required)
                            list(APPEND filtered_dependencies "${dependency}")
-                        elseif(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-                            # Add any potentially skipped dependency to the list and
-                            # filter out the required ones later
-                            list(GET dependency_split 0 dependency_name)
-                            list(APPEND ${arg_EXCLUDE_OPTIONAL_DEPS_VAR}
-                                "${dependency_name}")
                        endif()
                    endforeach()
                    set(dependencies "${filtered_dependencies}")
@@ -298,12 +289,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
            set(exclude_optional_deps "EXCLUDE_OPTIONAL_DEPS")
        endif()

-        set(exclude_optional_deps_var "")
-        if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-            set(exclude_optional_deps_var
-                EXCLUDE_OPTIONAL_DEPS_VAR "${arg_EXCLUDE_OPTIONAL_DEPS_VAR}")
-        endif()
-
        set(extra_options "")
        if(arg_SKIP_MODULES)
            list(APPEND extra_options SKIP_MODULES ${arg_SKIP_MODULES})
@@ -316,7 +301,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
            ${normalize_arg}
            ${parse_gitmodules}
            ${exclude_optional_deps}
-            ${exclude_optional_deps_var}
            GITMODULES_PREFIX_VAR ${arg_GITMODULES_PREFIX_VAR}
            ${extra_options}
        )
@@ -330,13 +314,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
    list(APPEND revisions ${arg_REVISION})
    set(${out_ordered} "${ordered}" PARENT_SCOPE)
    set(${out_revisions} "${revisions}" PARENT_SCOPE)
-    if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-        # Filter out all dependencies that were marked as required and remove any duplicates
-        list(REMOVE_DUPLICATES ${arg_EXCLUDE_OPTIONAL_DEPS_VAR})
-        list(REMOVE_ITEM ${arg_EXCLUDE_OPTIONAL_DEPS_VAR} ${ordered})
-        set(${arg_EXCLUDE_OPTIONAL_DEPS_VAR}
-            "${${arg_EXCLUDE_OPTIONAL_DEPS_VAR}}" PARENT_SCOPE)
-    endif()
 endfunction()

 # Resolves the dependencies of the given modules.
@@ -352,16 +329,12 @@ endfunction()
 # EXCLUDE_OPTIONAL_DEPS is a keyword argument that excludes optional dependencies from the result.
 # See qt_internal_resolve_module_dependencies for details.
 #
-# EXCLUDE_OPTIONAL_DEPS_VAR is an output variable where to save the list of optional dependencies
-# that were excluded due to EXCLUDE_OPTIONAL_DEPS.
-# See qt_internal_resolve_module_dependencies for details.
-#
 # SKIP_MODULES Modules that should be skipped from evaluation completely.
 #
 # See qt_internal_resolve_module_dependencies for side effects.
 function(qt_internal_sort_module_dependencies modules out_all_ordered)
    set(options PARSE_GITMODULES EXCLUDE_OPTIONAL_DEPS)
-    set(oneValueArgs GITMODULES_PREFIX_VAR EXCLUDE_OPTIONAL_DEPS_VAR)
+    set(oneValueArgs GITMODULES_PREFIX_VAR)
    set(multiValueArgs SKIP_MODULES)
    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})

@@ -375,12 +348,6 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
        set(exclude_optional_deps "EXCLUDE_OPTIONAL_DEPS")
    endif()

-    set(exclude_optional_deps_var "")
-    if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-        set(exclude_optional_deps_var
-            EXCLUDE_OPTIONAL_DEPS_VAR "${arg_EXCLUDE_OPTIONAL_DEPS_VAR}")
-    endif()
-
    # Create a fake repository "all_selected_repos" that has all repositories from the input as
    # required dependency. The format must match what qt_internal_parse_dependencies_yaml produces.
    set(all_selected_repos_as_parsed_dependencies)
@@ -397,7 +364,6 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
        PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
        NORMALIZE_REPO_NAME_IF_NEEDED
        ${exclude_optional_deps}
-        ${exclude_optional_deps_var}
        ${parse_gitmodules}
        GITMODULES_PREFIX_VAR ${arg_GITMODULES_PREFIX_VAR}
        ${extra_args}
@@ -411,10 +377,6 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
        "qt_internal_sort_module_dependencies
    input modules: ${modules}\n    topo-sorted:   ${ordered}")
    set(${out_all_ordered} "${ordered}" PARENT_SCOPE)
-    if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-        set(${arg_EXCLUDE_OPTIONAL_DEPS_VAR}
-                "${${arg_EXCLUDE_OPTIONAL_DEPS_VAR}}" PARENT_SCOPE)
-    endif()
 endfunction()

 # Checks whether any unparsed arguments have been passed to the function at the call site.
@@ -1386,7 +1348,7 @@ function(qt_internal_foreach_repo_run)

    set(color_supported FALSE)
    set(output_goes_where "")
-    if(NOT tty_exit_code AND tty_name)
+    if(NOT tty_exit_CODE AND tty_name)
        set(color_supported TRUE)
        set(output_goes_where "OUTPUT_FILE" "${tty_name}")
    endif()
@@ -1401,7 +1363,6 @@ function(qt_internal_foreach_repo_run)
        set(color "--red")
    endif()

-    set(failing_modules "")
    foreach(module IN LISTS modules)
        message("Entering '${module}'")
        execute_process(
@@ -1419,7 +1380,6 @@ function(qt_internal_foreach_repo_run)
                ${CMAKE_COMMAND} -E cmake_echo_color "${color}"
                "Process execution failed here ^^^^^^^^^^^^^^^^^^^^"
            )
-            list(APPEND failing_modules "${module}")
        else()
            math(EXPR count_success "${count_success}+1")
        endif()
@@ -1441,15 +1401,6 @@ function(qt_internal_foreach_repo_run)
            ${CMAKE_COMMAND} -E env CLICOLOR_FORCE=1
            ${CMAKE_COMMAND} -E cmake_echo_color "${color}" "${count_failure}"
    )
-    if(failing_modules)
-        list(JOIN failing_modules ", " failing_modules)
-        execute_process(
-            COMMAND
-                ${CMAKE_COMMAND} -E cmake_echo_color --normal
-                    "Failing submodules: ${failing_modules}"
-        )
-    endif()
-
    message("Successes: ${count_success}")
 endfunction()

@@ -1,29 +0,0 @@
-type: Group
-instructions:
-  - type: AppendToEnvironmentVariable
-    variableName: CTEST_ARGS
-    variableValue: " -V"
-
-  - type: AppendToEnvironmentVariable
-    variableName: CTEST_ARGS
-    variableValue: " --stop-on-failure"
-    enable_if:
-      condition: property
-      property: features
-      contains_value: AbortTestingOnFirstFailure
-
-  - type: AppendToEnvironmentVariable
-    variableName: CTEST_ARGS
-    variableValue: " --no-label-summary"
-
-  - type: Group
-    instructions:
-      - type: ExecuteCommand
-        command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"
-        executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-        ignoreExitCode: false
-        maxTimeInSeconds: 14400
-        maxTimeBetweenOutput: 14400
-        userMessageOnFailure: >
-          Failed to run tests.
-
@@ -52,7 +52,7 @@ disable_if:
  conditions:
    - condition: property
      property: target.osVersion
-      in_values: [HarmonyOS_ANY, Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
+      in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
    - condition: and
      conditions:
        - condition: property
@@ -1,34 +0,0 @@
-type: Group
-instructions:
-  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-
-  - type: SetBuildDirectory
-    directory: "{{.SourceDir}}/run_cmake_tests_build"
-  - type: MakeDirectory
-    directory: "{{.BuildDir}}"
-  - type: ChangeDirectory
-    directory: "{{.BuildDir}}"
-
-  - type: EnvironmentVariable
-    variableName: COIN_CMAKE_ARGS
-    variableValue: "{{.Env.CMAKE_ARGS}} {{.Env.COMMON_CMAKE_ARGS}}"
-  - type: EnvironmentVariable
-    variableName: CONFIGURE_ENV_PREFIX
-    variableValue: "{{.Env.ENV_PREFIX}}"
-
-    # Re-fetch the qlitehtml repository in the Coin git mirror, otherwise the
-    # RunCMake.InitRepository test might fail trying to checkout a newer sha1 than what is
-    # available in the Coin git mirror.
-  - type: UpdateRepo
-    gitRemote: code.qt.io
-    repos: [playground/qlitehtml.git]
-
-  - type: ExecuteCommand
-    command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake {{.SourceDir}}/tests/manual/RunCMake"
-    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to configure the RunCMake tests.
-
-  - !include "{{qt/qt5}}/cmake_run_ctest.yaml"
@@ -6,26 +6,7 @@ accept_configuration:

 instructions:
  Build:
-    - type: Group
-      instructions:
-        - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
-      enable_if:
-        condition: property
-        property: features
-        not_contains_value: "TopLevelRunCMakeTests"
-    - type: Group
-      instructions:
-        - !include "{{qt/qt5}}/coin_run_top_level_cmake_tests.yaml"
-      enable_if:
-        condition: property
-        property: features
-        contains_value: "TopLevelRunCMakeTests"
+    - !include "{{qt/qt5}}/coin_qt_build_template.yaml"

  Test:
-    - type: Group
-      instructions:
-        - !include "{{qt/qt5}}/coin_bic_tests.yaml"
-      enable_if:
-        condition: property
-        property: features
-        not_contains_value: "TopLevelRunCMakeTests"
+    - !include "{{qt/qt5}}/coin_bic_tests.yaml"
@@ -1,14 +1,12 @@
 Version: 2
 Configurations:
 -
-    Id: 'opensuse-16.0-host-asan'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
+    Id: 'opensuse-15.6-host-asan'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
    ]
@@ -1,8 +0,0 @@
-Version: 2
-Include: []
-Configurations:
-
-    Id: 'qttas-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['UseConfigure', 'Packaging', 'DisableTests']
@@ -1,9 +1,8 @@
 Version: 2
 Include: [
    cmake_platforms_qemu.yaml,
-    cmake_platforms_qemu_qnx.yaml,
+    cmake_platforms_qemu_qnx710.yaml,
    cmake_platforms_target_android.yaml,
-    cmake_platforms_target_harmonyos.yaml,
    cmake_platforms_wasm.yaml,
    macos.yaml
    ]
@@ -24,9 +23,7 @@ Configurations:
    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
    ]
 # Test on Ubuntu 22.04 X11
 -
@@ -44,46 +41,29 @@ Configurations:
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
    Id: 'ubuntu-24.04-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
    Environment variables: [
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
    ]
 -
    Id: 'ubuntu-24.04-arm64'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -no-feature-liburing -bundled-xcb-xinput -qpa offscreen\;xcb'
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
-        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
-# Test on Ubuntu 24.04 ARM64 Wayland
-
-    Id: 'ubuntu-24.04-arm64-developer-build-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-24.04-arm64-developer-build'
-
-    Id: 'ubuntu-24.04-arm64-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-24.04-arm64'
 # Test on Ubuntu 24.04 ARM64 offscreen
 -
    Id: 'ubuntu-24.04-arm64-offscreen-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: [
@@ -101,60 +81,62 @@ Configurations:
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
    Environment variables: [
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
    ]
 -
    Id: 'ubuntu-24.04-x64'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2']
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 # Test on Ubuntu 24.04 x64 X11
 -
    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
    Id: 'ubuntu-24.04-x64-x11-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-24.04-x64'
 -
-    Id: 'opensuse-16.0-developer-build'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
+    Id: 'opensuse-15.6-developer-build'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
    ]
 -
-    Id: 'sles-15_sp6-static'
-    Template: 'qtci-linux-SLES-15_SP6-x86_64-52'
+    Id: 'sles-15_sp5-static'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+    ]
+-
+    Id: 'sles-15_sp6-static'
+    Template: 'qtci-linux-SLES-15_SP6-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Environment variables: [
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
 -
    Id: 'windows-10_22h2-msvc2022'
@@ -166,171 +148,50 @@ Configurations:
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
    ]
 -
-    Id: 'windows-11_24H2-msvc2022'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-msvc2022'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
-
-    Id: 'windows-11_24H2-msvc2026'
-    Template: 'qtci-windows-11_24H2-x86_64-72'
-    Compiler: 'MSVC2026'
-    Features: ['Sccache', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
-
-    Id: 'windows-11_24H2-msvc2026-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-72'
-    Compiler: 'MSVC2026'
-    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
-        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
-    ]
-
-    Id: 'windows-11_24H2-msvc2026-arm64ec'
-    Template: 'qtci-windows-11_24H2-x86_64-72'
-    Compiler: 'MSVC2026'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'ARM64EC', 'TargetBuildOnly', 'DoNotRunTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24H2-msvc2026'
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64ec-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_FEATURE_qdoc=OFF -DFEATURE_qtwebengine_build=OFF -DFEATURE_qtpdf_build=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'windows-11_24H2-msvc2026-arm64ec-tests'
-    Template: 'qtci-windows-11_23H2-aarch64-54'
-    Compiler: 'MSVC2026'
-    Features: ['TestOnly', 'InsignificantTests']
-    Configure arguments: '-cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2026-arm64ec'
-
-    Id: 'windows-11_23h2-arm64-msvc2022'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Id: 'windows-11_22h2-arm64-msvc2022'
+    Template: 'qtci-windows-11_22H2-aarch64-55'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
    ]
 -
-    Id: 'windows-11_23h2-arm64-msvc2026'
-    Template: 'qtci-windows-11_23H2-aarch64-54'
-    Compiler: 'MSVC2026'
-    Features: ['Sccache', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
-
-    Id: 'windows-11_24H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-msvc2022-arm64'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'windows-11_23H2-msvc2022'
    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'OPENSSL_INCLUDE={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'OPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
-
-    Id: 'windows-11_24H2-msvc2026-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-72'
-    Compiler: 'MSVC2026'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw15'
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'OPENSSL_INCLUDE={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'OPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
-
-    Id: 'windows-11-x86_64-arm64-native-tests'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly', 'BuildTestsInTest', 'UseToolchainFromTargetDir']
-    Configure arguments: '-cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
+        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'windows-11-x86_64-arm64-tests-msvc2026'
-    Template: 'qtci-windows-11_23H2-aarch64-54'
-    Compiler: 'MSVC2026'
-    Features: ['TestOnly']
-    Configure arguments: '-cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2026-arm64'
-
-    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-msvc2022-developer-build'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
@@ -338,90 +199,44 @@ Configurations:
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
-    Id: 'rhel-9.6'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-8.10'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -no-feature-liburing -bundled-xcb-xinput'
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 -
-    Id: 'rhel-10.0'
-    Template: 'qtci-linux-RHEL-10.0-x86_64-51'
+    Id: 'rhel-9.4'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 -
-    Id: 'ios-device'
-    Template: 'qtci-macos-26-arm-105'
+    Id: 'ios-universal'
+    Template: 'qtci-macos-14-arm-106'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang -sdk iphoneos',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
    ]
 -
-    Id: 'ios-arm64-simulator'
-    Template: 'qtci-macos-26-arm-105'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang -sdk iphonesimulator',
-        'TARGET_CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="arm64"',
-        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
-    ]
-
-    Id: 'ios-x86_64-simulator'
-    Template: 'qtci-macos-26-arm-105'
-    Target os: 'IOS_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang -sdk iphonesimulator',
-        'TARGET_CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64"',
-        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
-    ]
-
-    Id: 'visionos-developer-build'
-    Template: 'qtci-macos-26-arm-105'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
-    ]
-
-    Id: 'windows-11_24h2-mingw15'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-10_22h2-mingw13'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -433,10 +248,10 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
    ]
 -
-    Id: 'windows-11_24H2-llvm'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-llvm'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'Clang'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
    Environment variables: [
        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
@@ -446,8 +261,8 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
    ]
 -
-    Id: 'windows-11_24H2-mingw15-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-mingw13-developer-build'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
@@ -464,7 +279,7 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
    Environment variables: [
-        'DEBIAN_RULES_REF=6.12_dev',
+        'DEBIAN_RULES_REF=6.9_dev',
        'COIN_TARGET_DIST=tqtc-jammy',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
        'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
@@ -477,7 +292,7 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
    Environment variables: [
-        'DEBIAN_RULES_REF=6.12_dev',
+        'DEBIAN_RULES_REF=6.9_dev',
        'COIN_TARGET_DIST=tqtc-jammy',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
        'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
@@ -490,10 +305,10 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
    Environment variables: [
-        'DEBIAN_RULES_REF=6.12_gles',
+        'DEBIAN_RULES_REF=6.9_gles',
        'COIN_TARGET_DIST=tqtc-bookworm',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
+        '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',
    ]
@@ -2,58 +2,52 @@ Version: 2
 Configurations:
 -
    Id: 'qemu-armv7-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-24.04-x64'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-linux-qt',
    ]
 -
    Id: 'qemu-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-24.04-x64'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
    ]
 -
    Id: 'qemu-mips64-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'mips64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-24.04-x64'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=mips64-linux-qt',
    ]
@@ -1,88 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'qnx-710-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-4.3.2/bin',
-        'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf 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=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'QNX_QEMU={{.Env.QNX_710_QEMU}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-qnx-qt',
-    ]
-
-    Id: 'qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-qnx-qt',
-    ]
-
-    Id: 'qnx-710-armv7-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-qnx-qt',
-    ]
-
-    Id: 'qnx-800-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_800'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-4.3.2/bin',
-        'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf 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=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'QNX_QEMU={{.Env.QNX_800_QEMU}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-qnx-qt',
-    ]
-
-    Id: 'qnx-800-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_800'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-qnx-qt',
-    ]
@@ -0,0 +1,47 @@
+Version: 2
+Configurations:
+-
+    Id: 'qnx-710-x86_64-developer-build-on-linux'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        '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'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+    ]
+-
+    Id: 'qnx-710-armv7-on-linux'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+    ]
@@ -10,24 +10,8 @@ Configurations:
    Platform dependency: 'ubuntu-22.04'
    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_3_VSB',
+        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-vxworks-qt',
-    ]
-
-    Id: 'vxworks-imx8-buildtest'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'ARMv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
-    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/nxp_imx8_1_0_7_1_VSB',
-        'TARGET_CONFIGURE_ARGS=-release -qpa offscreen -nomake examples',
        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
    ]
 -
@@ -42,7 +26,5 @@ Configurations:
    Environment variables: [
        'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-vxworks-qt',
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
    ]
@@ -10,13 +10,11 @@ Configurations:
    Platform dependency: 'vxworks-imx6-buildtest'
    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_3_VSB',
-        'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_3_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_3_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_3_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
+        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
+        'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-vxworks-qt',
-   ]
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
+    ]
 -
    Id: 'vxworks-x86_64-tests'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
@@ -25,12 +23,10 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-x86_64-buildtest'
-    Features: ['VMSize16', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
    Environment variables: [
        'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
        'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-vxworks-qt',
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DFEATURE_harfbuzz=no -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
    ]
@@ -2,60 +2,52 @@ Version: 2
 Configurations:

 -
-    Id: 'windows-11_24H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-msvc2022-minimal-static-test'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'MinimalStaticTests']
+    Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests']
    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
+    Template: 'qtci-windows-11_22H2-aarch64-55'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
+    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'rhel-9.6-minimal-static-test'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-8.10-minimal-static-test'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests']
    Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
    ]
 -
    Id: 'ubuntu-24.04-arm64'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
    Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release',
-        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release'
    ]

 -
    Id: 'macos-universal-on-x86_64-minimal-static-test'
-    Template: 'qtci-macos-15-x86_64-103'
+    Template: 'qtci-macos-14-x86_64-105'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
@@ -67,13 +59,13 @@ Configurations:

 -
    Id: 'macos-14-minimal-static-tests-x86_64'
-    Template: 'qtci-macos-14-x86_64-106'
+    Template: 'qtci-macos-14-x86_64-105'
    Compiler: 'Clang'
    Features: ['TestOnly', 'Packaging']
    Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
 -
    Id: 'macos-14-minimal-static-tests-arm64'
-    Template: 'qtci-macos-14-arm-108'
+    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
    Features: ['TestOnly', 'Packaging']
    Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
@@ -1,46 +1,38 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15_sp6-minimal-static'
-    Template: 'qtci-linux-SLES-15_SP6-x86_64-52'
+    Id: 'sles-15_sp5-minimal-static'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
    ]
 -
-    Id: 'windows-11_24H2-minimal-static'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'sles-15_sp6-minimal-static'
+    Template: 'qtci-linux-SLES-15_SP6-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
+    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Environment variables: [
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+    ]
+-
+    Id: 'windows-11_23H2-minimal-static'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
    Id: 'macos-minimal-static'
-    Template: 'qtci-macos-26-arm-105'
+    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
-
-
-    Id: "ios-minimal-static"
-    Template: 'qtci-macos-26-arm-105'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
-    ]
@@ -2,89 +2,65 @@ Version: 2
 Configurations:
 -
    Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-13-x86_64-103'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
    Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-10_22h2-mingw13'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
    Id: 'android-9-x86-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
+    Platform dependency: 'rhel-8.10'
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds
-        # without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
 -
-    Id: 'android-16-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'android-15-x86_64-on-linux'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
+    Platform dependency: 'rhel-8.10'
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_ANDROID_GRADLE_MULTI_MODULE only in one
-        # configuration, to ensure builds without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_ANDROID_GRADLE_MULTI_MODULE=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_36'
-    ]
-
-    Id: 'android-17-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_ANDROID_GRADLE_MULTI_MODULE only in one
-        # configuration, to ensure builds without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_ANDROID_GRADLE_MULTI_MODULE=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_37'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
+        'ANDROID_EMULATOR=emulator_x86_64_api_35'
    ]
+
@@ -1,50 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'harmonyos-23-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
-    Target os: 'HarmonyOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-24.04-x64'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -nomake examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
-        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
-    ]
-
-    Id: 'harmonyos-23-arm64-on-linux-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
-    Target os: 'HarmonyOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-24.04-x64-developer-build'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-developer-build -debug -make examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
-        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
-    ]
-
-    Id: 'harmonyos-23-arm64-on-macos'
-    Template: 'qtci-macos-26-arm-105'
-    Target os: 'HarmonyOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-developer-build -debug -make examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
-        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
-    ]
@@ -2,10 +2,10 @@ Version: 2
 Configurations:
 -
    Id: 'webassembly-linux-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
+    Platform dependency: 'opensuse-15.6-developer-build'
    Features: ['DoNotRunTests', 'UseConfigure']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -15,11 +15,11 @@ Configurations:
    ]
 -
    Id: 'webassembly-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-10_22h2-mingw13'
    Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -30,10 +30,10 @@ Configurations:
    ]
 -
    Id: 'webassembly-linux-thread'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
+    Platform dependency: 'opensuse-15.6-developer-build'
    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -43,10 +43,10 @@ Configurations:
    ]
 -
    Id: 'webassembly-linux-shared'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
+    Platform dependency: 'opensuse-15.6-developer-build'
    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -1,5 +1,10 @@
 Version: 2
 Configurations:
+-
+    Id: 'ubuntu-22.04-license-check'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheckV2']
 -
    Id: 'ubuntu-24.04-x64-license-check'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
@@ -17,6 +17,4 @@ Configurations:
          'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
          'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
-          'VCPKG_HOST_TRIPLET=x64-linux-qt',
-          'VCPKG_TARGET_TRIPLET=arm64-integrity-qt',
      ]
@@ -0,0 +1,14 @@
+Version: 2
+Configurations:
+-
+    Id: "ios-tests-on-macos"
+    Template: 'qtci-macos-14-arm-106'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-x86_64'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
+    ]
@@ -2,16 +2,16 @@ Version: 2
 Configurations:
 -
    Id: 'android-x86-developer-build-testrun-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
+    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS=',
        'ANDROID_EMULATOR=emulator_x86_api_28']
@@ -2,29 +2,27 @@ Version: 2
 Configurations:
 -
    Id: 'android-9-multi-abi'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'multi'
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: [
-        'rhel-9.6',
+        'rhel-8.10',
        'android-9-x86-on-linux',
-        'android-16-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
    ]
    Features: [
        'Sccache',
        'WarningsAreErrors',
        'AndroidTestRun',
        'MinimalAndroidMultiABITests',
-        'InstallDepsPerPlatformSubdir',
-        'InsignificantTests',
-        'DoNotAbortTestingOnFirstFailure'
+        'InstallDepsPerPlatformSubdir'
    ]
    Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6',
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
@@ -8,17 +8,27 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-26-arm-105'
+        Id: 'macos-universal-on-x86_64'
+        Template: 'qtci-macos-15-x86_64-103'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
-        Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
+        ]
+
+    -
+        Id: 'macos-universal-on-arm64'
+        Template: 'qtci-macos-14-arm-106'
+        Compiler: 'Clang'
+        Target arch: 'x86_64-arm64'
+        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
+        Environment variables: [
+            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
+            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
        ]

    # Test on all supported macOS versions (deployment targets)
@@ -26,43 +36,70 @@ Configurations:
    # On x86_64

    -
-        Id: 'macos-14-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-106'
+        Id: 'macos-13-x86_64-tests'
+        Template: 'qtci-macos-13-x86_64-103'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-14-x86_64-tests'
+        Template: 'qtci-macos-14-x86_64-105'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
    -
        Id: 'macos-15-x86_64-tests'
        Template: 'qtci-macos-15-x86_64-103'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-26-x86_64-tests'
-        Template: 'qtci-macos-26-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'

    # And arm64

    -
-        Id: 'macos-14-arm64-tests'
-        Template: 'qtci-macos-14-arm-108'
+        Id: 'macos-13-arm64-tests'
+        Template: 'qtci-macos-13-arm-107'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Features: ['TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+    -
+        Id: 'macos-14-arm64-tests'
+        Template: 'qtci-macos-14-arm-106'
+        Compiler: 'Clang'
+        Features: ['TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
    -
        Id: 'macos-15-arm64-tests'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+
+    # Test the universal packaging built on arm64
+
+    -
+        Id: 'macos-13-arm-on-arm64-tests'
+        Template: 'qtci-macos-13-arm-107'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
        Platform dependency: 'macos-universal-on-arm64'
    -
-        Id: 'macos-26-arm64-tests'
-        Template: 'qtci-macos-26-arm-105'
+        Id: 'macos-13-arm-on-x86_64-tests'
+        Template: 'qtci-macos-13-x86_64-103'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-universal-on-arm64'
+    -
+        Id: 'macos-14-arm-on-x86_64-tests'
+        Template: 'qtci-macos-14-x86_64-105'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-universal-on-arm64'
+    -
+        Id: 'macos-15-arm-on-x86_64-tests'
+        Template: 'qtci-macos-15-x86_64-103'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
        Platform dependency: 'macos-universal-on-arm64'

    # =========================================================================
@@ -72,57 +109,42 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-x86_64-developer-build'
-        Template: 'qtci-macos-26-x86_64-103'
+        Id: 'macos-14-x86_64-developer-build'
+        Template: 'qtci-macos-14-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'QTBASE_EXAMPLES_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=ON',
        ]
    -
-        Id: 'macos-arm64-developer-build'
-        Template: 'qtci-macos-15-arm-105'
+        Id: 'macos-14-arm64-developer-build'
+        Template: 'qtci-macos-14-arm-106'
        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
        Configure arguments: '-developer-build -nomake examples -debug -framework'
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
-        ]
-    -
-        Id: 'macos-26-arm64-developer-build'
-        Template: 'qtci-macos-26-arm-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -nomake examples -debug -framework'
-        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=arm64-osx-qt',
-            'VCPKG_TARGET_TRIPLET=arm64-osx-qt',
        ]

    # Test on all supported macOS versions (deployment targets)
    -
-        Id: 'macos-14-arm64-developer-build-tests'
-        Template: 'qtci-macos-14-arm-108'
+        Id: 'macos-13-arm64-developer-build-tests'
+        Template: 'qtci-macos-13-arm-107'
        Compiler: 'Clang'
        Features: ['TestOnly']
-        Platform dependency: 'macos-arm64-developer-build'
+        Platform dependency: 'macos-14-arm64-developer-build'
+    -
+        Id: 'macos-14-arm64-developer-build-tests'
+        Template: 'qtci-macos-14-arm-106'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
+        Platform dependency: 'macos-14-arm64-developer-build'
    -
        Id: 'macos-15-arm64-developer-build-tests'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-arm64-developer-build'
-    -
-        Id: 'macos-26-arm64-developer-build-tests'
-        Template: 'qtci-macos-26-arm-105'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-26-arm64-developer-build'
+        Features: ['TestOnly', 'InsignificantTests']
+        Platform dependency: 'macos-14-arm64-developer-build'
@@ -1,8 +0,0 @@
-Version: 2
-Module only: true
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-22.04"
-  ]
-]
-Configurations: []
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []
@@ -1,33 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux'
-    ]
-]
-Configurations: []
-# Android nightly to check for -qtnamespace errors/issues
-Overrides:
-
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
@@ -1,58 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6',
-        'windows-11_24h2-mingw15'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux',
-        'android-armv7-on-windows',
-        'android-arm64-on-macos'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
-# Android nightly to check for older (but still supported for the branch) NDKs
-Overrides:
-
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
-
-    Id: 'android-armv7-on-windows'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}'
-    ]
-
-    Id: 'android-arm64-on-macos'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}'
-    ]
@@ -1,58 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6',
-        'windows-11_24h2-mingw15'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux',
-        'android-armv7-on-windows',
-        'android-arm64-on-macos'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
-# Android nightly to check for older (but still supported for the branch) NDKs
-Overrides:
-
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
-
-    Id: 'android-armv7-on-windows'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}'
-    ]
-
-    Id: 'android-arm64-on-macos'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}'
-    ]
@@ -1,33 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-16-x86_64-on-linux',
-        'android-9-x86-on-linux'
-    ]
-]
-Configurations: []
-# Android nightly to check for preview NDKs (beta/RC or a newer NDK than the _LATEST used in CI)
-Overrides:
-
-    Id: 'android-16-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_PREVIEW}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_PREVIEW}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_PREVIEW}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_PREVIEW}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_PREVIEW}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_PREVIEW}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_PREVIEW}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_PREVIEW}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
@@ -1,11 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
-]
-Configurations: []
-Overrides:
-
-    Id: '.*'
-    +Features: ['BuildCMakeFromSources']
@@ -1,28 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'windows-11_24H2-msvc2022-developer-build-cxx23'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++23'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
-        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
-    ]
-# Test gcc-14 on Ubuntu 24.04 ARM64 Wayland
-
-    Id: 'ubuntu-24.04-arm64-gcc14-cxx23'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput -c++std c++23'
-    Environment variables: [
-        'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14',
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
-    ]
@@ -1,14 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'ubuntu-24.04-x64-examples-and-tests-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'NoSubmoduleDependencies']
-    Configure arguments: '-make examples -make tests'
-    Environment variables: [
-        'COMMON_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=OFF -DQT_GENERATE_SBOM=OFF',
-        'COMMON_NON_QTBASE_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=OFF -DQT_GENERATE_SBOM=OFF',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
-    ]
@@ -1,15 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-24.04-x64-developer-build"
-  ],
-  cmake_platforms_target_harmonyos.yaml: [
-    "harmonyos-23-arm64-on-linux-developer-build"
-  ]
-]
-Configurations: []
-Overrides:
-
-    Id: 'harmonyos-23-arm64-on-linux-developer-build'
-    -Features: ['DoNotRunTests']
@@ -1,15 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-24.04-x64"
-  ],
-  cmake_platforms_target_harmonyos.yaml: [
-    "harmonyos-23-arm64-on-linux"
-  ]
-]
-Configurations: []
-Overrides:
-
-    Id: 'harmonyos-23-arm64-on-linux'
-    -Features: ['DoNotRunTests']
@@ -1,14 +1,20 @@
 Version: 2
 Module only: True
+Configurations:
+-
+    Id: 'macos-15-arm64-developer-build'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -nomake examples -nomake tests'
+    Environment variables: [
+        # FIXME: macOS 15 ARM VMs have trouble attaching to test via lldb
+        'QTEST_DISABLE_STACK_DUMP=1'
+    ]

-# Please add nightly/beta configs to macos.yaml with the appropriate
-# COIN_CTEST_IGNORE_EXIT_CODE to make it insignificant.
-
-Include: [
-    macos.yaml: [
-        'macos-universal-on-arm64',
-        'macos-26-arm64-tests',
-        'macos-26-arm64-developer-build',
-        'macos-26-arm64-developer-build-tests'
-    ],
-]
+-
+    Id: 'macos-15-x86_64-developer-build'
+    Template: 'qtci-macos-15-x86_64-103'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -nomake examples -nomake tests'
@@ -1,14 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    'ubuntu-22.04'
-  ]
-]
-Configurations:
-
-    Id: 'ubuntu-22.04-Axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['UseConfigure', 'VMSize16', 'RunAsPlatformDependency', 'PysideAxivion']
-    Platform dependency: 'ubuntu-22.04'
@@ -1,18 +1,18 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'windows-11_24h2-mingw15'
+        windows-10_22h2-mingw13
    ]
 ]
 Configurations:
 -
    Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'Mingw'
    Target compiler: 'QCC'
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-10_22h2-mingw13'
    Features: ['DisableTests', 'UseConfigure']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -1,15 +1,13 @@
 Version: 2
 Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    'ubuntu-22.04'
-  ]
-]
 Configurations:
 -
-    Id: 'ubuntu-22.04-Axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Id: 'ubuntu-22.04-axivion'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['UseConfigure', 'VMSize16', 'TestOnly']
-    Environment variables: ['AXIVION_ANALYSIS=1']
-    Platform dependency: 'ubuntu-22.04'
+    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize8']
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
+    ]
@@ -1,28 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    'ubuntu-24.04-x64'
-  ]
-]
-Configurations:
-
-    Id: 'imx8-arm64-developer-build-2404'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
-    Target os: 'IMX8'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-24.04-x64'
-    Features: ['Elinux', 'Sccache', 'UseConfigure', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-      'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE=/opt/b2qt/imx8qm/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux-" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
-      'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE="/opt/b2qt/imx8qm/sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake" -DQT_FORCE_BUILD_TOOLS=ON -DQT_NO_PACKAGE_VERSION_INCOMPATIBLE_WARNING=TRUE',
-      'QT_YOCTO_ENVSETUP=/opt/b2qt/imx8qm/environment-setup-cortexa72-cortexa53-crypto-poky-linux',
-      'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
-      'QT_SYSROOT_FOR_RUNNING_TESTS=/opt/b2qt/imx8qm/sysroots/cortexa72-cortexa53-crypto-poky-linux',
-      'GST_PLUGIN_SCANNER=/opt/b2qt/imx8qm/sysroots/cortexa72-cortexa53-crypto-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
-      'QT_QUICK_BACKEND=software',
-      'VCPKG_HOST_TRIPLET=x64-linux-qt',
-      'VCPKG_TARGET_TRIPLET=arm64-linux-qt'
-    ]
-
@@ -1,9 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'ubuntu-24.04-x64-run-cmake-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'NoSubmoduleDependencies', 'TopLevelRunCMakeTests', 'DisableTests', 'VMSize16']
-    Configure arguments: ''
-    Environment variables: []
@@ -1,16 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-
-    Id: 'ubuntu-22.04-baseline-tests'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-developer-build -nomake examples'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_test_auto=OFF -DFEATURE_test_baseline=ON -DOpenGL_GL_PREFERENCE=LEGACY',
-        'CTEST_DIR=tests/baseline',
-        'TESTARGS=-auto',
-        'QT_LANCELOT_SERVER=10.150.153.60'
-    ]
-
@@ -1,57 +1,57 @@
 Version: 2
 Configurations:
 -
-    Id: 'windows-11_24H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Id: 'windows-11_23H2-msvc2022-unity-build'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] # note: we cannot build debug builds due to our llvm binaries
-    Configure arguments: '-force-debug-info -nomake examples -qt-zlib' # disabled example builds: qmake builds fail with C1041
+    Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
+    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'rhel-9.6-unity-build'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-8.10-unity-build'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Configure arguments: '-make examples -debug -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DQT_UNITY_BUILD=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 -
    Id: 'ubuntu-24.04-arm64-unity-build'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
+    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DQT_UNITY_BUILD=ON',
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 -
    Id: 'ubuntu-24.04-x64-unity-build'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DQT_UNITY_BUILD=ON',
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 -
    Id: 'macos-universal-on-arm64-unity-build'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -framework'
+    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework'
    Environment variables: [
        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_UNITY_BUILD=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON',
    ]
@@ -1,21 +0,0 @@
-Version: 2
-Configurations: []
-Include: [
-    cmake_platforms.yaml: [
-        'windows-11_24H2-msvc2022-developer-build',
-        'windows-11_24H2-mingw15-developer-build',
-        'windows-11_24H2-llvm'
-    ]
-]
-# Windows nightly to check for -qtnamespace errors/issues
-Overrides:
-
-    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Configure arguments: '-qtnamespace TestNamespace -debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
-
-    Id: 'windows-11_24H2-mingw15-developer-build'
-    Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
-
-    Id: 'windows-11_24H2-llvm'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-qtnamespace TestNamespace -release -force-debug-info -separate-debug-info -nomake examples'
@@ -5,10 +5,8 @@ Include: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
    "ubuntu-22.04-developer-build-x11-tests",
-    "ubuntu-24.04-x64",
-    "windows-11_24H2-msvc2022-developer-build",
-    "ios-device",
-    "documentation-warnings",
+    "windows-11_23H2-msvc2022-developer-build",
+    "ios-universal"
  ],
  macos.yaml: [
    "macos-arm64-developer-build",
@@ -20,7 +18,7 @@ Include: [
  cmake_platforms_qemu.yaml: [
    "qemu-armv7-developer-build"
  ],
-  cmake_platforms_qemu_qnx.yaml: [
+  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux"
  ]
 ]
@@ -10,7 +10,7 @@ Configurations:
    Compiler: 'Clang'
    Features: ['DisableTests']
 -
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['DisableTests']
 -
@@ -1,11 +0,0 @@
-Version: 2
-Module only: true
-Include: [
-    cmake_platforms.yaml: [
-        'windows-11_24H2-msvc2022'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
@@ -2,33 +2,33 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
    Configure arguments: ''
@@ -36,34 +36,21 @@ Configurations:
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
-
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
-    Configure arguments: ''
-    Environment variables: []
 -
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
-    Configure arguments: ''
-    Environment variables: []
-
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
-# Tests GCC 11
 -
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
+    Template: 'qtci-macos-14-arm-106'
+    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
@@ -1,9 +1,9 @@
 Version: 2
 Configurations:
-# Test gcc-12 on RHEL 9.6
+# Test gcc-12 on RHEL 9.4
 -
-    Id: 'rhel-9.6-gcc12'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-9.4-gcc12'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
@@ -15,7 +15,7 @@ Configurations:
 # Test gcc-14 on Ubuntu 24.04 ARM64 Wayland
 -
    Id: 'ubuntu-24.04-arm64-gcc14'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
@@ -3,14 +3,18 @@ Include: [
    cmake_platforms.yaml,
    cmake_platforms_static_tests.yaml,
    integrity.yaml,
+    ios-tests.yaml,
    address_sanitizer_platforms.yaml,
    linux_android_tests_multi_abi.yaml,
    wasm_qtbase_tests.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
    qtlite.yaml,
-    qtbase_new_compiler_testing.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    qtbase-new-compiler-testing.yaml
 ]
 Configurations: []
+Overrides:
+# Make VxWorks tests insignificant.
+-
+    Id: 'vxworks-x86_64-tests'
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
@@ -1,13 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "windows-quick-bridges"
-  ]
-]
-Configurations:
-
-    Id: 'windows-quick-bridges-csharp'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesCsharp']
@@ -1,46 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "linux-quick-bridges",
-     "windows-quick-bridges"
-     ]
-]
-
-Configurations:
-
-    Id: 'windows-quick-bridges-java'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
-
-
-    Id: 'windows-on-arm-quick-bridges-java'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
-
-
-    Id: 'linux-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
-
-
-    Id: 'linux-on-arm-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-    ]
-
-    Id: 'macos-quick-bridges-universal-java'
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
-    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-    ]
@@ -1,37 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "windows-quick-bridges"
-  ],
-  cmake_platforms.yaml: [
-     "rhel-9.6"
-  ]
-]
-Configurations:
-
-    Id: 'windows-quick-bridges-python'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
-
-    Id: 'linux-quick-bridges-python'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
-
-    Id: 'macos-quick-bridges-python'
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
-
-    Id: 'windows-on-arm-quick-bridges-python'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesPython']
@@ -1,29 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "linux-quick-bridges",
-     "macos-quick-bridges",
-     "windows-quick-bridges"
-  ]
-]
-Configurations:
-
-    Id: 'windows-quick-bridges-rust'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
-
-
-    Id: 'linux-quick-bridges-rust'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']
-
-
-    Id: 'macos-quick-bridges-rust'
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
@@ -1,28 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "linux-quick-bridges",
-     "windows-quick-bridges"
-  ]
-]
-Configurations:
-
-    Id: 'windows-quick-bridges-swift'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
-
-    Id: 'macos-quick-bridges-swift'
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
-
-
-    Id: 'linux-quick-bridges-swift'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
@@ -1,74 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "macos-quick-bridges",
-     "linux-quick-bridges",
-     "windows-quick-bridges"
-  ],
-  cmake_platforms.yaml: [
-     "rhel-9.6"
-  ]
-]
-Configurations:
-
-    Id: 'windows-quick-bridges-rust'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
-
-
-    Id: 'windows-quick-bridges-python'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
-
-    Id: 'windows-quick-bridges-java'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
-
-
-    Id: 'linux-quick-bridges-python'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
-
-    Id: 'linux-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
-
-
-    Id: 'linux-quick-bridges-rust'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
-    Compiler: 'GCC'
-    Platform dependency: 'linux-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']
-
-
-    Id: 'macos-quick-bridges-java'
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
-
-
-    Id: 'macos-quick-bridges-python'
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
-
-
-    Id: 'macos-quick-bridges-swift'
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
-    Platform dependency: 'macos-quick-bridges'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-]
-Configurations: []
@@ -14,7 +14,3 @@ Overrides:
 -
    Id: 'vxworks-x86_64-tests'
    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-# Remove imx8 tests.
-
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
@@ -2,14 +2,12 @@ Version: 2
 Include: [
    cmake_platforms.yaml,
    integrity.yaml,
+    ios-tests.yaml,
    address_sanitizer_platforms.yaml,
-    wasm_qtdeclarative_tests.yaml,
    cmake_platforms_static_tests.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    qtlite.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    qtlite.yaml
 ]
 Configurations: []
 Overrides:
@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-    ]
-Configurations: []
@@ -1,18 +0,0 @@
-Version: 2
-Include: []
-Configurations:
-
-    Id: 'qtgp-on-linux-rhel_9_6'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure']
-
-    Id: 'qtgp-on-macos'
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
-    Features: ['TestOnly']
-
-    Id: 'qtgp-on-windows-24h2'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly']
@@ -4,9 +4,7 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
 Overrides:
@@ -1,11 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux'
-    ]
-]
-Configurations: []
@@ -4,8 +4,6 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'ubuntu-24.04-x86-static-qtlite'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
    Configure arguments: >
@@ -195,8 +195,6 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=
         -DFEATURE_qdoc=off
-         -DFEATURE_quick3d_assimp=off
-         -DFEATURE_quick3dxr_openxr=off
         -DFEATURE_qml_animation=off
         -DFEATURE_qml_debug=off
         -DFEATURE_qml_jit=off
@@ -224,7 +222,7 @@ Configurations:
    ]
 -
    Id: 'ubuntu-24.04-x86-static-qtlite-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly','InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x86-static-qtlite'
@@ -6,8 +6,3 @@ Include: [
    address_sanitizer_platforms.yaml
    ]
 Configurations: []
-Overrides:
-# Remove imx8 tests.
-
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-  cmake_platforms.yaml,
-  address_sanitizer_platforms.yaml
-]
-Configurations: []
@@ -4,8 +4,7 @@ Include: [
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    address_sanitizer_platforms.yaml,
-    qtlite.yaml
+    address_sanitizer_platforms.yaml
 ]
 Configurations: []
 Overrides:
@@ -3,7 +3,6 @@ Include: [
    cmake_platforms.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    address_sanitizer_platforms.yaml,
-    quick-minimal.yaml
+    address_sanitizer_platforms.yaml
    ]
 Configurations: []
@@ -1,23 +1,24 @@
 Version: 2
 Include: [
  macos.yaml: [
-     "macos-universal-on-arm64"
+     "macos-universal-on-x86_64",
+     "macos-13-x86_64-tests",
+     "macos-13-arm-on-arm64-tests"
  ],
  cmake_platforms.yaml: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
-    "ubuntu-24.04-arm64",
-    "opensuse-16.0-developer-build",
+    "opensuse-15.6-developer-build",
+    "sles-15_sp5-static",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
-    "rhel-9.6",
-    "windows-11_24h2-mingw15",
-    "windows-11_24H2-mingw15-developer-build",
-    "windows-11_24H2-llvm",
-    "windows-11_24H2-msvc2022",
-    "windows-11_23h2-arm64-msvc2022"
+    "rhel-8.10",
+    "windows-10_22h2-mingw13",
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
+    "windows-11_22h2-arm64-msvc2022"
  ],
-  cmake_platforms_qemu_qnx.yaml: [
+  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
    "qnx-710-arm64-on-linux",
    "qnx-710-armv7-on-linux"
@@ -29,8 +30,7 @@ Include: [
    "qemu-arm64-developer-build",
    "qemu-armv7-developer-build",
    "qemu-mips64-developer-build"
-  ],
-  offline_documentation.yaml
+  ]
 ]
 Configurations:
 -
@@ -45,7 +45,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -1,36 +1,34 @@
 Version: 2
 Include: [
  macos.yaml: [
-     "macos-universal-on-arm64",
-     "macos-14-x86_64-tests",
-     "macos-14-arm64-tests"
+     "macos-universal-on-x86_64",
+     "macos-13-x86_64-tests",
+     "macos-13-arm-on-arm64-tests"
  ],
  cmake_platforms.yaml: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
-    "ubuntu-24.04-arm64",
-    "opensuse-16.0-developer-build",
+    "opensuse-15.6-developer-build",
+    "sles-15_sp5-static",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
-    "rhel-9.6",
-    "windows-11_24h2-mingw15",
-    "windows-11_24H2-mingw15-developer-build",
-    "windows-11_24H2-llvm",
-    "windows-11_24H2-msvc2022",
-    "windows-11_23h2-arm64-msvc2022"
+    "rhel-8.10",
+    "windows-10_22h2-mingw13",
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
+    "windows-11_22h2-arm64-msvc2022"
  ],
-  cmake_platforms_qemu_qnx.yaml: [
+  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
    "qnx-710-arm64-on-linux",
    "qnx-710-armv7-on-linux"
-  ],
-  offline_documentation.yaml
+  ]
 ]
 # Static build configurations for tools
 Configurations:
 -
-    Id: 'macos-latest-xcode-universal_Static'
-    Template: 'qtci-macos-15-arm-105'
+    Id: 'macos-latest-xcode-universal-static-build'
+    Template: 'qtci-macos-13-arm-107'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -39,8 +37,8 @@ Configurations:
        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
    ]
 -
-    Id: 'Linux-RHEL_9_6_Static'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'Linux-RHEL_8_10_Static'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
@@ -48,28 +46,6 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
    ]
-
-    Id: 'Ubuntu-24.04-arm64_Static'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
-
-    Id: 'Windows-MSVC2022-arm64_Static'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
    Id: 'Windows-MSVC2022_Static'
    Template: 'qtci-windows-10_22H2-x86_64-53'
@@ -4,8 +4,6 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
@@ -4,8 +4,6 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml
 ]
 Configurations: []
@@ -1,10 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml
-]
-Configurations: []
@@ -14,7 +14,3 @@ Overrides:
 -
    Id: 'vxworks-x86_64-tests'
    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-# Remove imx8 tests.
-
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
@@ -3,4 +3,18 @@ Include: [
    cmake_platforms.yaml,
    address_sanitizer_platforms.yaml
 ]
-Configurations: []
+Configurations:
+# Test on Ubuntu 24.04 ARM64 Wayland
+-
+    Id: 'ubuntu-24.04-arm64-developer-build-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-arm64-developer-build'
+# Test on Ubuntu 24.04 x64 Wayland
+-
+    Id: 'ubuntu-24.04-x64-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-x64'
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
+    address_sanitizer_platforms.yaml
 ]
 Configurations: []
@@ -1,9 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6',
-        'ubuntu-24.04-arm64',
-        'ubuntu-24.04-x64-developer-build'
-    ]
-]
-Configurations: []
--- a/Show More
+++ b/Show More