Update submodules on '6.12 in qt/qt5'

Change-Id: I60f6ddfec5cf90caf152e165def378126ea559c7 Reviewed-by: Qt Submodule Update Bot <[email protected]>
2026-10-09 00:27:21 +08:00 · 2026-08-18 08:17:03 +00:00 · 2026-08-13 21:00:01 +00:00 · 2026-08-12 05:29:24 +00:00 · 2026-08-07 11:51:18 +00:00 · 2026-08-07 11:51:05 +00:00
394 changed files with 1032 additions and 7251 deletions
@@ -3,5 +3,6 @@
 .gitattributes          export-ignore
 .commit-template        export-ignore eol=lf
 init-repository         export-ignore
+README.git              export-ignore
 *.bat                   text eol=crlf
 *.bat.in                text eol=crlf
@@ -1,54 +1,54 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.12
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.12
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.12
 	status = essential
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.12
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtshadertools qttasktree
+	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.12
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.12
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,234 +69,243 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.12
 	status = addon
+[submodule "qtwebengine"]
+	depends = qtdeclarative
+	recommends = qtwebchannel qttools qtpositioning
+	path = qtwebengine
+	url = ../qtwebengine.git
+	branch = 6.12
+	status = addon
+	priority = 10
 [submodule "qtwebview"]
 	depends = qtdeclarative
+	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative qtquicktimeline
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
-	status = preview
+	branch = 6.12
+	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.
@@ -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.*
@@ -26,9 +26,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.
-* [Coordinated Vulnerability Disclosure Policy](https://www.qt.io/terms-conditions/coordinated-vulnerability-disclosure-policy) -
-  Terms and Conditions of Coordinated Vulnerability Disclosure Policy at Qt Group.
@@ -21,9 +21,7 @@ ColumnLimit: 100
 # Disable reflow of some specific comments
 # qdoc comments: indentation rules are different.
 # Translation comments and SPDX license identifiers are also excluded.
-# REUSE-IgnoreStart
 CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
-# REUSE-IgnoreEnd

 # We want a space between the type and the star for pointer types.
 PointerBindsToType: false
@@ -181,7 +181,6 @@ function(qt_ir_clone_one_submodule submodule_name)
    set(oneValueArgs
        ALTERNATES
        BASE_URL
-        DEPTH
        WORKING_DIRECTORY
    )
    set(multiValueArgs "")
@@ -264,9 +263,6 @@ function(qt_ir_clone_one_submodule submodule_name)
        else()
            list(APPEND clone_args --no-checkout)
        endif()
-        if(arg_DEPTH)
-            list(APPEND clone_args --depth "${arg_DEPTH}")
-        endif()
        list(APPEND clone_args ${progress_args})
        qt_ir_execute_process_and_log_and_handle_error(
            COMMAND_ARGS git clone ${clone_args} "${mirror_or_original_url}" "${submodule_path}"
@@ -1067,7 +1063,6 @@ function(qt_ir_handle_init_submodules prefix)
    set(oneValueArgs
        ALTERNATES
        BASE_URL
-        DEPTH
        PARENT_REPO_BASE_GIT_PATH
        WORKING_DIRECTORY
    )
@@ -1128,7 +1123,6 @@ function(qt_ir_handle_init_submodules prefix)
        qt_ir_clone_one_submodule(${submodule_name}
            ALTERNATES ${arg_ALTERNATES}
            BASE_URL ${arg_BASE_URL}
-            DEPTH "${arg_DEPTH}"
            WORKING_DIRECTORY "${working_directory}"
            ${branch_flag}
            ${fetch_flag}
@@ -1169,7 +1163,6 @@ function(qt_ir_handle_init_submodules prefix)
                    SUBMODULES "all"

                    BASE_URL "${base_url}"
-                    DEPTH "${arg_DEPTH}"
                    PARENT_REPO_BASE_GIT_PATH "${submodule_base_git_path}"
                    WORKING_DIRECTORY "${working_directory}/${submodule_name}"

@@ -122,16 +122,6 @@ Options:

        Note that this negates the disk usage benefits gained from the use
        of `--alternates'.
-
-    --depth <n>
-        Creates a shallow clone with a history truncated to <n> commits for
-        each submodule that is cloned, by passing `--depth <n>' to `git
-        clone'. This also applies recursively to submodules of submodules
-        (e.g. qtwebengine's third-party dependencies).
-
-        This option only affects submodules that are freshly cloned; it has
-        no effect on already-cloned submodules that are merely updated or
-        fetched.
    --mirror <url-base>
        Uses <url-base> as the base URL for submodule git mirrors.

@@ -128,6 +128,7 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)

    set(filtered_args ${unknown_args})
    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)
@@ -148,10 +149,14 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        # have a CMakeLists.txt, so remove it.
        list(REMOVE_ITEM include_submodules "qtrepotools")

-        # Note: the submodules are turned on explicitly with -DBUILD_<module>=ON by configure's
-        # own handling of -submodules. Adding those arguments here as well would record them in
-        # config.opt, which is supposed to reflect the command line as it was given.
-        # See QTBUG-134948.
+        # Make sure to explicitly pass -DBUILD_<module>=ON, in case they were
+        # skipped before, otherwise configure might fail.
+        if(include_submodules)
+            set(explicit_build_submodules "${include_submodules}")
+            list(TRANSFORM explicit_build_submodules PREPEND "-DBUILD_")
+            list(TRANSFORM explicit_build_submodules APPEND "=ON")
+            list(APPEND extra_cmake_args ${explicit_build_submodules})
+        endif()

        list(JOIN include_submodules "," include_submodules)

@@ -174,15 +179,34 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        list(APPEND extra_configure_args "-skip" "${skip_csv}")
    endif()

-    # Insert the extra arguments, which are all configure arguments, so they have to go before
-    # a '--' if there is one.
-    if(extra_configure_args)
-        list(FIND filtered_args "--" cmake_args_index)
-        if(cmake_args_index EQUAL -1)
+    # Insert the extra arguments into the proper positions before and after '--'.
+    list(FIND filtered_args "--" cmake_args_index)
+
+    # -- is not found
+    if(cmake_args_index EQUAL -1)
+        # Append extra configure args if present
+        if(extra_configure_args)
            list(APPEND filtered_args ${extra_configure_args})
-        else()
+        endif()
+        # Append extra cmake args if present, but make sure to add -- first at the end
+        if(extra_cmake_args)
+            list(APPEND filtered_args "--")
+            list(APPEND filtered_args ${extra_cmake_args})
+        endif()
+    else()
+        # -- is found, that means we probably have cmake args
+        # Insert extra configure args if present, before the -- index.
+        if(extra_configure_args)
            list(INSERT filtered_args "${cmake_args_index}" ${extra_configure_args})
        endif()
+        # Find the -- index again, because it might have moved
+        list(FIND filtered_args "--" cmake_args_index)
+        # Compute the index of the argument after the --.
+        math(EXPR cmake_args_index "${cmake_args_index} + 1")
+        # Insert extra cmake args if present, after the -- index.
+        if(extra_cmake_args)
+            list(INSERT filtered_args "${cmake_args_index}" ${extra_cmake_args})
+        endif()
    endif()

    # Pass --help if it was requested.
@@ -288,7 +312,6 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
    # Get some additional options to pass down.
    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
    qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)
-    qt_ir_get_option_value(depth depth)

    # The prefix for the cmake-style 'dictionary' that will be used by various functions.
    set(prefix "ir_top")
@@ -298,7 +321,6 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
        ALTERNATES "${alternates}"
        ALREADY_INITIALIZED_SUBMODULES "${already_initialized_submodules}"
        BASE_URL "${base_url}"
-        DEPTH "${depth}"
        PARENT_REPO_BASE_GIT_PATH "${qt5_repo_name}"
        PROCESS_SUBMODULES_FROM_COMMAND_LINE
        WORKING_DIRECTORY "${working_directory}"
@@ -16,7 +16,6 @@ macro(qt_ir_set_known_command_line_options)
    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(depth TYPE string)
    qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
    qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)
    qt_ir_commandline_option(force-hooks TYPE boolean)
@@ -30,6 +30,3 @@ enable_if:
    - condition: property
      property: target.os
      equals_value: Linux
-    - condition: property
-      property: target.osVersion
-      not_equals_value: HarmonyOS_ANY
@@ -92,59 +92,6 @@ Configurations:
        'QT_QPA_PLATFORM=offscreen'
    ]
    Platform dependency: 'ubuntu-24.04-arm64'
-
-# Build on Ubuntu 26.04 ARM64 Wayland and test on offscreen and Wayland later
-
-    Id: 'ubuntu-26.04-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-26.04-aarch64-51'
-    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',
-    ]
-
-    Id: 'ubuntu-26.04-arm64'
-    Template: 'qtci-linux-Ubuntu-26.04-aarch64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', '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'
-    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',
-    ]
-# Test on Ubuntu 26.04 ARM64 Wayland
-
-    Id: 'ubuntu-26.04-arm64-developer-build-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-26.04-aarch64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-26.04-arm64-developer-build'
-
-    Id: 'ubuntu-26.04-arm64-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-26.04-aarch64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-26.04-arm64'
-# Test on Ubuntu 26.04 ARM64 offscreen
-
-    Id: 'ubuntu-26.04-arm64-offscreen-tests'
-    Template: 'qtci-linux-Ubuntu-26.04-aarch64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'QT_QPA_OFFSCREEN_NO_GLX=1',
-        'QT_QPA_PLATFORM=offscreen'
-    ]
-    Platform dependency: 'ubuntu-26.04-arm64'
-
 # Build on Ubuntu 24.04 x64 Wayland and test on both X11 and Wayland (Wayland=default)
 -
    Id: 'ubuntu-24.04-x64-developer-build'
@@ -158,20 +105,6 @@ Configurations:
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
    ]
-# Ubuntu 26.04 x64 Wayland
-
-    Id: 'ubuntu-26.04-x64-developer-build'
-    Template: 'qtci-linux-Ubuntu-26.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'VerboseCTestOutput', 'StandaloneExamples']
-    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',
-    ]
-# Ubuntu 24.04 x64 Wayland
 -
    Id: 'ubuntu-24.04-x64'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
@@ -185,20 +118,6 @@ Configurations:
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
    ]
-# Ubuntu 26.04 x64 Wayland
-
-    Id: 'ubuntu-26.04-x64'
-    Template: 'qtci-linux-Ubuntu-26.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'VerboseCTestOutput', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2']
-    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',
-    ]
 # Test on Ubuntu 24.04 x64 X11
 -
    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
@@ -350,7 +269,7 @@ Configurations:
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-11_24h2-mingw13'
    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',
@@ -371,7 +290,7 @@ Configurations:
    Compiler: 'MSVC2026'
    Target arch: 'arm64'
    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-11_24h2-mingw13'
    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',
@@ -439,7 +358,7 @@ Configurations:
    Id: 'rhel-10.0'
    Template: 'qtci-linux-RHEL-10.0-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
    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',
@@ -501,7 +420,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
    ]
 -
-    Id: 'windows-11_24h2-mingw15'
+    Id: 'windows-11_24h2-mingw13'
    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -527,7 +446,7 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
    ]
 -
-    Id: 'windows-11_24H2-mingw15-developer-build'
+    Id: 'windows-11_24H2-mingw13-developer-build'
    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
@@ -16,6 +16,8 @@ Configurations:
        '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'
@@ -33,6 +35,8 @@ Configurations:
        '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'
@@ -50,4 +54,6 @@ Configurations:
        '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',
    ]
@@ -55,7 +55,7 @@ Configurations:

 -
    Id: 'macos-universal-on-x86_64-minimal-static-test'
-    Template: 'qtci-macos-15-x86_64-104'
+    Template: 'qtci-macos-15-x86_64-103'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
@@ -10,7 +10,7 @@ Configurations:
    Platform dependency: 'macos-universal-on-arm64'
    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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -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}}'
@@ -22,11 +22,11 @@ Configurations:
    Target arch: 'armv7'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-11_24h2-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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -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}}'
@@ -41,7 +41,7 @@ Configurations:
    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
    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_CONFIGURE_ARGS=-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',
        # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds
@@ -51,7 +51,7 @@ Configurations:
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
 -
-    Id: 'android-17-x86_64-on-linux'
+    Id: 'android-16-x86_64-on-linux'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
@@ -60,12 +60,31 @@ Configurations:
    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
    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_CONFIGURE_ARGS=-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',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_ANDROID_GRADLE_MULTI_MODULE only in one
+        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_USE_ANDROID_MODERN_BUNDLE 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',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=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 -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_USE_ANDROID_MODERN_BUNDLE 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_USE_ANDROID_MODERN_BUNDLE=ON',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_37'
    ]
@@ -11,10 +11,10 @@ Configurations:
    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_CURRENT}}/sdk/default/openharmony -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',
+        '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={{.Env.HARMONYOS_SDK_ROOT_CURRENT}}/bin/hvigorw'
+        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
    ]
 -
    Id: 'harmonyos-23-arm64-on-linux-developer-build'
@@ -27,56 +27,8 @@ Configurations:
    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_CURRENT}}/sdk/default/openharmony -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        '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={{.Env.HARMONYOS_SDK_ROOT_CURRENT}}/bin/hvigorw'
-    ]
-
-    Id: 'harmonyos-26-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_NEXT}}/sdk/default/openharmony -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={{.Env.HARMONYOS_SDK_ROOT_NEXT}}/bin/hvigorw'
-    ]
-
-    Id: 'harmonyos-26-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_NEXT}}/sdk/default/openharmony -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={{.Env.HARMONYOS_SDK_ROOT_NEXT}}/bin/hvigorw'
-    ]
-
-    Id: 'harmonyos-23-arm64-on-macos-developer-build'
-    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_CURRENT}}/sdk/default/openharmony -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={{.Env.HARMONYOS_SDK_ROOT_CURRENT}}/bin/hvigorw'
+        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
    ]
@@ -19,7 +19,7 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-11_24h2-mingw13'
    Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -10,7 +10,7 @@ Configurations:
    Platform dependency: [
        'rhel-9.6',
        'android-9-x86-on-linux',
-        'android-17-x86_64-on-linux'
+        'android-16-x86_64-on-linux'
    ]
    Features: [
        'Sccache',
@@ -24,7 +24,7 @@ Configurations:
    Environment variables: [
        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6',
        '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-17-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
@@ -33,7 +33,7 @@ Configurations:
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-15-x86_64-tests'
-        Template: 'qtci-macos-15-x86_64-104'
+        Template: 'qtci-macos-15-x86_64-103'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
@@ -64,13 +64,6 @@ Configurations:
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-27-arm64-tests'
-        Template: 'qtci-macos-27-arm-101'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
-        Platform dependency: 'macos-universal-on-arm64'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]

    # =========================================================================
    # Developer build. Single architecture builds.
@@ -133,10 +126,3 @@ Configurations:
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-26-arm64-developer-build'
-    -
-        Id: 'macos-27-arm64-developer-build-tests'
-        Template: 'qtci-macos-27-arm-101'
-        Compiler: 'Clang'
-        Features: ['TestOnly', 'DoNotAbortTestingOnFirstFailure']
-        Platform dependency: 'macos-26-arm64-developer-build'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
@@ -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: []
@@ -4,7 +4,7 @@ Include: [
        'rhel-9.6'
    ],
    cmake_platforms_target_android.yaml: [
-        'android-17-x86_64-on-linux',
+        'android-15-x86_64-on-linux',
        'android-9-x86-on-linux'
    ]
 ]
@@ -12,14 +12,14 @@ Configurations: []
 # Android nightly to check for -qtnamespace errors/issues
 Overrides:
 -
-    Id: 'android-17-x86_64-on-linux'
+    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_37'
+        'ANDROID_EMULATOR=emulator_x86_64_api_35'
    ]
 -
    Id: 'android-9-x86-on-linux'
@@ -2,10 +2,10 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        'rhel-9.6',
-        'windows-11_24h2-mingw15'
+        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
-        'android-17-x86_64-on-linux',
+        'android-15-x86_64-on-linux',
        'android-9-x86-on-linux',
        'android-armv7-on-windows',
        'android-arm64-on-macos'
@@ -18,14 +18,14 @@ Configurations: []
 # Android nightly to check for older (but still supported for the branch) NDKs
 Overrides:
 -
-    Id: 'android-17-x86_64-on-linux'
+    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_37'
+        'ANDROID_EMULATOR=emulator_x86_64_api_35'
    ]
 -
    Id: 'android-9-x86-on-linux'
@@ -2,10 +2,10 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        'rhel-9.6',
-        'windows-11_24h2-mingw15'
+        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
-        'android-17-x86_64-on-linux',
+        'android-15-x86_64-on-linux',
        'android-9-x86-on-linux',
        'android-armv7-on-windows',
        'android-arm64-on-macos'
@@ -18,14 +18,14 @@ Configurations: []
 # Android nightly to check for older (but still supported for the branch) NDKs
 Overrides:
 -
-    Id: 'android-17-x86_64-on-linux'
+    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_37'
+        'ANDROID_EMULATOR=emulator_x86_64_api_35'
    ]
 -
    Id: 'android-9-x86-on-linux'
@@ -4,7 +4,7 @@ Include: [
        'rhel-9.6'
    ],
    cmake_platforms_target_android.yaml: [
-        'android-17-x86_64-on-linux',
+        'android-16-x86_64-on-linux',
        'android-9-x86-on-linux'
    ]
 ]
@@ -12,14 +12,14 @@ Configurations: []
 # Android nightly to check for preview NDKs (beta/RC or a newer NDK than the _LATEST used in CI)
 Overrides:
 -
-    Id: 'android-17-x86_64-on-linux'
+    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_37'
+        'ANDROID_EMULATOR=emulator_x86_64_api_35'
    ]
 -
    Id: 'android-9-x86-on-linux'
@@ -1,15 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  macos.yaml: [
-    "macos-universal-on-arm64"
-  ],
-  cmake_platforms_target_harmonyos.yaml: [
-    "harmonyos-23-arm64-on-macos-developer-build"
-  ]
-]
-Configurations: []
-Overrides:
-
-    Id: 'harmonyos-23-arm64-on-macos-developer-build'
-    -Features: ['DoNotRunTests']
@@ -1,25 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  macos.yaml: [
-    "macos-universal-on-arm64"
-  ]
-]
-
-Configurations:
-
-    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', 'StandaloneExamples']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -make examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
-        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT_CURRENT}}/sdk/default/openharmony -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={{.Env.HARMONYOS_SDK_ROOT_CURRENT}}/bin/hvigorw'
-    ]
@@ -1,24 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "ios-arm64-simulator"
-  ]
-]
-Configurations:
-
-    Id: 'ios-26-simulator-tests'
-    Template: 'qtci-macos-26-arm-105'
-    Compiler: 'Clang'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Platform dependency: 'ios-arm64-simulator'
-    Features: ['TestOnly', 'Insignificant', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-        'APPLE_SIMULATOR_DEVICE_TYPE=com.apple.CoreSimulator.SimDeviceType.iPad-Pro-13-inch-M4-8GB',
-    ]
-Overrides:
-
-    Id: 'ios-arm64-simulator'
-    -Features: ['DisableTests']
-    +Features: ['DoNotRunTests']
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'windows-11_24h2-mingw15'
+        'windows-11_24h2-mingw13'
    ]
 ]
 Configurations:
@@ -12,7 +12,7 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Mingw'
    Target compiler: 'QCC'
-    Platform dependency: 'windows-11_24h2-mingw15'
+    Platform dependency: 'windows-11_24h2-mingw13'
    Features: ['DisableTests', 'UseConfigure']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -22,5 +22,7 @@ Configurations:
      '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,14 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-
-    Id: 'ubuntu-24.04-lcov'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'lcov', 'VMSize8', 'DisableTests']
-    Configure arguments: '-developer-build -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'
-    ]
-
@@ -3,7 +3,7 @@ Configurations: []
 Include: [
    cmake_platforms.yaml: [
        'windows-11_24H2-msvc2022-developer-build',
-        'windows-11_24H2-mingw15-developer-build',
+        'windows-11_24H2-mingw13-developer-build',
        'windows-11_24H2-llvm'
    ]
 ]
@@ -13,7 +13,7 @@ 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'
+    Id: 'windows-11_24H2-mingw13-developer-build'
    Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
 -
    Id: 'windows-11_24H2-llvm'
@@ -21,7 +21,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-26-arm-105'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -55,7 +55,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-26-arm-105'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
@@ -5,7 +5,7 @@ Include: [
        'rhel-9.6'
    ],
    cmake_platforms_target_android.yaml: [
-        'android-17-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
    ]
 ]
 Configurations: []
@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-]
-Configurations: []
@@ -7,13 +7,12 @@ Include: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
    "ubuntu-24.04-arm64",
-    "ubuntu-24.04-x64",
    "opensuse-16.0-developer-build",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-9.6",
-    "windows-11_24h2-mingw15",
-    "windows-11_24H2-mingw15-developer-build",
+    "windows-11_24h2-mingw13",
+    "windows-11_24H2-mingw13-developer-build",
    "windows-11_24H2-llvm",
    "windows-11_24H2-msvc2022",
    "windows-11_23h2-arm64-msvc2022"
@@ -13,8 +13,8 @@ Include: [
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-9.6",
-    "windows-11_24h2-mingw15",
-    "windows-11_24H2-mingw15-developer-build",
+    "windows-11_24h2-mingw13",
+    "windows-11_24H2-mingw13-developer-build",
    "windows-11_24H2-llvm",
    "windows-11_24H2-msvc2022",
    "windows-11_23h2-arm64-msvc2022"
@@ -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: []
@@ -3,7 +3,7 @@ Include: [
    cmake_platforms.yaml: [
        "documentation-warnings",
        "rhel-9.6",
-        'windows-11_24h2-mingw15',
+        'windows-11_24h2-mingw13',
    ],
    macos.yaml: [
        'macos-universal-on-arm64'
@@ -12,7 +12,7 @@ Include: [
        'android-arm64-on-macos',
        'android-armv7-on-windows',
        'android-9-x86-on-linux',
-        'android-17-x86_64-on-linux'
+        'android-16-x86_64-on-linux'
    ],
    offline_documentation.yaml
 ]
@@ -1,17 +0,0 @@
-Version: 2
-Include: [
-    tqtc-qtmcp.yaml: [
-        'rhel-9.6-nohttp',
-        'windows-11_24H2-msvc2022-nohttp',
-        'windows-11_24h2-mingw15-nohttp',
-        'windows-11_24H2-llvm-nohttp',
-        'macos-universal-on-arm64-nohttp',
-        'macos-14-x86_64-tests-nohttp',
-        'macos-15-x86_64-tests-nohttp',
-        'macos-26-x86_64-tests-nohttp',
-        'macos-14-arm64-tests-nohttp',
-        'macos-15-arm64-tests-nohttp',
-        'macos-26-arm64-tests-nohttp'
-    ]
-]
-Configurations: []
@@ -5,137 +5,11 @@ Include: [
        'ubuntu-22.04-x11-tests',
        'ubuntu-24.04-x64',
        'ubuntu-24.04-x64-x11-tests',
-        'rhel-9.6',
-        'rhel-10.0',
-        'windows-11_24H2-msvc2022',
-        'windows-11_24H2-msvc2026',
-        'windows-11_24h2-mingw15',
-        'windows-11_24H2-llvm'
+        'windows-11_24H2-msvc2022'
    ],
    macos.yaml: [
-        'macos-universal-on-arm64',
-        'macos-14-x86_64-tests',
-        'macos-15-x86_64-tests',
-        'macos-26-x86_64-tests',
-        'macos-14-arm64-tests',
-        'macos-15-arm64-tests',
-        'macos-26-arm64-tests'
-   ]
+        'macos-arm64-developer-build',
+        'macos-14-arm64-developer-build-tests'
+    ]
 ]
-Overrides:
-
-    Id: 'rhel-(9\.6|10\.0)|windows-11_24H2-(msvc2022|llvm)|windows-11_24h2-mingw15|macos-universal-on-arm64|macos-(14|15|26)-(x86_64|arm64)-tests'
-    -Features: ['Packaging']
-
-Configurations:
-# RHEL 9.6
-
-    Id: 'rhel-9.6-nohttp'
-    Template: 'qtci-linux-RHEL-9.6-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'
-    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 -DQT_FEATURE_httpmcp=OFF',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
-    ]
-
-# Windows 11 MSVC 2022
-
-    Id: 'windows-11_24H2-msvc2022-nohttp'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    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 -DQT_FEATURE_httpmcp=OFF',
-        '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}}',
-    ]
-
-# Windows 11 MinGW 15
-
-    Id: 'windows-11_24h2-mingw15-nohttp'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DQT_FEATURE_httpmcp=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
-    ]
-
-# Windows 11 LLVM-MinGW
-
-    Id: 'windows-11_24H2-llvm-nohttp'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
-    Environment variables: [
-        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DQT_FEATURE_httpmcp=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
-    ]
-
-# macOS universal build, tested on all supported macOS versions
-
-    Id: 'macos-universal-on-arm64-nohttp'
-    Template: 'qtci-macos-26-arm-105'
-    Compiler: 'Clang'
-    Target arch: 'x86_64-arm64'
-    Features: ['Sccache', 'Packaging', '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 -DQT_FEATURE_httpmcp=OFF',
-        'VCPKG_HOST_TRIPLET=universal-osx-qt',
-        'VCPKG_TARGET_TRIPLET=universal-osx-qt',
-    ]
-
-    Id: 'macos-14-x86_64-tests-nohttp'
-    Template: 'qtci-macos-14-x86_64-106'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-arm64-nohttp'
-
-    Id: 'macos-15-x86_64-tests-nohttp'
-    Template: 'qtci-macos-15-x86_64-104'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-arm64-nohttp'
-
-    Id: 'macos-26-x86_64-tests-nohttp'
-    Template: 'qtci-macos-26-x86_64-103'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-arm64-nohttp'
-
-    Id: 'macos-14-arm64-tests-nohttp'
-    Template: 'qtci-macos-14-arm-108'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-arm64-nohttp'
-
-    Id: 'macos-15-arm64-tests-nohttp'
-    Template: 'qtci-macos-15-arm-105'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-arm64-nohttp'
-
-    Id: 'macos-26-arm64-tests-nohttp'
-    Template: 'qtci-macos-26-arm-105'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-arm64-nohttp'
+Configurations: []
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# Distribution-specific build settings.
-# For another distro/version, copy the bundle and change these values first.
-
-DISTRO_NAME="ubuntu"
-DISTRO_VERSION="26.04"
-ISO_PATH="/tmp/ubuntu-26.04.1-desktop-arm64.iso"
-# ISO_CHECKSUM_FILE="/tmp/SHA256SUMS"
-
-# Usually reusable without changes.
-IMAGE_PREFIX="qtci-linux"
-ARCH="aarch64"
-MINIMAL_INDEX="50"
-CUSTOM_INDEX="51"
-DISK_SIZE="500G"
-CPUS="8"
-MEMORY_MB="16184"
-SSH_USERNAME="qt"
-SSH_PASSWORD="$(cat /tmp/PASS)"
-
-PROJECT_DIR="/tmp/packer-linux"
-ARTIFACT_DIR="/tmp/output-linux-images"
@@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=build-config.sh
-source "${script_dir}/build-config.sh"
-
-image_base_name="${IMAGE_PREFIX}-${DISTRO_NAME}-${DISTRO_VERSION}-${ARCH}"
-image_50_name="${image_base_name}-${MINIMAL_INDEX}"
-image_51_name="${image_base_name}-${CUSTOM_INDEX}"
-image_50="${ARTIFACT_DIR}/${image_50_name}"
-image_51="${ARTIFACT_DIR}/${image_51_name}"
-image_50_vars="${ARTIFACT_DIR}/${image_50_name}_VARS.fd"
-image_51_vars="${ARTIFACT_DIR}/${image_51_name}_VARS.fd"
-image_51_seed="/tmp/${image_51_name}-seed.qcow2"
-stage_50_output="/tmp/packer-output-${MINIMAL_INDEX}"
-stage_51_output="/tmp/packer-output-${CUSTOM_INDEX}"
-template="linux-image.pkr.hcl"
-
-# Pass one source of configuration into Packer without duplicating distro and
-# version literals in HCL or a second variable file.
-export PKR_VAR_distro_name="$DISTRO_NAME"
-export PKR_VAR_distro_version="$DISTRO_VERSION"
-export PKR_VAR_image_prefix="$IMAGE_PREFIX"
-export PKR_VAR_arch="$ARCH"
-export PKR_VAR_minimal_index="$MINIMAL_INDEX"
-export PKR_VAR_custom_index="$CUSTOM_INDEX"
-export PKR_VAR_iso_path="$ISO_PATH"
-# export PKR_VAR_iso_checksum_file="$ISO_CHECKSUM_FILE"
-export PKR_VAR_project_dir="$PROJECT_DIR"
-export PKR_VAR_artifact_dir="$ARTIFACT_DIR"
-export PKR_VAR_disk_size="$DISK_SIZE"
-export PKR_VAR_cpus="$CPUS"
-export PKR_VAR_memory_mb="$MEMORY_MB"
-export PKR_VAR_ssh_username="$SSH_USERNAME"
-export PKR_VAR_ssh_password="$SSH_PASSWORD"
-
-if [[ "$script_dir" != "$PROJECT_DIR" ]]; then
-  echo "ERROR: Bundle is at '$script_dir', but PROJECT_DIR is '$PROJECT_DIR'." >&2
-  echo "Move/extract it there or update PROJECT_DIR in build-config.sh." >&2
-  exit 1
-fi
-
-for required_file in $ISO_PATH; do
-  if [[ ! -f "$required_file" ]]; then
-    echo "ERROR: Required file is missing: $required_file" >&2
-    exit 1
-  fi
-done
-
-# Stage 51 is always regenerated. Stage 50 is retained
-rm -rf "$stage_50_output" "$stage_51_output"
-rm -f "$image_51" "$image_51_seed"
-rm -f "${image_51}.sha256"
-
-packer init "$template"
-packer validate "$template"
-
-if [[ -f "$image_50" ]]; then
-  echo "Stage ${MINIMAL_INDEX}: existing image found:"
-  echo "  $image_50"
-  echo "Validating existing image before skipping the build..."
-
-  if ! qemu-img check "$image_50"; then
-    echo "ERROR: Existing stage-${MINIMAL_INDEX} image failed validation:" >&2
-    echo "  $image_50" >&2
-    echo "The image was not deleted or overwritten." >&2
-    echo "Remove it manually" >&2
-    exit 1
-  fi
-
-  echo "Stage ${MINIMAL_INDEX}: image is valid, skipping Packer build."
-  sha256sum "$image_50" > "${image_50}.sha256"
-
-else
-  echo "Stage ${MINIMAL_INDEX}: no existing image found, starting Packer."
-
-  PACKER_LOG=1 \
-  PACKER_LOG_PATH="/tmp/packer-stage-${MINIMAL_INDEX}.log" \
-  packer build -only=stage-50.qemu.stage_50 "$template"
-
-  qemu-img check "$image_50"
-  sha256sum "$image_50" > "${image_50}.sha256"
-fi
-
-echo "Creating independent stage-${CUSTOM_INDEX} seed..."
-qemu-img convert -p -f qcow2 -O qcow2 "$image_50" "$image_51_seed"
-qemu-img check "$image_51_seed"
-
-PACKER_LOG=1 \
-PACKER_LOG_PATH="/tmp/packer-stage-${CUSTOM_INDEX}.log" \
-packer build -only=stage-51.qemu.stage_51 "$template"
-
-qemu-img check "$image_51"
-sha256sum "$image_51" > "${image_51}.sha256"
-
-(
-  cd "$ARTIFACT_DIR"
-  sha256sum --check "$(basename "${image_50}.sha256")"
-)
-
-# Stage 50 may have been skipped because its image already existed. In that
-# case its temporary efivars.fd was removed at startup, so use a separate copy
-# of the Stage 51 variable store for the cloned image.
-stage_51_vars="${stage_51_output}/efivars.fd"
-if [[ ! -f "$stage_51_vars" ]]; then
-  echo "ERROR: Stage ${CUSTOM_INDEX} UEFI variable store is missing:" >&2
-  echo "  $stage_51_vars" >&2
-  exit 1
-fi
-
-if [[ -f "${stage_50_output}/efivars.fd" ]]; then
-  stage_50_vars="${stage_50_output}/efivars.fd"
-else
-  stage_50_vars="$stage_51_vars"
-  echo "Stage ${MINIMAL_INDEX} UEFI variable store was not retained; using a separate copy of:"
-  echo "  $stage_51_vars"
-fi
-
-cp "$stage_50_vars" "$image_50_vars"
-cp "$stage_51_vars" "$image_51_vars"
-
-rm -f "$image_51_seed"
-
-echo
-echo "Created independent images:"
-echo "  $image_50"
-echo "  $image_51"
-echo "UEFI variable stores:"
-echo "  $image_50_vars"
-echo "  $image_51_vars"
-echo "Checksums:"
-echo "  ${image_50}.sha256"
-echo "  ${image_51}.sha256"
@@ -1,2 +0,0 @@
-instance-id: qtci-ubuntu26-packer
-local-hostname: qtci-ubuntu26-arm64
@@ -1,22 +0,0 @@
-#cloud-config
-# This file is installer/distribution-specific. The generic HCL and wrapper can
-# be reused, but replace this file for a distro that does not use autoinstall.
-autoinstall:
-  version: 1
-  source:
-    id: ubuntu-desktop-minimal
-  locale: en_US.UTF-8
-  keyboard:
-    layout: us
-  timezone: UTC
-  identity:
-    hostname: qtci-ubuntu26-arm64
-    username: qt
-    password: "$6$qtciubuntu2604$FAeHIUtg1iOarKFnnDZim5fWEJ6ZaaYXSc360m68XFTqurIBWNBxsmUDKj.8mGJkVDKlWjFdKZLfrqHYhuBH8/"
-  ssh:
-    install-server: true
-    allow-pw: true
-  storage:
-    layout:
-      name: direct
-  shutdown: reboot
@@ -1,214 +0,0 @@
-packer {
-  required_version = ">= 1.14.0"
-
-  required_plugins {
-    qemu = {
-      version = "~> 1"
-      source  = "github.com/hashicorp/qemu"
-    }
-  }
-}
-
-variable "distro_name" {
-  type = string
-}
-variable "distro_version" {
-  type = string
-}
-variable "image_prefix" {
-  type = string
-}
-variable "arch" {
-  type = string
-}
-variable "minimal_index" {
-  type = string
-}
-variable "custom_index" {
-  type = string
-}
-variable "iso_path" {
-  type = string
-}
-variable "project_dir" {
-  type = string
-}
-variable "artifact_dir" {
-  type = string
-}
-variable "disk_size" {
-  type = string
-}
-variable "cpus" {
-  type = number
-}
-variable "memory_mb" {
-  type = number
-}
-variable "ssh_username" {
-  type = string
-}
-variable "ssh_password" {
-  type      = string
-  sensitive = true
-}
-
-locals {
-  image_base_name = "${var.image_prefix}-${var.distro_name}-${var.distro_version}-${var.arch}"
-  image_50_name   = "${local.image_base_name}-${var.minimal_index}"
-  image_51_name   = "${local.image_base_name}-${var.custom_index}"
-
-  image_50_path = "${var.artifact_dir}/${local.image_50_name}"
-  image_51_path = "${var.artifact_dir}/${local.image_51_name}"
-  image_51_seed = "/tmp/${local.image_51_name}-seed.qcow2"
-
-  stage_50_output = "/tmp/packer-output-${var.minimal_index}"
-  stage_51_output = "/tmp/packer-output-${var.custom_index}"
-}
-
-source "qemu" "stage_50" {
-  vm_name          = local.image_50_name
-  output_directory = local.stage_50_output
-
-  iso_url      = var.iso_path
-  iso_checksum = "none"
-
-  accelerator    = "kvm"
-  qemu_binary    = "qemu-system-aarch64"
-  machine_type      = "virt,gic-version=max"
-  efi_boot          = true
-  efi_firmware_code = "/usr/share/AAVMF/AAVMF_CODE.fd"
-  efi_firmware_vars = "/usr/share/AAVMF/AAVMF_VARS.fd"
-  qemuargs = [
-    ["-device", "ramfb"],
-    ["-device", "nec-usb-xhci,id=usb"],
-    ["-device", "usb-kbd,bus=usb.0"],
-    ["-monitor", "none"],
-    ["-serial", "file:/tmp/packer-stage-50-serial.log"]
-  ]
-  format         = "qcow2"
-  disk_size      = var.disk_size
-  disk_interface = "virtio"
-  net_device     = "virtio-net"
-
-  cpus   = var.cpus
-  memory = var.memory_mb
-
-  communicator           = "ssh"
-  ssh_username           = var.ssh_username
-  ssh_password           = var.ssh_password
-  ssh_timeout            = "60m"
-  ssh_handshake_attempts = 100
-
-  http_directory = "${var.project_dir}/http"
-  boot_wait      = "20s"
-
-  # This boot sequence is installer-family-specific. Replace it when adapting
-  # the bundle to a distro that does not use Ubuntu/Subiquity autoinstall.
-  boot_command = [
-    "<esc><wait>c<wait>",
-    "linux /casper/vmlinuz autoinstall ds=nocloud-net\\;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ console=ttyAMA0,115200n8 ---<enter><wait>",
-    "initrd /casper/initrd<enter><wait>",
-    "boot<enter>"
-  ]
-
-  headless         = true
-  vnc_bind_address = "0.0.0.0"
-  shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
-}
-
-source "qemu" "stage_51" {
-  vm_name          = local.image_51_name
-  output_directory = local.stage_51_output
-
-  # build-images.sh creates this independent seed from immutable image -50.
-  iso_url      = local.image_51_seed
-  iso_checksum = "none"
-  disk_image   = true
-
-  accelerator    = "kvm"
-  qemu_binary    = "qemu-system-aarch64"
-  machine_type      = "virt,gic-version=max"
-  efi_boot          = true
-  efi_firmware_code = "/usr/share/AAVMF/AAVMF_CODE.fd"
-  efi_firmware_vars = "/usr/share/AAVMF/AAVMF_VARS.fd"
-  qemuargs = [
-    ["-device", "ramfb"],
-    ["-device", "nec-usb-xhci,id=usb"],
-    ["-device", "usb-kbd,bus=usb.0"],
-    ["-monitor", "none"], # prevents Packer boot keystrokes from being interpreted as QEMU monitor commands.
-    ["-serial", "file:/tmp/packer-stage-51-serial.log"]
-  ]
-  format         = "qcow2"
-  disk_size      = var.disk_size
-  disk_interface = "virtio"
-  net_device     = "virtio-net"
-
-  cpus   = var.cpus
-  memory = var.memory_mb
-
-  communicator           = "ssh"
-  ssh_username           = var.ssh_username
-  ssh_password           = var.ssh_password
-  ssh_timeout            = "30m"
-  ssh_handshake_attempts = 100
-
-  headless         = true
-  vnc_bind_address = "0.0.0.0"
-  shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
-}
-
-build {
-  name    = "stage-50"
-  sources = ["source.qemu.stage_50"]
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/01-minimal-50.sh"
-  }
-
-  post-processor "shell-local" {
-    inline = [
-      "mkdir -p '${var.artifact_dir}'",
-      "rm -f '${local.image_50_path}'",
-      "mv '${local.stage_50_output}/${local.image_50_name}' '${local.image_50_path}'",
-      "qemu-img check '${local.image_50_path}'",
-      "qemu-img info '${local.image_50_path}'"
-    ]
-  }
-}
-
-build {
-  name    = "stage-51"
-  sources = ["source.qemu.stage_51"]
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/02-coin-configuration-51.sh"
-  }
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/03-gnome-configuration-51.sh"
-  }
-
-  provisioner "shell" {
-  execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-  script          = "${var.project_dir}/scripts/04-no-overview-extension-51.sh"
-  }
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/05-check-configurations-51.sh"
-  }
-
-  post-processor "shell-local" {
-    inline = [
-      "mkdir -p '${var.artifact_dir}'",
-      "rm -f '${local.image_51_path}'",
-      "mv '${local.stage_51_output}/${local.image_51_name}' '${local.image_51_path}'",
-      "qemu-img check '${local.image_51_path}'",
-      "qemu-img info '${local.image_51_path}'"
-    ]
-  }
-}
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-# This script is run on the minimal -50 image
-# Other scripts will be run on the -50 -> -51 cloned image
-
-readonly CI_USER="${CI_USER:-qt}"
-export DEBIAN_FRONTEND=noninteractive
-
-# Debian/Ubuntu implementation. Replace this script with the distro's package
-# manager commands when reusing the generic wrapper and HCL elsewhere.
-apt-get update
-apt-get -y full-upgrade
-apt-get install -y qemu-guest-agent
-systemctl enable qemu-guest-agent
-
-dpkg-query -W -f='${binary:Package}\t${Version}\n' \
-  > /var/tmp/qtci-minimal-image-packages.txt
-
-apt-get -y autoremove
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-
-qemu-ga --version
@@ -1,169 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-# Initial Coin configuration for the customized image (-51).
-
-readonly CI_USER="${CI_USER:-qt}"
-readonly GRUB_GFXMODE_VALUE="${GRUB_GFXMODE_VALUE:-1280x800}"
-
-export DEBIAN_FRONTEND=noninteractive
-
-log() {
-    printf '\n[51-coin-configuration] %s\n' "$*"
-}
-
-require_root() {
-    if [[ "${EUID}" -ne 0 ]]; then
-        echo "ERROR: This script must run as root." >&2
-        exit 1
-    fi
-}
-
-require_user() {
-    if ! id "$CI_USER" >/dev/null 2>&1; then
-        echo "ERROR: Required CI user does not exist: $CI_USER" >&2
-        exit 1
-    fi
-}
-
-require_root
-require_user
-
-log "Installing required base packages"
-apt-get update
-apt-get install -y \
-    openssh-server \
-    ufw
-
-# Remove GNOME welcome window at boot
-log "Removing gnome-initial-setup"
-apt-get purge -y gnome-initial-setup
-
-# No sudo PW
-log "Configuring passwordless sudo for ${CI_USER}"
-cat > "/etc/sudoers.d/${CI_USER}" <<EOF
-${CI_USER} ALL=(ALL) NOPASSWD: ALL
-EOF
-chmod 0440 "/etc/sudoers.d/${CI_USER}"
-visudo --check
-
-# UTC
-log "Setting the system timezone to UTC"
-timedatectl set-timezone UTC
-
-# Enable SSH
-log "Enabling SSH"
-# Current Ubuntu releases may use socket activation. Enabling both units is
-# harmless and keeps the image compatible with service- and socket-based SSH.
-systemctl enable ssh.service
-systemctl enable ssh.socket 2>/dev/null || true
-
-# Enable QEMU GA
-log "Enabling QEMU guest agent"
-systemctl enable qemu-guest-agent
-
-# Disable firewall
-log "Disabling UFW"
-ufw --force disable
-systemctl disable ufw.service 2>/dev/null || true
-
-# Set resolution
-log "Configuring GRUB graphics mode: ${GRUB_GFXMODE_VALUE}"
-if grep -qE '^GRUB_GFXMODE=' /etc/default/grub; then
-    sed -i "s/^GRUB_GFXMODE=.*/GRUB_GFXMODE=${GRUB_GFXMODE_VALUE}/" /etc/default/grub
-else
-    printf '\nGRUB_GFXMODE=%s\n' "$GRUB_GFXMODE_VALUE" >> /etc/default/grub
-fi
-update-grub
-
-# Disable auto upgrade/update
-log "Disabling periodic APT update checks"
-cat > /etc/apt/apt.conf.d/99-qtci-no-periodic-updates << EOF
-APT::Periodic "0";
-APT::Periodic::Update-Package-Lists "0";
-APT::Periodic::Download-Upgradeable-Packages "0";
-APT::Periodic::AutocleanInterval "0";
-APT::Periodic::Unattended-Upgrade "0";
-EOF
-
-sudo systemctl disable --now \
-    apt-daily.timer \
-    apt-daily-upgrade.timer
-
-sudo systemctl mask \
-    apt-daily.service \
-    apt-daily-upgrade.service \
-    apt-daily.timer \
-    apt-daily-upgrade.timer
-
-log "Disabling release-upgrade notifications"
-if [[ -f /etc/update-manager/release-upgrades ]]; then
-    if grep -qE '^Prompt=' /etc/update-manager/release-upgrades; then
-        sed -i 's/^Prompt=.*/Prompt=never/' \
-            /etc/update-manager/release-upgrades
-    else
-        printf '\nPrompt=never\n' >> /etc/update-manager/release-upgrades
-    fi
-fi
-
-# GDM Auto login
-log "Configuring GDM for ${CI_USER}"
-if [[ -d /etc/gdm3 ]]; then
-    gdm_config="/etc/gdm3/custom.conf"
-    touch "$gdm_config"
-
-    if ! grep -qE '^\[daemon\]' "$gdm_config"; then
-        printf '\n[daemon]\n' >> "$gdm_config"
-    fi
-    sed -i \
-        '/^AutomaticLoginEnable=/d; /^AutomaticLogin=/d; /^InitialSetupEnable=/d' \
-        "$gdm_config"
-    sed -i \
-        "/^\[daemon\]/a InitialSetupEnable=False\nAutomaticLogin=${CI_USER}\nAutomaticLoginEnable=True" \
-        "$gdm_config"
-else
-    log "GDM is not installed; skipping GDM configuration"
-fi
-
-# Run Coin-setup
-log "Downloading and running coin-setup"
-
-coin_setup_url="https://ci-files01-hki.ci.qt.io/input/linux/coin-setup-linux-arm64.zip"
-coin_setup_zip="/tmp/coin-setup-linux-arm64.zip"
-coin_setup_dir="/tmp/coin-setup-linux-arm64"
-coin_setup_binary="${coin_setup_dir}/coin-setup"
-
-rm -rf "$coin_setup_dir"
-rm -f "$coin_setup_zip"
-mkdir -p "$coin_setup_dir"
-
-wget --quiet --output-document="$coin_setup_zip" "$coin_setup_url"
-
-unzip -q "$coin_setup_zip" -d "$coin_setup_dir"
-
-if [[ ! -f "$coin_setup_binary" ]]; then
-    echo "ERROR: coin-setup binary was not found at ${coin_setup_binary}" >&2
-    echo "Archive contents:" >&2
-    unzip -l "$coin_setup_zip" >&2
-    exit 1
-fi
-
-chmod 0755 "$coin_setup_binary"
-
-sudo -H -u "$CI_USER" "$coin_setup_binary"
-
-rm -rf "$coin_setup_dir"
-rm -f "$coin_setup_zip"
-
-log "coin-setup completed successfully"
-
-# Clean apt
-log "Cleaning APT metadata"
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-
-log "Configuration completed successfully"
-echo "A reboot is required for all GRUB and login-manager changes to take effect."
@@ -1,150 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-readonly CI_USER="${CI_USER:-qt}"
-
-log() {
-    printf '\n[gnome-configuration] %s\n' "$*"
-}
-
-if [[ "$EUID" -ne 0 ]]; then
-    echo "ERROR: This script must run as root." >&2
-    exit 1
-fi
-
-if ! id "$CI_USER" >/dev/null 2>&1; then
-    echo "ERROR: User does not exist: $CI_USER" >&2
-    exit 1
-fi
-
-ci_home="$(getent passwd "$CI_USER" | cut -d: -f6)"
-
-if [[ -z "$ci_home" || ! -d "$ci_home" ]]; then
-    echo "ERROR: Cannot determine home directory for $CI_USER" >&2
-    exit 1
-fi
-
-log "Applying GNOME preferences for ${CI_USER}"
-
-# GNOME preferences are stored per user in the dconf database. Packer runs this
-# provisioner as root over SSH, without a graphical login or user D-Bus session.
-# Run gsettings as the CI user inside a temporary D-Bus session so the values
-# are written to the CI user's dconf database rather than root's configuration.
-
-sudo -H -u "$CI_USER" HOME="$ci_home" dbus-run-session -- bash <<'GNOME_SETTINGS'
-set -euo pipefail
-
-schema_exists() {
-    local schema="$1"
-
-    gsettings list-schemas |
-        grep -Fx "$schema" >/dev/null
-}
-
-key_exists() {
-    local schema="$1"
-    local key="$2"
-
-    gsettings list-keys "$schema" |
-        grep -Fx "$key" >/dev/null
-}
-
-set_setting() {
-    local schema="$1"
-    local key="$2"
-    local value="$3"
-
-    if ! schema_exists "$schema"; then
-        echo "ERROR: Missing GSettings schema: $schema" >&2
-        exit 1
-    fi
-
-    if ! key_exists "$schema" "$key"; then
-        echo "ERROR: Missing GSettings key: $schema $key" >&2
-        exit 1
-    fi
-
-    echo "Setting: $schema $key = $value"
-    gsettings set "$schema" "$key" "$value"
-
-    actual="$(gsettings get "$schema" "$key")"
-    echo "Result:  $schema $key = $actual"
-}
-
-set_setting \
-    org.gnome.desktop.notifications \
-    show-banners \
-    false
-
-set_setting \
-    org.gnome.desktop.notifications \
-    show-in-lock-screen \
-    false
-
-set_setting \
-    org.gnome.desktop.screensaver \
-    lock-enabled \
-    false
-
-if key_exists \
-    org.gnome.desktop.screensaver \
-    ubuntu-lock-on-suspend; then
-
-    set_setting \
-        org.gnome.desktop.screensaver \
-        ubuntu-lock-on-suspend \
-        false
-fi
-
-set_setting \
-    org.gnome.desktop.privacy \
-    remember-recent-files \
-    false
-
-rm -f "${XDG_DATA_HOME:-$HOME/.local/share}/recently-used.xbel"
-
-set_setting \
-    org.gnome.desktop.session \
-    idle-delay \
-    'uint32 0'
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-ac-type \
-    "'nothing'"
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-battery-type \
-    "'nothing'"
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-ac-timeout \
-    0
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-battery-timeout \
-    0
-
-set_setting \
-    org.gnome.shell.extensions.dash-to-dock \
-    dock-fixed \
-    true
-
-set_setting \
-    org.gnome.shell.extensions.dash-to-dock \
-    autohide \
-    false
-
-set_setting \
-    org.gnome.shell.extensions.dash-to-dock \
-    intellihide \
-    false
-GNOME_SETTINGS
-
-log "GNOME preferences applied successfully"
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-# Install no-overview gnome extension to prevent desktop overview at boot (QTBUG-132070)
-
-readonly CI_USER="${CI_USER:-qt}"
-readonly EXTENSION_UUID="no-overview@fthx"
-readonly EXTENSION_URL="https://ci-files01-hki.ci.qt.io/input/linux/no-overviewfthx.v23.shell-extension.zip" # GNOME <50
-readonly EXTENSION_ZIP="/tmp/${EXTENSION_UUID}.zip"
-readonly EXTENSION_DIR="/usr/share/gnome-shell/extensions/${EXTENSION_UUID}"
-
-if [[ "$EUID" -ne 0 ]]; then
-    echo "ERROR: This script must run as root." >&2
-    exit 1
-fi
-
-if ! id "$CI_USER" >/dev/null 2>&1; then
-    echo "ERROR: User does not exist: $CI_USER" >&2
-    exit 1
-fi
-
-ci_home="$(getent passwd "$CI_USER" | cut -d: -f6)"
-
-echo "Installing No Overview GNOME extension"
-
-wget --quiet --output-document="$EXTENSION_ZIP" "$EXTENSION_URL"
-
-install -d -o root -g root -m 0755 "$EXTENSION_DIR"
-
-unzip -q "$EXTENSION_ZIP" -d "$EXTENSION_DIR"
-
-chown -R root:root "$EXTENSION_DIR"
-find "$EXTENSION_DIR" -type d -exec chmod 0755 {} +
-find "$EXTENSION_DIR" -type f -exec chmod 0644 {} +
-
-# gnome-extensions writes the enabled state to the CI user's dconf database.
-# Packer runs over SSH without a user session, so provide a temporary D-Bus.
-sudo -H -u "$CI_USER" HOME="$ci_home" dbus-run-session -- gnome-extensions enable "$EXTENSION_UUID"
-
-rm -f "$EXTENSION_ZIP"
-
-echo "Installed and enabled: $EXTENSION_UUID"
-echo "After a reboot, check with: gnome-extensions list --enabled"
@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-failures=0
-
-pass() {
-    printf 'PASS: %s\n' "$1"
-}
-
-fail() {
-    printf 'FAIL: %s\n' "$1"
-    failures=$((failures + 1))
-}
-
-echo "=== Image -51 verification ==="
-
-# No PW prompt
-if sudo -n true 2>/dev/null; then
-    pass "passwordless sudo"
-else
-    fail "passwordless sudo"
-fi
-
-if sudo visudo --check >/dev/null 2>&1; then
-    pass "sudoers syntax"
-else
-    fail "sudoers syntax"
-fi
-
-# Timezone
-timezone="$(timedatectl show --property=Timezone --value)"
-
-if [[ "$timezone" == "UTC" || "$timezone" == "Etc/UTC" ]]; then
-    pass "timezone is UTC"
-else
-    fail "timezone is '$timezone', expected UTC"
-fi
-
-# SSH
-if dpkg-query -W -f='${db:Status-Abbrev}' openssh-server 2>/dev/null | grep -q '^ii'; then
-    pass "openssh-server installed"
-else
-    fail "openssh-server installed"
-fi
-
-if systemctl is-active --quiet ssh.socket || systemctl is-active --quiet ssh.service; then
-    pass "SSH listener active"
-else
-    fail "SSH listener active"
-fi
-
-if sudo ss -ltn |
-   grep -qE 'LISTEN.+:22[[:space:]]'; then
-    pass "TCP port 22 listening"
-else
-    fail "TCP port 22 listening"
-fi
-
-# QEMU GA
-if dpkg-query -W -f='${db:Status-Abbrev}' qemu-guest-agent 2>/dev/null | grep -q '^ii'; then
-    pass "qemu-guest-agent installed"
-else
-    fail "qemu-guest-agent installed"
-fi
-
-if systemctl is-enabled --quiet qemu-guest-agent; then
-    pass "qemu-guest-agent enabled"
-else
-    fail "qemu-guest-agent enabled"
-fi
-
-# UFW
-if sudo ufw status | grep -Fxq 'Status: inactive'; then
-    pass "UFW inactive"
-else
-    fail "UFW inactive"
-fi
-
-# Resolution
-if grep -Fxq 'GRUB_GFXMODE=1280x800' /etc/default/grub; then
-    pass "GRUB graphics mode"
-else
-    fail "GRUB graphics mode"
-fi
-
-# Auto update/upgrade disabled
-if apt-config dump | grep -i 'APT::Periodic \"0\";'; then
-    pass "APT periodic processing disabled"
-else
-    apt-config dump | grep -i APT::Periodic
-    fail "APT periodic processing enabled"
-fi
-
-if apt-config dump | grep -i 'APT::Periodic::Unattended-Upgrade \"0\";'; then
-    pass "APT unattended upgrades disabled"
-else
-    apt-config dump | grep -i APT::Periodic
-    fail "APT unattended upgrades enabled"
-fi
-
-if grep -Fxq 'Prompt=never' /etc/update-manager/release-upgrades; then
-    pass "release-upgrade notifications disabled"
-else
-    fail "release-upgrade notifications enabled"
-fi
-
-# Auto login
-if sudo grep -Fxq 'AutomaticLoginEnable=True' /etc/gdm3/custom.conf && sudo grep -Fxq 'AutomaticLogin=qt' /etc/gdm3/custom.conf; then
-    pass "GDM automatic login configured"
-else
-    fail "GDM automatic login configured"
-fi
-
-# Broken packages
-if [[ -z "$(sudo dpkg --audit)" ]]; then
-    pass "dpkg audit"
-else
-    fail "dpkg audit"
-fi
-
-# GNOME initial setup executable removed
-if [[ ! -x /usr/libexec/gnome-initial-setup ]]; then
-    pass "GNOME initial setup executable is absent"
-else
-    fail "/usr/libexec/gnome-initial-setup exists. There might be a welcome window popup"
-fi
-
-# Summary
-echo
-if (( failures == 0 )); then
-    echo "All conf checks passed."
-else
-    echo "${failures} check(s) failed."
-    # exit 1
-fi
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# Distribution-specific build settings.
-# For another distro/version, copy the bundle and change these values first.
-
-DISTRO_NAME="ubuntu"
-DISTRO_VERSION="26.04"
-ISO_PATH="/tmp/ubuntu-26.04-desktop-amd64.iso"
-# ISO_CHECKSUM_FILE="/tmp/SHA256SUMS"
-
-# Usually reusable without changes.
-IMAGE_PREFIX="qtci-linux"
-ARCH="x86_64"
-MINIMAL_INDEX="50"
-CUSTOM_INDEX="51"
-DISK_SIZE="500G"
-CPUS="8"
-MEMORY_MB="16184"
-SSH_USERNAME="qt"
-SSH_PASSWORD="$(cat /tmp/PASS)"
-
-PROJECT_DIR="/tmp/packer-linux"
-ARTIFACT_DIR="/tmp/output-linux-images"
@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
-# shellcheck source=build-config.sh
-source "${script_dir}/build-config.sh"
-
-image_base_name="${IMAGE_PREFIX}-${DISTRO_NAME}-${DISTRO_VERSION}-${ARCH}"
-image_50_name="${image_base_name}-${MINIMAL_INDEX}"
-image_51_name="${image_base_name}-${CUSTOM_INDEX}"
-image_50="${ARTIFACT_DIR}/${image_50_name}"
-image_51="${ARTIFACT_DIR}/${image_51_name}"
-image_51_seed="/tmp/${image_51_name}-seed.qcow2"
-stage_50_output="/tmp/packer-output-${MINIMAL_INDEX}"
-stage_51_output="/tmp/packer-output-${CUSTOM_INDEX}"
-template="linux-image.pkr.hcl"
-
-# Pass one source of configuration into Packer without duplicating distro and
-# version literals in HCL or a second variable file.
-export PKR_VAR_distro_name="$DISTRO_NAME"
-export PKR_VAR_distro_version="$DISTRO_VERSION"
-export PKR_VAR_image_prefix="$IMAGE_PREFIX"
-export PKR_VAR_arch="$ARCH"
-export PKR_VAR_minimal_index="$MINIMAL_INDEX"
-export PKR_VAR_custom_index="$CUSTOM_INDEX"
-export PKR_VAR_iso_path="$ISO_PATH"
-# export PKR_VAR_iso_checksum_file="$ISO_CHECKSUM_FILE"
-export PKR_VAR_project_dir="$PROJECT_DIR"
-export PKR_VAR_artifact_dir="$ARTIFACT_DIR"
-export PKR_VAR_disk_size="$DISK_SIZE"
-export PKR_VAR_cpus="$CPUS"
-export PKR_VAR_memory_mb="$MEMORY_MB"
-export PKR_VAR_ssh_username="$SSH_USERNAME"
-export PKR_VAR_ssh_password="$SSH_PASSWORD"
-
-if [[ "$script_dir" != "$PROJECT_DIR" ]]; then
-  echo "ERROR: Bundle is at '$script_dir', but PROJECT_DIR is '$PROJECT_DIR'." >&2
-  echo "Move/extract it there or update PROJECT_DIR in build-config.sh." >&2
-  exit 1
-fi
-
-for required_file in $ISO_PATH; do
-  if [[ ! -f "$required_file" ]]; then
-    echo "ERROR: Required file is missing: $required_file" >&2
-    exit 1
-  fi
-done
-
-# Stage 51 is always regenerated. Stage 50 is retained
-rm -rf "$stage_50_output" "$stage_51_output"
-rm -f "$image_51" "$image_51_seed"
-rm -f "${image_51}.sha256"
-
-packer init "$template"
-packer validate "$template"
-
-if [[ -f "$image_50" ]]; then
-  echo "Stage ${MINIMAL_INDEX}: existing image found:"
-  echo "  $image_50"
-  echo "Validating existing image before skipping the build..."
-
-  if ! qemu-img check "$image_50"; then
-    echo "ERROR: Existing stage-${MINIMAL_INDEX} image failed validation:" >&2
-    echo "  $image_50" >&2
-    echo "The image was not deleted or overwritten." >&2
-    echo "Remove it manually" >&2
-    exit 1
-  fi
-
-  echo "Stage ${MINIMAL_INDEX}: image is valid, skipping Packer build."
-  sha256sum "$image_50" > "${image_50}.sha256"
-
-else
-  echo "Stage ${MINIMAL_INDEX}: no existing image found, starting Packer."
-
-  PACKER_LOG=1 \
-  PACKER_LOG_PATH="/tmp/packer-stage-${MINIMAL_INDEX}.log" \
-  packer build -only=stage-50.qemu.stage_50 "$template"
-
-  qemu-img check "$image_50"
-  sha256sum "$image_50" > "${image_50}.sha256"
-fi
-
-echo "Creating independent stage-${CUSTOM_INDEX} seed..."
-qemu-img convert -p -f qcow2 -O qcow2 "$image_50" "$image_51_seed"
-qemu-img check "$image_51_seed"
-
-PACKER_LOG=1 \
-PACKER_LOG_PATH="/tmp/packer-stage-${CUSTOM_INDEX}.log" \
-packer build -only=stage-51.qemu.stage_51 "$template"
-
-qemu-img check "$image_51"
-sha256sum "$image_51" > "${image_51}.sha256"
-
-(
-  cd "$ARTIFACT_DIR"
-  sha256sum --check "$(basename "${image_50}.sha256")"
-)
-
-rm -f "$image_51_seed"
-
-echo
-echo "Created independent images:"
-echo "  $image_50"
-echo "  $image_51"
-echo "Checksums:"
-echo "  ${image_50}.sha256"
-echo "  ${image_51}.sha256"
@@ -1,2 +0,0 @@
-instance-id: qtci-ubuntu26-packer
-local-hostname: qtci-ubuntu26-x64
@@ -1,22 +0,0 @@
-#cloud-config
-# This file is installer/distribution-specific. The generic HCL and wrapper can
-# be reused, but replace this file for a distro that does not use autoinstall.
-autoinstall:
-  version: 1
-  source:
-    id: ubuntu-desktop-minimal
-  locale: en_US.UTF-8
-  keyboard:
-    layout: us
-  timezone: UTC
-  identity:
-    hostname: qtci-ubuntu26-x64
-    username: qt
-    password: "$6$qtciubuntu2604$FAeHIUtg1iOarKFnnDZim5fWEJ6ZaaYXSc360m68XFTqurIBWNBxsmUDKj.8mGJkVDKlWjFdKZLfrqHYhuBH8/"
-  ssh:
-    install-server: true
-    allow-pw: true
-  storage:
-    layout:
-      name: direct
-  shutdown: reboot
@@ -1,192 +0,0 @@
-packer {
-  required_version = ">= 1.14.0"
-
-  required_plugins {
-    qemu = {
-      version = "~> 1"
-      source  = "github.com/hashicorp/qemu"
-    }
-  }
-}
-
-variable "distro_name" {
-  type = string
-}
-variable "distro_version" {
-  type = string
-}
-variable "image_prefix" {
-  type = string
-}
-variable "arch" {
-  type = string
-}
-variable "minimal_index" {
-  type = string
-}
-variable "custom_index" {
-  type = string
-}
-variable "iso_path" {
-  type = string
-}
-variable "project_dir" {
-  type = string
-}
-variable "artifact_dir" {
-  type = string
-}
-variable "disk_size" {
-  type = string
-}
-variable "cpus" {
-  type = number
-}
-variable "memory_mb" {
-  type = number
-}
-variable "ssh_username" {
-  type = string
-}
-variable "ssh_password" {
-  type      = string
-  sensitive = true
-}
-
-locals {
-  image_base_name = "${var.image_prefix}-${var.distro_name}-${var.distro_version}-${var.arch}"
-  image_50_name   = "${local.image_base_name}-${var.minimal_index}"
-  image_51_name   = "${local.image_base_name}-${var.custom_index}"
-
-  image_50_path = "${var.artifact_dir}/${local.image_50_name}"
-  image_51_path = "${var.artifact_dir}/${local.image_51_name}"
-  image_51_seed = "/tmp/${local.image_51_name}-seed.qcow2"
-
-  stage_50_output = "/tmp/packer-output-${var.minimal_index}"
-  stage_51_output = "/tmp/packer-output-${var.custom_index}"
-}
-
-source "qemu" "stage_50" {
-  vm_name          = local.image_50_name
-  output_directory = local.stage_50_output
-
-  iso_url      = var.iso_path
-  iso_checksum = "none"
-
-  accelerator    = "kvm"
-  qemu_binary    = "qemu-system-x86_64"
-  format         = "qcow2"
-  disk_size      = var.disk_size
-  disk_interface = "virtio"
-  net_device     = "virtio-net"
-
-  cpus   = var.cpus
-  memory = var.memory_mb
-
-  communicator           = "ssh"
-  ssh_username           = var.ssh_username
-  ssh_password           = var.ssh_password
-  ssh_timeout            = "60m"
-  ssh_handshake_attempts = 100
-
-  http_directory = "${var.project_dir}/http"
-  boot_wait      = "10s"
-
-  # This boot sequence is installer-family-specific. Replace it when adapting
-  # the bundle to a distro that does not use Ubuntu/Subiquity autoinstall.
-  boot_command = [
-    "c<wait>",
-    "linux /casper/vmlinuz autoinstall ds=nocloud-net\\;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ ---<enter><wait>",
-    "initrd /casper/initrd<enter><wait>",
-    "boot<enter>"
-  ]
-
-  headless         = true
-  vnc_bind_address = "127.0.0.1"
-  shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
-}
-
-source "qemu" "stage_51" {
-  vm_name          = local.image_51_name
-  output_directory = local.stage_51_output
-
-  # build-images.sh creates this independent seed from immutable image -50.
-  iso_url      = local.image_51_seed
-  iso_checksum = "none"
-  disk_image   = true
-
-  accelerator    = "kvm"
-  qemu_binary    = "qemu-system-x86_64"
-  format         = "qcow2"
-  disk_size      = var.disk_size
-  disk_interface = "virtio"
-  net_device     = "virtio-net"
-
-  cpus   = var.cpus
-  memory = var.memory_mb
-
-  communicator           = "ssh"
-  ssh_username           = var.ssh_username
-  ssh_password           = var.ssh_password
-  ssh_timeout            = "30m"
-  ssh_handshake_attempts = 100
-
-  headless         = true
-  vnc_bind_address = "127.0.0.1"
-  shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
-}
-
-build {
-  name    = "stage-50"
-  sources = ["source.qemu.stage_50"]
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/01-minimal-50.sh"
-  }
-
-  post-processor "shell-local" {
-    inline = [
-      "mkdir -p '${var.artifact_dir}'",
-      "rm -f '${local.image_50_path}'",
-      "mv '${local.stage_50_output}/${local.image_50_name}' '${local.image_50_path}'",
-      "qemu-img check '${local.image_50_path}'",
-      "qemu-img info '${local.image_50_path}'"
-    ]
-  }
-}
-
-build {
-  name    = "stage-51"
-  sources = ["source.qemu.stage_51"]
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/02-coin-configuration-51.sh"
-  }
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/03-gnome-configuration-51.sh"
-  }
-
-  provisioner "shell" {
-  execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-  script          = "${var.project_dir}/scripts/04-no-overview-extension-51.sh"
-  }
-
-  provisioner "shell" {
-    execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E bash '{{ .Path }}'"
-    script          = "${var.project_dir}/scripts/05-check-configurations-51.sh"
-  }
-
-  post-processor "shell-local" {
-    inline = [
-      "mkdir -p '${var.artifact_dir}'",
-      "rm -f '${local.image_51_path}'",
-      "mv '${local.stage_51_output}/${local.image_51_name}' '${local.image_51_path}'",
-      "qemu-img check '${local.image_51_path}'",
-      "qemu-img info '${local.image_51_path}'"
-    ]
-  }
-}
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-# This script is run on the minimal -50 image
-# Other scripts will be run on the -50 -> -51 cloned image
-
-readonly CI_USER="${CI_USER:-qt}"
-export DEBIAN_FRONTEND=noninteractive
-
-# Debian/Ubuntu implementation. Replace this script with the distro's package
-# manager commands when reusing the generic wrapper and HCL elsewhere.
-apt-get update
-apt-get -y full-upgrade
-apt-get install -y qemu-guest-agent
-systemctl enable qemu-guest-agent
-
-dpkg-query -W -f='${binary:Package}\t${Version}\n' \
-  > /var/tmp/qtci-minimal-image-packages.txt
-
-apt-get -y autoremove
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-
-qemu-ga --version
@@ -1,169 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-# Initial Coin configuration for the customized image (-51).
-
-readonly CI_USER="${CI_USER:-qt}"
-readonly GRUB_GFXMODE_VALUE="${GRUB_GFXMODE_VALUE:-1280x800}"
-
-export DEBIAN_FRONTEND=noninteractive
-
-log() {
-    printf '\n[51-coin-configuration] %s\n' "$*"
-}
-
-require_root() {
-    if [[ "${EUID}" -ne 0 ]]; then
-        echo "ERROR: This script must run as root." >&2
-        exit 1
-    fi
-}
-
-require_user() {
-    if ! id "$CI_USER" >/dev/null 2>&1; then
-        echo "ERROR: Required CI user does not exist: $CI_USER" >&2
-        exit 1
-    fi
-}
-
-require_root
-require_user
-
-log "Installing required base packages"
-apt-get update
-apt-get install -y \
-    openssh-server \
-    ufw
-
-# Remove GNOME welcome window at boot
-log "Removing gnome-initial-setup"
-apt-get purge -y gnome-initial-setup
-
-# No sudo PW
-log "Configuring passwordless sudo for ${CI_USER}"
-cat > "/etc/sudoers.d/${CI_USER}" <<EOF
-${CI_USER} ALL=(ALL) NOPASSWD: ALL
-EOF
-chmod 0440 "/etc/sudoers.d/${CI_USER}"
-visudo --check
-
-# UTC
-log "Setting the system timezone to UTC"
-timedatectl set-timezone UTC
-
-# Enable SSH
-log "Enabling SSH"
-# Current Ubuntu releases may use socket activation. Enabling both units is
-# harmless and keeps the image compatible with service- and socket-based SSH.
-systemctl enable ssh.service
-systemctl enable ssh.socket 2>/dev/null || true
-
-# Enable QEMU GA
-log "Enabling QEMU guest agent"
-systemctl enable qemu-guest-agent
-
-# Disable firewall
-log "Disabling UFW"
-ufw --force disable
-systemctl disable ufw.service 2>/dev/null || true
-
-# Set resolution
-log "Configuring GRUB graphics mode: ${GRUB_GFXMODE_VALUE}"
-if grep -qE '^GRUB_GFXMODE=' /etc/default/grub; then
-    sed -i "s/^GRUB_GFXMODE=.*/GRUB_GFXMODE=${GRUB_GFXMODE_VALUE}/" /etc/default/grub
-else
-    printf '\nGRUB_GFXMODE=%s\n' "$GRUB_GFXMODE_VALUE" >> /etc/default/grub
-fi
-update-grub
-
-# Disable auto upgrade/update
-log "Disabling periodic APT update checks"
-cat > /etc/apt/apt.conf.d/99-qtci-no-periodic-updates << EOF
-APT::Periodic "0";
-APT::Periodic::Update-Package-Lists "0";
-APT::Periodic::Download-Upgradeable-Packages "0";
-APT::Periodic::AutocleanInterval "0";
-APT::Periodic::Unattended-Upgrade "0";
-EOF
-
-sudo systemctl disable --now \
-    apt-daily.timer \
-    apt-daily-upgrade.timer
-
-sudo systemctl mask \
-    apt-daily.service \
-    apt-daily-upgrade.service \
-    apt-daily.timer \
-    apt-daily-upgrade.timer
-
-log "Disabling release-upgrade notifications"
-if [[ -f /etc/update-manager/release-upgrades ]]; then
-    if grep -qE '^Prompt=' /etc/update-manager/release-upgrades; then
-        sed -i 's/^Prompt=.*/Prompt=never/' \
-            /etc/update-manager/release-upgrades
-    else
-        printf '\nPrompt=never\n' >> /etc/update-manager/release-upgrades
-    fi
-fi
-
-# GDM Auto login
-log "Configuring GDM for ${CI_USER}"
-if [[ -d /etc/gdm3 ]]; then
-    gdm_config="/etc/gdm3/custom.conf"
-    touch "$gdm_config"
-
-    if ! grep -qE '^\[daemon\]' "$gdm_config"; then
-        printf '\n[daemon]\n' >> "$gdm_config"
-    fi
-    sed -i \
-        '/^AutomaticLoginEnable=/d; /^AutomaticLogin=/d; /^InitialSetupEnable=/d' \
-        "$gdm_config"
-    sed -i \
-        "/^\[daemon\]/a InitialSetupEnable=False\nAutomaticLogin=${CI_USER}\nAutomaticLoginEnable=True" \
-        "$gdm_config"
-else
-    log "GDM is not installed; skipping GDM configuration"
-fi
-
-# Run Coin-setup
-log "Downloading and running coin-setup"
-
-coin_setup_url="https://ci-files01-hki.ci.qt.io/input/linux/coin-setup-linux-amd64.zip"
-coin_setup_zip="/tmp/coin-setup-linux-amd64.zip"
-coin_setup_dir="/tmp/coin-setup-linux-amd64"
-coin_setup_binary="${coin_setup_dir}/coin-setup"
-
-rm -rf "$coin_setup_dir"
-rm -f "$coin_setup_zip"
-mkdir -p "$coin_setup_dir"
-
-wget --quiet --output-document="$coin_setup_zip" "$coin_setup_url"
-
-unzip -q "$coin_setup_zip" -d "$coin_setup_dir"
-
-if [[ ! -f "$coin_setup_binary" ]]; then
-    echo "ERROR: coin-setup binary was not found at ${coin_setup_binary}" >&2
-    echo "Archive contents:" >&2
-    unzip -l "$coin_setup_zip" >&2
-    exit 1
-fi
-
-chmod 0755 "$coin_setup_binary"
-
-sudo -H -u "$CI_USER" "$coin_setup_binary"
-
-rm -rf "$coin_setup_dir"
-rm -f "$coin_setup_zip"
-
-log "coin-setup completed successfully"
-
-# Clean apt
-log "Cleaning APT metadata"
-apt-get clean
-rm -rf /var/lib/apt/lists/*
-
-log "Configuration completed successfully"
-echo "A reboot is required for all GRUB and login-manager changes to take effect."
@@ -1,150 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-readonly CI_USER="${CI_USER:-qt}"
-
-log() {
-    printf '\n[gnome-configuration] %s\n' "$*"
-}
-
-if [[ "$EUID" -ne 0 ]]; then
-    echo "ERROR: This script must run as root." >&2
-    exit 1
-fi
-
-if ! id "$CI_USER" >/dev/null 2>&1; then
-    echo "ERROR: User does not exist: $CI_USER" >&2
-    exit 1
-fi
-
-ci_home="$(getent passwd "$CI_USER" | cut -d: -f6)"
-
-if [[ -z "$ci_home" || ! -d "$ci_home" ]]; then
-    echo "ERROR: Cannot determine home directory for $CI_USER" >&2
-    exit 1
-fi
-
-log "Applying GNOME preferences for ${CI_USER}"
-
-# GNOME preferences are stored per user in the dconf database. Packer runs this
-# provisioner as root over SSH, without a graphical login or user D-Bus session.
-# Run gsettings as the CI user inside a temporary D-Bus session so the values
-# are written to the CI user's dconf database rather than root's configuration.
-
-sudo -H -u "$CI_USER" HOME="$ci_home" dbus-run-session -- bash <<'GNOME_SETTINGS'
-set -euo pipefail
-
-schema_exists() {
-    local schema="$1"
-
-    gsettings list-schemas |
-        grep -Fx "$schema" >/dev/null
-}
-
-key_exists() {
-    local schema="$1"
-    local key="$2"
-
-    gsettings list-keys "$schema" |
-        grep -Fx "$key" >/dev/null
-}
-
-set_setting() {
-    local schema="$1"
-    local key="$2"
-    local value="$3"
-
-    if ! schema_exists "$schema"; then
-        echo "ERROR: Missing GSettings schema: $schema" >&2
-        exit 1
-    fi
-
-    if ! key_exists "$schema" "$key"; then
-        echo "ERROR: Missing GSettings key: $schema $key" >&2
-        exit 1
-    fi
-
-    echo "Setting: $schema $key = $value"
-    gsettings set "$schema" "$key" "$value"
-
-    actual="$(gsettings get "$schema" "$key")"
-    echo "Result:  $schema $key = $actual"
-}
-
-set_setting \
-    org.gnome.desktop.notifications \
-    show-banners \
-    false
-
-set_setting \
-    org.gnome.desktop.notifications \
-    show-in-lock-screen \
-    false
-
-set_setting \
-    org.gnome.desktop.screensaver \
-    lock-enabled \
-    false
-
-if key_exists \
-    org.gnome.desktop.screensaver \
-    ubuntu-lock-on-suspend; then
-
-    set_setting \
-        org.gnome.desktop.screensaver \
-        ubuntu-lock-on-suspend \
-        false
-fi
-
-set_setting \
-    org.gnome.desktop.privacy \
-    remember-recent-files \
-    false
-
-rm -f "${XDG_DATA_HOME:-$HOME/.local/share}/recently-used.xbel"
-
-set_setting \
-    org.gnome.desktop.session \
-    idle-delay \
-    'uint32 0'
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-ac-type \
-    "'nothing'"
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-battery-type \
-    "'nothing'"
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-ac-timeout \
-    0
-
-set_setting \
-    org.gnome.settings-daemon.plugins.power \
-    sleep-inactive-battery-timeout \
-    0
-
-set_setting \
-    org.gnome.shell.extensions.dash-to-dock \
-    dock-fixed \
-    true
-
-set_setting \
-    org.gnome.shell.extensions.dash-to-dock \
-    autohide \
-    false
-
-set_setting \
-    org.gnome.shell.extensions.dash-to-dock \
-    intellihide \
-    false
-GNOME_SETTINGS
-
-log "GNOME preferences applied successfully"
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-# Install no-overview gnome extension to prevent desktop overview at boot (QTBUG-132070)
-
-readonly CI_USER="${CI_USER:-qt}"
-readonly EXTENSION_UUID="no-overview@fthx"
-readonly EXTENSION_URL="https://ci-files01-hki.ci.qt.io/input/linux/no-overviewfthx.v23.shell-extension.zip" # GNOME <50
-readonly EXTENSION_ZIP="/tmp/${EXTENSION_UUID}.zip"
-readonly EXTENSION_DIR="/usr/share/gnome-shell/extensions/${EXTENSION_UUID}"
-
-if [[ "$EUID" -ne 0 ]]; then
-    echo "ERROR: This script must run as root." >&2
-    exit 1
-fi
-
-if ! id "$CI_USER" >/dev/null 2>&1; then
-    echo "ERROR: User does not exist: $CI_USER" >&2
-    exit 1
-fi
-
-ci_home="$(getent passwd "$CI_USER" | cut -d: -f6)"
-
-echo "Installing No Overview GNOME extension"
-
-wget --quiet --output-document="$EXTENSION_ZIP" "$EXTENSION_URL"
-
-install -d -o root -g root -m 0755 "$EXTENSION_DIR"
-
-unzip -q "$EXTENSION_ZIP" -d "$EXTENSION_DIR"
-
-chown -R root:root "$EXTENSION_DIR"
-find "$EXTENSION_DIR" -type d -exec chmod 0755 {} +
-find "$EXTENSION_DIR" -type f -exec chmod 0644 {} +
-
-# gnome-extensions writes the enabled state to the CI user's dconf database.
-# Packer runs over SSH without a user session, so provide a temporary D-Bus.
-sudo -H -u "$CI_USER" HOME="$ci_home" dbus-run-session -- gnome-extensions enable "$EXTENSION_UUID"
-
-rm -f "$EXTENSION_ZIP"
-
-echo "Installed and enabled: $EXTENSION_UUID"
-echo "After a reboot, check with: gnome-extensions list --enabled"
@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -euo pipefail
-
-failures=0
-
-pass() {
-    printf 'PASS: %s\n' "$1"
-}
-
-fail() {
-    printf 'FAIL: %s\n' "$1"
-    failures=$((failures + 1))
-}
-
-echo "=== Image -51 verification ==="
-
-# No PW prompt
-if sudo -n true 2>/dev/null; then
-    pass "passwordless sudo"
-else
-    fail "passwordless sudo"
-fi
-
-if sudo visudo --check >/dev/null 2>&1; then
-    pass "sudoers syntax"
-else
-    fail "sudoers syntax"
-fi
-
-# Timezone
-timezone="$(timedatectl show --property=Timezone --value)"
-
-if [[ "$timezone" == "UTC" || "$timezone" == "Etc/UTC" ]]; then
-    pass "timezone is UTC"
-else
-    fail "timezone is '$timezone', expected UTC"
-fi
-
-# SSH
-if dpkg-query -W -f='${db:Status-Abbrev}' openssh-server 2>/dev/null | grep -q '^ii'; then
-    pass "openssh-server installed"
-else
-    fail "openssh-server installed"
-fi
-
-if systemctl is-active --quiet ssh.socket || systemctl is-active --quiet ssh.service; then
-    pass "SSH listener active"
-else
-    fail "SSH listener active"
-fi
-
-if sudo ss -ltn |
-   grep -qE 'LISTEN.+:22[[:space:]]'; then
-    pass "TCP port 22 listening"
-else
-    fail "TCP port 22 listening"
-fi
-
-# QEMU GA
-if dpkg-query -W -f='${db:Status-Abbrev}' qemu-guest-agent 2>/dev/null | grep -q '^ii'; then
-    pass "qemu-guest-agent installed"
-else
-    fail "qemu-guest-agent installed"
-fi
-
-if systemctl is-enabled --quiet qemu-guest-agent; then
-    pass "qemu-guest-agent enabled"
-else
-    fail "qemu-guest-agent enabled"
-fi
-
-# UFW
-if sudo ufw status | grep -Fxq 'Status: inactive'; then
-    pass "UFW inactive"
-else
-    fail "UFW inactive"
-fi
-
-# Resolution
-if grep -Fxq 'GRUB_GFXMODE=1280x800' /etc/default/grub; then
-    pass "GRUB graphics mode"
-else
-    fail "GRUB graphics mode"
-fi
-
-# Auto update/upgrade disabled
-if apt-config dump | grep -i 'APT::Periodic \"0\";'; then
-    pass "APT periodic processing disabled"
-else
-    apt-config dump | grep -i APT::Periodic
-    fail "APT periodic processing enabled"
-fi
-
-if apt-config dump | grep -i 'APT::Periodic::Unattended-Upgrade \"0\";'; then
-    pass "APT unattended upgrades disabled"
-else
-    apt-config dump | grep -i APT::Periodic
-    fail "APT unattended upgrades enabled"
-fi
-
-if grep -Fxq 'Prompt=never' /etc/update-manager/release-upgrades; then
-    pass "release-upgrade notifications disabled"
-else
-    fail "release-upgrade notifications enabled"
-fi
-
-# Auto login
-if sudo grep -Fxq 'AutomaticLoginEnable=True' /etc/gdm3/custom.conf && sudo grep -Fxq 'AutomaticLogin=qt' /etc/gdm3/custom.conf; then
-    pass "GDM automatic login configured"
-else
-    fail "GDM automatic login configured"
-fi
-
-# Broken packages
-if [[ -z "$(sudo dpkg --audit)" ]]; then
-    pass "dpkg audit"
-else
-    fail "dpkg audit"
-fi
-
-# GNOME initial setup executable removed
-if [[ ! -x /usr/libexec/gnome-initial-setup ]]; then
-    pass "GNOME initial setup executable is absent"
-else
-    fail "/usr/libexec/gnome-initial-setup exists. There might be a welcome window popup"
-fi
-
-# Summary
-echo
-if (( failures == 0 )); then
-    echo "All conf checks passed."
-else
-    echo "${failures} check(s) failed."
-    # exit 1
-fi
@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
 toolsVersion="19.0"
 toolsFile="commandlinetools-linux-13114758_latest.zip"
 toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
-sdkBuildToolsVersion="37.0.0"
-sdkApiLevel="android-37.0"
+sdkBuildToolsVersion="36.0.0"
+sdkApiLevel="android-36"
 toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70"

 ndkVersionLatest="r27c"
@@ -161,13 +161,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
 ./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
    | eval "$sdkmanager_no_progress_bar_cmd"

-echo "Download and unzip Android Emulator version 37.1.11"
-# See https://developer.android.com/studio/emulator_archive
-emulatorFileName="emulator-linux_x64-15917651.zip"
+echo "Download and unzip Android Emulator version 35.2.10"
+emulatorFileName="emulator-linux_x64-12414864.zip"
 emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
 emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
 emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
-emulatorSha1="1b1f78891abf8ec268264356e1365c25519e8379"
+emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10"
 DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
 echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
 sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
@@ -188,21 +187,36 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"

-echo "Download and unzip Android 17 (16KB Page Size) System Image"
-insignificantMaxVersionFileName="x86_64-ps16k-37.1_r07.zip"
+echo "Download and unzip Android 16 System Image"
+maxVersionFileName="x86_64-36_r07.zip"
+maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
+maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
+maxVersionCiUrl="$basePath/system_images/google_apis/$maxVersionFileName"
+maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
+maxVersionSha1="c6bf44bdcd885bb902b4ba752d111a073ad7a817"
+
+mkdir -p "$maxVersionDestination"
+DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
+
+echo "Unzipping the Android 16 to $maxVersionDestination"
+sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
+rm "$maxVersionFilePath"
+
+echo "Download and unzip Android 17 Beta 3 16KB System Image"
+insignificantMaxVersionFileName="x86_64-ps16k-37.0_r03.zip"
 insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-37/google_apis_ps16k/"
 insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
 insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
 insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionSha1="88e208a83a5f0b18958275b7c1a047e931395f3f"
+insignificantMaxVersionSha1="b89a6686f9a9e9942d596bed45d422cbccb70c98"

 mkdir -p "$insignificantMaxVersionDestination"
 DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"

-echo "Unzipping the Android 17 (16KB Page Size) to $insignificantMaxVersionDestination"
+echo "Unzipping the Android 17 Beta3 16KB to $insignificantMaxVersionDestination"
 sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
 # Hack to avoid SDK version bug in source.properties file, the usage of ".0" messes things for avdmanager. TODO: undo when official comes
-sudo sed -i 's/AndroidVersion.ApiLevel=37.1/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
+sudo sed -i 's/AndroidVersion.ApiLevel=37.0/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
 rm "$insignificantMaxVersionFilePath"

 echo "Checking the contents of Android SDK again..."
@@ -211,8 +225,11 @@ ls -l "$sdkTargetFolder"
 echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
    -k "system-images;android-28;google_apis;x86"

+echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
+    -k "system-images;android-36;google_apis;x86_64"
+
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_37 -c 2048M -f \
-    -k "system-images;android-37;google_apis,page_size_16kb;x86_64"
+    -k "system-images;android-37;google_apis,page_size_16kb,ai_glasses_compatible;x86_64"

 echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
 DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -e
-
-OS_STATE_DIR="/var/lib/qtciid"
-OS_STATE_FILE="$OS_STATE_DIR/os-version"
-
-get_os_id() {
-    if [[ -r /etc/os-release ]]; then
-        # shellcheck disable=SC1091
-        . /etc/os-release
-        # os-release contains ID of the distro (e.g. 'ubuntu')
-        # VERSION e.g. '24.04.1 LTS (Noble Numbat)'
-        if [[ -n "${ID:-}" && -n "${VERSION:-}" ]]; then
-            echo "${ID}:${VERSION}"
-            return 0
-        fi
-    fi
-
-    echo "unknown:unknown"
-    return 1
-}
-
-record_os_version() {
-    local os_id
-
-    os_id="$(get_os_id)"
-
-    if [[ "$os_id" == "unknown:unknown" ]]; then
-        echo "ERROR: Unable to determine OS version"
-        exit 1
-    fi
-
-    sudo mkdir -p "$OS_STATE_DIR"
-    echo "$os_id" | sudo tee "$OS_STATE_FILE" > /dev/null
-
-    echo "OS version: $os_id"
-}
-
-verify_os_version_unchanged() {
-    if [[ ! -f "$OS_STATE_FILE" ]]; then
-        echo "ERROR: OS version state file missing: $OS_STATE_FILE"
-        exit 1
-    fi
-
-    local start_version current_version
-
-    start_version="$(cat "$OS_STATE_FILE")"
-    current_version="$(get_os_id)"
-
-    if [[ "$current_version" == "unknown:unknown" ]]; then
-        echo "ERROR: Unable to determine current OS version"
-        exit 1
-    fi
-
-    if [[ "$start_version" != "$current_version" ]]; then
-        echo "ERROR: OS version changed during provisioning!"
-        echo "  Start version : $start_version"
-        echo "  End version   : $current_version"
-        exit 1
-    fi
-
-    echo "OS version unchanged ($current_version)"
-}
@@ -11,12 +11,8 @@ PROVISIONING_DIR="$(dirname "$0")/../.."
 # shellcheck source=../unix/common.sourced.sh
 source "$PROVISIONING_DIR/common/unix/common.sourced.sh"

-if [ -f /usr/lib/sysctl.d/55-ptrace.conf ]; then
-    f="/usr/lib/sysctl.d/55-ptrace.conf"  # New location in Ubuntu 26.04
-else
-    f="/etc/sysctl.d/10-ptrace.conf"
-fi

+f="/etc/sysctl.d/10-ptrace.conf"
 if [ -f $f ]
 then
    echo "Modifying $f ..."
@@ -16,42 +16,52 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 targetFolder="/opt/harmonyos"
 sdkTargetFolder="$targetFolder/command-line-tools"

+sudo mkdir -p "$sdkTargetFolder"
+
 basePath="http://ci-files01-hki.ci.qt.io/input/harmonyos"

-function InstallCommandLineTools() {
+toolsVersion="6.1.0.850"
+toolsFile="commandline-tools-linux-x64-6.1.0.850.zip"
+toolsSha1="6fdf7dbe0faddeb6a36cc76752faaf03d2abd462"

-    cltVersion=$1
-    cltSha1=$2
+toolsTargetFile="/tmp/$toolsFile"
+toolsSourceFile="$basePath/$toolsFile"

-    cltFile="commandline-tools-linux-x64-$cltVersion.zip"
-    cltTargetFile="/tmp/$cltFile"
-    cltSourceFile="$basePath/$cltFile"
+echo "Download and unzip HarmonyOS SDK"
+DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+echo "Unzipping HarmonyOS Tools to '$targetFolder'"
+sudo unzip -q "$toolsTargetFile" -d "$targetFolder"
+rm "$toolsTargetFile"

-    cltTargetDir="$targetFolder/$cltVersion"
-    sudo mkdir -p "$cltTargetDir"
+patchFile="harmonyos_sdk_patches.zip"
+patchSha1="7f912104a5600bc176891bc6e9d97732f4266ad6"

-    DownloadURL "$cltSourceFile" "$cltSourceFile" "$cltSha1" "$cltTargetFile"
-    echo "Unzipping HarmonyOS Command Line Tools to '$cltTargetDir'"
-    # Get the package base directory name as string
-    zipBase=$(sudo zipinfo -1 "$cltTargetFile" 2>/dev/null | awk '!seen {sub("/.*",""); print; seen=1}')
-    sudo unzip -q "$cltTargetFile" -d "$cltTargetDir"
-    rm "$cltTargetFile"
-    harmonycltRoot="${cltTargetDir}/${zipBase}"
+patchTargetFile="/tmp/$patchFile"
+patchSourceFile="$basePath/$patchFile"
+patchTargetFolder="$targetFolder/harmonyos_sdk_patches"

-    echo "Changing ownership of HarmonyOS files."
-    sudo chown -R qt:users "$harmonycltRoot"
-}
+echo "Download and unzip HarmonyOS SDK patches"
+DownloadURL "$patchSourceFile" "$patchSourceFile" "$patchSha1" "$patchTargetFile"
+echo "Unzipping HarmonyOS SDK patches to '$targetFolder'"
+sudo unzip -q "$patchTargetFile" -d "$targetFolder"
+rm "$patchTargetFile"

-cltVersionCurrent="6.1.0.850"
-cltSha1Current="6fdf7dbe0faddeb6a36cc76752faaf03d2abd462"
-InstallCommandLineTools $cltVersionCurrent $cltSha1Current
-SetEnvVar "HARMONYOS_SDK_ROOT_CURRENT" "$harmonycltRoot"
-sudo ln -s "$harmonycltRoot" "$sdkTargetFolder"
-SetEnvVar "HARMONYOS_SDK_ROOT" "$sdkTargetFolder"
+echo "Changing ownership of HarmonyOS files."
+if uname -a |grep -q "el7"; then
+    sudo chown -R qt:wheel "$sdkTargetFolder"
+    sudo chown -R qt:wheel "$patchTargetFolder"
+else
+    sudo chown -R qt:users "$sdkTargetFolder"
+    sudo chown -R qt:users "$patchTargetFolder"
+fi

-cltVersionNext="26.0.0.821"
-cltSha1Next="d89fc1a09ceb5b25a350695068fe9918912785d2"
-InstallCommandLineTools $cltVersionNext $cltSha1Next
-SetEnvVar "HARMONYOS_SDK_ROOT_NEXT" "$harmonycltRoot"
+echo "Patching HarmonyOS SDK"
+
+sdkRootFolder="$sdkTargetFolder/sdk/default/openharmony"
+echo "Checking the contents of HarmonyOS SDK..."
+ls -l "$sdkRootFolder"
+
+SetEnvVar "HARMONYOS_SDK_ROOT" "$sdkRootFolder"
+export HARMONYOS_SDK_ROOT="$sdkRootFolder"

 echo "HarmonyOS SDK setup finished"
@@ -17,8 +17,8 @@ APPNAME="CiNetworkTest"
 EXECPATH="${ROOT}/${APPNAME}/bin"
 EXEC="${EXECPATH}/${APPNAME}"
 URL="https://ci-files01-hki.ci.qt.io/input/networktestapp"
-TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.2.tgz"
-sha256="2be05baebf48ff29ebcd06a0761b2a3d92ae5a66f78d0cd953513d8271eb7f83"
+TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.1.tgz"
+sha256="3a23593f163ca2452546d20d56cabc81fed03c930d6d96334a22827da5a6840a"
 SOURCE="$URL/$TARBALL"
 InstallFromCompressedFileFromURL "$SOURCE" "" "$sha256" "$ROOT" "$PREFIX"

@@ -12,15 +12,9 @@ mkdir -p "$VCPKG_ROOT/installed"
 cp -R x86-android-qt-tmp/* "$VCPKG_ROOT/installed/"
 cp -R x86_64-android-qt-tmp/* "$VCPKG_ROOT/installed/"

-for triplet in x86-android-qt x86_64-android-qt; do
-    python3 "${BASH_SOURCE%/*}/../shared/vcpkg_generate_attributions.py" \
-        --install-root "$VCPKG_ROOT/installed" \
-        --triplet "$triplet"
-done
-
 cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
    "-DVCPKG_INSTALL_ROOT=$PWD/x86-android-qt-tmp"\
-    "-DOUTPUT=$HOME/versions.txt"\
+    "-DOUTPUT=~/versions.txt"\
    -P\
    "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake"

@@ -8,22 +8,13 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 echo "Installing vcpkg OHOS ports"

 # The vcpkg OHOS toolchain expects OHOS_SDK_ROOT; CI sets HARMONYOS_SDK_ROOT.
-ohosSdkRoot="${OHOS_SDK_ROOT:-$HARMONYOS_SDK_ROOT}"
+export OHOS_SDK_ROOT="${OHOS_SDK_ROOT:-$HARMONYOS_SDK_ROOT}"

-if [ -z "$ohosSdkRoot" ]; then
+if [ -z "$OHOS_SDK_ROOT" ]; then
    echo "ERROR: Neither OHOS_SDK_ROOT nor HARMONYOS_SDK_ROOT is set." >&2
    exit 1
 fi

-# On Linux, HARMONYOS_SDK_ROOT points at the command-line-tools root; the vcpkg
-# toolchain needs the openharmony native SDK inside it. On macOS it already
-# points there, so only descend when the nested SDK exists.
-if [ -d "$ohosSdkRoot/sdk/default/openharmony/native" ]; then
-    ohosSdkRoot="$ohosSdkRoot/sdk/default/openharmony"
-fi
-
-export OHOS_SDK_ROOT="$ohosSdkRoot"
-
 # Coin sets TARGET=hdb in the environment. GNU Make imports env vars as make
 # variables, which breaks ICU's Makefile (it defines its own TARGET variable
 # for the library path). Unset it before invoking vcpkg.
@@ -43,19 +43,11 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="c37e6f3a49a259d450b601843a9af2818b6feb96"
+sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

-# IANA timezone database overlay. Packaged separately from the SDP so it can be
-# bumped without rebuilding the SDP tarball. Archive root is usr/ so the same
-# archive suits both the 7.1 and 8.0 SDP layouts.
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a-usr.tar.xz"
-targetFile="zoneinfo.tar.xz"
-sha1="02deef2df3513d191ee3bb3a13fd61a814d7161a"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath/target/qnx7"
-
 sudo cp "$aarch64le_toolchain" "$targetPath"
 sudo cp "$armv7le_toolchain" "$targetPath"
 sudo cp "$x8664_toolchain" "$targetPath"
@@ -43,34 +43,31 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260828.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="f44b66d91625ab33e367cfb62a2950a041607caa"
+sha1="a3fdcd98e12bc5054d00f18e4088af26288fd020"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 # IANA timezone database overlay. Packaged separately from the SDP so it can be
-# bumped without rebuilding the SDP tarball. Archive root is usr/ so the same
-# archive suits both the 7.1 and 8.0 SDP layouts.
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a-usr.tar.xz"
+# bumped without rebuilding the SDP tarball. Archive root is qnx800/target/qnx/
+# so it overlays onto $targetFolder (/opt/) directly.
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a.tar.xz"
 targetFile="zoneinfo.tar.xz"
-sha1="02deef2df3513d191ee3bb3a13fd61a814d7161a"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath/target/qnx"
+sha1="8c1678ff673bb588f63fc9277497cd38e0ea2253"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo cp "$aarch64le_toolchain" "$targetPath"
 sudo cp "$armv7le_toolchain" "$targetPath"
 sudo cp "$x8664_toolchain" "$targetPath"
 cp -R "$QNX_qemu_bld_files_dir" "$qemuTargetPath"
-# The SDP ships fc-cache but not fc-match, which tst_qfont needs. Build it from
-# fontconfig's fc-match/fc-match.c at the release matching the SDP's fontconfig
-# (FC_MINOR/FC_REVISION in fontconfig.h), once per arch:
-#   qcc -Vgcc_ntox86_64 -O2 -o fc-match fc-match.c \
-#       -DHAVE_GETOPT_LONG=1 -DHAVE_UNISTD_H=1 -lfontconfig
-# Pack as <arch>/fc-match into a new dated archive, then update below. 7.1 keeps
-# its own archive.
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx_qemu_utils_800_20260825.tar.xz"
+# fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
+# Download code-only package from https://www.iana.org/time-zones and follow README
+# to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
+# package which contains it and update required info below
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
 targetFile="qnx_qemu_utils.tar.xz"
 targetFolder="$qemuTargetPath/local/misc_files"
-sha1="965b957c76d4bc59c010bb0908d1fea8975179c1"
+sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"

 mkdir -p "$targetFolder"

@@ -17,7 +17,7 @@ var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf
 var/share/fonts=usr/share/fonts

 var/etc/hosts=local/misc_files/etc/hosts
-var/dhcpcd/resolv.conf=local/misc_files/etc/resolv.conf
+var/etc/resolv.conf=local/misc_files/etc/resolv.conf
 var/etc/nsswitch.conf=etc/nsswitch.conf

 [uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs
@@ -17,11 +17,7 @@ echo "---> Remove large fonts"
 rm -rf /data/var/share/fonts/NotoSansCJK*
 rm -rf /data/var/share/fonts/NotoSansMonoCJK*
 echo "---> Create fontconfig cache"
-# fc-cache needs HOME to locate a writable cache directory, and the startup
-# environment has none. Keep these two in sync with QNX_TEST_ENV in
-# coin/platform_configs/cmake_platforms_qemu_qnx.yaml, so that the cache is
-# written where the tests will look for it.
-HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf fc-cache &
+fc-cache &

 echo "---> Restart ssh daemon"
 slay sshd
@@ -28,8 +28,6 @@ lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libdbus-1.so=usr/lib//libdbus-1.so
 lib/libdbus-1.so.22=usr/lib//libdbus-1.so.22
 lib/libbacktrace.so.1=lib/libbacktrace.so.1
-lib/libunwind-nto.so.0=usr/lib/libunwind-nto.so.0
-lib/libunwind-x86_64.so.8=usr/lib/libunwind-x86_64.so.8
 lib/libm.so.3=lib/libm.so.3

 #############################################
@@ -55,17 +53,13 @@ xbin/fsevmgr=sbin/fsevmgr
 ##############################################
 lib/libscreen.so.1=usr/lib/libscreen.so.1

-##############################################
-### Audio support
-##############################################
-lib/libasound.so.5=lib/libasound.so.5
-
 # for fontconfig
 lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17
-bin/fc-cache=bin/fc-cache
-bin/fc-match=local/misc_files/x86_64/fc-match
+xbin/fc-cache=bin/fc-cache
+xbin/fc-match=local/misc_files/fc-match

 # network
 lib/libssl.so=usr/lib/libssl.so
+xbin/nslookup=usr/bin/nslookup
 xbin/unbound=sbin/unbound
 xbin/curl=usr/bin/curl
@@ -22,12 +22,12 @@ SetEnvVar "VXWORKS_HOME" "/opt/vxworks"
 SetEnvVar "VXWORKS_SSH" "[email protected]"

 # IMX 6
-VXWORKS_BUILD_VER="24-09-2026"
+VXWORKS_BUILD_VER="12-05-2026_2"
 ######### VXworks toolchain #########
 # Installs to /opt/fsl_imx6_2_0_6_3_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="aaa8d51a2e9d67573f808e92d71112926bfc2657"
+sha1="a1553f377ae84a722c8ad258fccb684f9198717c"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_3_VSB"
@@ -36,7 +36,7 @@ SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_3_VSB"
 # Installs to /opt/fsl_imx6_2_0_6_3_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="3b69676a8621776d162d3d14cb97681c5075a4e7"
+sha1="487a056d389a764717142100fb408e65ea720f92"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

@@ -44,20 +44,20 @@ InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder"
 # Installs to /opt/nxp_imx8_1_0_7_1_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_imx8_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="2b79925bf2f439ae23dbbd6d9f0eb7f12f5b5b30"
+sha1="b312f38a7ca670398c940c25d20ed2a26155160d"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

 # Installs to /opt/itl_generic_skylake_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="59a4f78844d6d228fa9d74605a6a219a32f77ca8"
+sha1="9fddd5aa0b9599113c22670fcc1221004978ee8a"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 # Installs to /opt/itl_generic_skylake_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="b56be2e8617004448dc918ff061347a44e653db7"
+sha1="cb366addbea7a1fd34aa49b739dcc0b480350fce"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

@@ -77,12 +77,7 @@ targetFolder="/opt/itl_generic_skylake_VSB/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

 # Enable ipv4 routing from vxWorks to Qt DNS
-if [ -f /etc/sysctl.conf ]; then
-    sudo sed -i 's/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g' /etc/sysctl.conf
-else
-    # There's no /etc/sysctl.conf in Ubuntu 26.04, use sysctl.d instead
-    echo "net.ipv4.ip_forward=1" | sudo tee /etc/sysctl.d/99-vxworks.conf
-fi
+sudo sed -i s/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g /etc/sysctl.conf
 sudo iptables -I FORWARD 1 -j ACCEPT
 sudo iptables -t nat -A POSTROUTING -o ens3 -j MASQUERADE

@@ -35,38 +35,21 @@ fi
 exec 9>"/tmp/vxworks_qemu_host_setup.lock"
 flock 9
 NFS_CONF_MARKER="# VxWorks QEMU NFS settings (added by vxworks_qemu_launcher.sh)"
-# Persist the sysctl settings so they survive the reboot between the build
-# and test phases, then apply them to the running kernel as well.
-SYSCTL_CONF="/etc/sysctl.d/90-vxworks-qemu.conf"
-if [ ! -f "$SYSCTL_CONF" ]; then
-    sudo tee "$SYSCTL_CONF" >/dev/null <<'EOF'
-# VxWorks QEMU network settings (added by vxworks_qemu_launcher.sh)
-net.core.rmem_max=8388608
-net.core.rmem_default=8388608
-net.core.wmem_max=8388608
-net.core.wmem_default=8388608
-net.ipv4.ipfrag_high_thresh=16777216
-net.ipv4.ipfrag_low_thresh=12582912
-EOF
-fi
-sudo sysctl -q -p "$SYSCTL_CONF"
-
 if ! grep -qF "$NFS_CONF_MARKER" /etc/nfs.conf; then
    # Configure NFS for UDP traffic
    sudo bash -c "echo -e '\n${NFS_CONF_MARKER}\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e '[nfsd]\n' >> /etc/nfs.conf"
-    sudo bash -c "echo -e 'threads=32\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'udp=y\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'tcp=n\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'vers2=n\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'vers3=y\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'vers4=n\n' >> /etc/nfs.conf"
    # Setup NFS exports that are needed by VxWorks qemu
-    sudo bash -c "echo '/home/qt/work 172.31.1.10/24(rw,async,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-    sudo bash -c "echo '/opt/fsl_imx6_2_0_6_3_VSB 172.31.1.10/24(rw,async,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-    sudo bash -c "echo '/opt/itl_generic_skylake_VSB 172.31.1.10/24(rw,async,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/home/qt/work 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/opt/fsl_imx6_2_0_6_3_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/opt/itl_generic_skylake_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
    # Restart NFS server
-    sudo exportfs -ra
+    sudo exportfs -a
    sudo systemctl restart nfs-server
 fi

@@ -86,9 +69,8 @@ exec 9>&-
 if [ "$TYPE" = "arm" ] || [ "$TYPE" = "" ]; then
    $VXWORKS_QEMU/bin/qemu-system-arm \
        -machine sabrelite \
-        -no-reboot \
        -smp 2 \
-        -m 3G \
+        -m 2G \
        -nographic \
        -monitor none \
        -serial null \
@@ -102,9 +84,8 @@ if [ "$TYPE" = "arm" ] || [ "$TYPE" = "" ]; then
 elif [ "$TYPE" = "intel" ]; then
    $VXWORKS_QEMU/bin/qemu-system-x86_64 \
        -M q35 \
-        -no-reboot \
        -smp 4 \
-        -m 15G \
+        -m 4G \
        -cpu "Skylake-Client" \
        -enable-kvm \
        -monitor none \
@@ -115,49 +96,15 @@ elif [ "$TYPE" = "intel" ]; then
        -append "sysbootline:gei(0,0)host:vxWorks h=172.31.1.1 g=172.31.1.1 e=${GUEST_IP} u=target pw=vxTarget s=/romfs/startup_script.txt" \
        -nic "tap,ifname=${TAP},script=no,downscript=no,mac=${MAC}" >"${QEMU_LOG_PATH}" 2>&1 &
 fi
-QEMU_PID=$!

-# The launcher is also re-invoked from inside the ctest environment when
-# coin_vxworks_qemu_runner.sh restarts a wedged emulator. That environment
-# carries a library path with the provisioned OpenSSL, which the system ssh
-# (linked against the distro OpenSSL) refuses to load ("OpenSSL version
-# mismatch"), so run ssh with a clean library path. Bound each probe with a
-# hard timeout as well: ConnectTimeout only limits TCP connect, and a
-# half-booted guest that accepts the connection but never answers would
-# otherwise stall the loop.
-#
-# Boot-to-ssh takes seconds on KVM x86 but 15-60s+ on TCG ARM, with a long
-# tail when several instances boot in parallel (a fixed 30-try budget killed
-# healthy relaunches mid-boot on qemu_armv7), so wait on a wall-clock
-# deadline rather than a retry count, and give up early only when the QEMU
-# process itself has died.
-SSH_WAIT_SECS=${VXWORKS_SSH_WAIT_SECS:-300}
-SSH_UP=0
-deadline=$((SECONDS + SSH_WAIT_SECS))
-while (( SECONDS < deadline ))
+for _ in $(seq 30)
 do
-    if [[ -n "$QEMU_PID" ]] && ! kill -0 "$QEMU_PID" 2>/dev/null; then
-        echo "QEMU process for instance ${INSTANCE} exited during boot"
-        break
-    fi
-    status=$(env -u LD_LIBRARY_PATH timeout -k 5 15 \
-        ssh -n -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa \
-            -o ConnectTimeout=1 "${SSH_TARGET}" echo emulator up) || true
+    status=$(ssh -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa -o ConnectTimeout=1 "${SSH_TARGET}" echo emulator up) || true
    if [[ $status == *"emulator up"* ]] ; then
        echo "VXWORKS QEMU SSH server up (instance ${INSTANCE} @ ${GUEST_IP})"
-        SSH_UP=1
        break
    else
        echo "Waiting VXWORKS QEMU SSH server (instance ${INSTANCE} @ ${GUEST_IP})"
        sleep 1
    fi
 done
-
-# Do not report success for an instance whose SSH server never came up: the
-# caller would go on to source the test script on a guest in an unknown
-# state. Exit non-zero so the testrunner's restart path can fail the attempt
-# and let qt-testrunner retry with a clean slot.
-if [[ $SSH_UP -ne 1 ]]; then
-    echo "VXWORKS QEMU SSH server did not come up (instance ${INSTANCE} @ ${GUEST_IP})"
-    exit 1
-fi
@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
 toolsVersion="19.0"
 toolsFile="commandlinetools-mac-13114758_latest.zip"
 toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
-sdkBuildToolsVersion="37.0.0"
-sdkApiLevel="android-37.0"
+sdkBuildToolsVersion="35.0.1"
+sdkApiLevel="android-35"
 toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24"

 ndkVersionLatest="r27c"
@@ -43,6 +43,9 @@ ndkVersionNightly1=$ndkVersionLatest  # Set as same version as latest = skip NDK
 ndkSha1Nightly1=$ndkSha1Latest
 ndkVersionNightly2=$ndkVersionLatest
 ndkSha1Nightly2=$ndkSha1Latest
+sdkBuildToolsVersion="36.0.0"
+# this is compile sdk version
+sdkApiLevel="android-36"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -1,68 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script install HarmonyOS sdk and patches.
-
-set -e
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/check_and_set_proxy.sh
-source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-targetFolder="/opt/harmonyos"
-sdkTargetFolder="$targetFolder/command-line-tools"
-
-sudo mkdir -p "$sdkTargetFolder"
-
-basePath="http://ci-files01-hki.ci.qt.io/input/harmonyos"
-
-toolsVersion="6.1.0.860"
-toolsFile="commandline-tools-mac-arm64-6.1.0.860.zip"
-toolsSha1="4ba9df069fc5c651753c74297d723a2461be12e9"
-
-toolsTargetFile="/tmp/$toolsFile"
-toolsSourceFile="$basePath/$toolsFile"
-
-echo "Download and unzip HarmonyOS SDK"
-DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
-echo "Unzipping HarmonyOS Tools to '$targetFolder'"
-sudo unzip -q "$toolsTargetFile" -d "$targetFolder"
-rm "$toolsTargetFile"
-
-patchFile="harmonyos_sdk_patches.zip"
-patchSha1="7f912104a5600bc176891bc6e9d97732f4266ad6"
-
-patchTargetFile="/tmp/$patchFile"
-patchSourceFile="$basePath/$patchFile"
-patchTargetFolder="$targetFolder/harmonyos_sdk_patches"
-
-echo "Download and unzip HarmonyOS SDK patches"
-DownloadURL "$patchSourceFile" "$patchSourceFile" "$patchSha1" "$patchTargetFile"
-echo "Unzipping HarmonyOS SDK patches to '$targetFolder'"
-sudo unzip -q "$patchTargetFile" -d "$targetFolder"
-rm "$patchTargetFile"
-
-echo "Changing ownership of HarmonyOS files."
-sudo chown -R qt:wheel "$sdkTargetFolder"
-sudo chmod -R 755 $sdkTargetFolder
-sudo chown -R qt:wheel "$patchTargetFolder"
-sudo chmod -R 755 $patchTargetFolder
-
-echo "Patching HarmonyOS SDK"
-
-sdkRootFolder="$sdkTargetFolder/sdk/default/openharmony"
-echo "Checking the contents of HarmonyOS SDK..."
-ls -l "$sdkRootFolder"
-
-SetEnvVar "HARMONYOS_SDK_ROOT" "$sdkRootFolder"
-export HARMONYOS_SDK_ROOT="$sdkRootFolder"
-
-# Same meaning as on Linux: the command-line-tools root, which holds hvigorw.
-SetEnvVar "HARMONYOS_SDK_ROOT_CURRENT" "$sdkTargetFolder"
-export HARMONYOS_SDK_ROOT_CURRENT="$sdkTargetFolder"
-
-echo "HarmonyOS SDK setup finished"
@@ -6,12 +6,8 @@
 #
 # The script will package iOS and iOS-simulator binaries into one
 # single .xcframework. This .xcframework cannot contain .dylibs
-# directly. It must contain .framework files. Binaries for different
-# SDKs (iphoneos and iphonesimulator) should NOT be lipoed together,
-# they must be separate frameworks inside the .xcframework. However,
-# an .xcframework can hold only one framework per SDK, so binaries for
-# different architectures of the same SDK (arm64 and x86_64 simulator)
-# must be lipoed together into a single universal framework.
+# directly. It must contain .framework files. Unlike macOS, binaries
+# should NOT be lipoed together.
 #
 # From https://developer.apple.com/documentation/xcode/creating-a-multi-platform-binary-framework-bundle
 # "Avoid using dynamic library files (.dylib files) for dynamic
@@ -45,10 +41,6 @@ prefix="${1:-$default_prefix}"
 # we care about
 ffmpeg_components="libavcodec libavformat libavutil libswresample libswscale"

-# The target platforms to build for. Target platforms that share the
-# same SDK are lipoed together into one framework.
-target_platforms=("arm64-iphoneos" "arm64-simulator" "x86_64-simulator")
-
 target_platform_to_sdk() {
    local target_platform="$1"
    if [[ "$target_platform" == "arm64-simulator" ]] \
@@ -62,16 +54,6 @@ target_platform_to_sdk() {
    fi
 }

-# The SDKs of all target platforms, without duplicates. Each SDK ends up as
-# a separate framework inside each .xcframework.
-target_sdks=()
-for target_platform in "${target_platforms[@]}"; do
-    target_sdk="$(target_platform_to_sdk "$target_platform")"
-    if [[ " ${target_sdks[*]:-} " != *" ${target_sdk} "* ]]; then
-        target_sdks+=("$target_sdk")
-    fi
-done
-
 build_ffmpeg_ios() {
    local target_platform="$1"
    local target_cpu_arch=""
@@ -120,6 +102,7 @@ build_ffmpeg_ios() {
        --extra-ldflags="${common_arch_flags}"
        --target-os=darwin
        --install-name-dir="@rpath"
+        --disable-audiotoolbox

        # We perform manual stripping after generating dSYMs.
        # Make sure to skip it during FFmpeg compilation.
@@ -131,31 +114,6 @@ build_ffmpeg_ios() {
    popd
 }

-# Combine the FFmpeg dylibs of all target platforms that belong to the given
-# SDK into universal dylibs. The result is placed in a build directory named
-# after the SDK, which is then used to create the framework for that SDK.
-lipo_dylibs() {
-    local target_sdk="$1"
-
-    local sdk_lib_dir="${ffmpeg_source_dir}/build_ios/${target_sdk}/installed/${prefix}/lib"
-    sudo mkdir -p "$sdk_lib_dir"
-
-    local ffmpeg_component_name
-    for ffmpeg_component_name in $ffmpeg_components; do
-        local input_dylibs=()
-        local target_platform
-        for target_platform in "${target_platforms[@]}"; do
-            if [ "$(target_platform_to_sdk "$target_platform")" == "$target_sdk" ]; then
-                input_dylibs+=("${ffmpeg_source_dir}/build_ios/${target_platform}/installed/${prefix}/lib/${ffmpeg_component_name}.dylib")
-            fi
-        done
-
-        sudo lipo -create \
-            "${input_dylibs[@]}" \
-            -output "${sdk_lib_dir}/${ffmpeg_component_name}.dylib"
-    done
-}
-
 build_info_plist() {
    local file_path="$1"
    local framework_name="$2"
@@ -226,9 +184,9 @@ build_info_plist() {
 # See https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFrameworks/Frameworks.html
 create_framework() {
    local ffmpeg_component_name="$1"
-    local target_sdk="$2"
+    local platform="$2"

-    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${target_sdk}/installed/${prefix}"
+    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${platform}/installed/${prefix}"
    local ffmpeg_component_src_dylib="${ffmpeg_build_path}/lib/${ffmpeg_component_name}.dylib"
    local ffmpeg_component_framework="${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework"
    local ffmpeg_component_target_dylib="${ffmpeg_component_framework}/${ffmpeg_component_name}"
@@ -256,12 +214,10 @@ create_framework() {
        -id "@rpath/${ffmpeg_component_name}.framework/${ffmpeg_component_name}" \
        "${ffmpeg_component_target_dylib}"

-    # Update the runpaths for each FFmpeg dependency entry. The dylib may be
-    # universal, in which case otool lists the dependencies once per
-    # architecture, each list preceded by an unindented header line.
+    # Update the runpaths for each FFmpeg dependency entry
    otool -L "$ffmpeg_component_target_dylib" \
-        | awk '/^[[:space:]]/ {print $1}' \
-        | sort -u \
+        | tail -n +2 \
+        | awk '{print $1}' \
        | while read -r dep; do
            # Go through all dependency entries of this .dylib,
            # see if they point to a FFmpeg component. If it does,
@@ -285,65 +241,62 @@ create_framework() {
 # At the end, we strip the dylib.
 create_dsym() {
    local ffmpeg_component_name="$1"
-    local target_sdk="$2"
+    local platform="$2"

-    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${target_sdk}/installed/${prefix}"
+    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${platform}/installed/${prefix}"
    local target_dylib="${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework/${ffmpeg_component_name}"

    sudo dsymutil "${target_dylib}" \
        -o "${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework.dSYM"

+    local target_sdk;
+    target_sdk=$(target_platform_to_sdk "${platform}")
+
    local strip;
    strip="$(xcrun -f --sdk ${target_sdk} strip)"
    sudo ${strip} -x "${target_dylib}"
 }

-# Create an .xcframework from the given component's framework and dSYM
-# for each target SDK.
 create_xcframework() {
+    # Create 'traditional' framework from the corresponding dylib,
+    # also creating
    local framework_name="$1"
-    shift
+    local target_platform_a="$2"
+    local target_platform_b="$3"

-    local xcframework_args=()
-    local target_sdk
-    for target_sdk in "$@"; do
-        local sdk_build="${ffmpeg_source_dir}/build_ios/${target_sdk}/installed/${prefix}"
-        local fw="${sdk_build}/framework/${framework_name}.framework"
-        xcframework_args+=(-framework "$fw" -debug-symbols "${fw}.dSYM")
-    done
+    local platform_a_build="${ffmpeg_source_dir}/build_ios/${target_platform_a}/installed/${prefix}"
+    local fw_a="${platform_a_build}/framework/${framework_name}.framework"
+    local dsym_a="${fw_a}.dSYM"
+
+    local platform_b_build="${ffmpeg_source_dir}/build_ios/${target_platform_b}/installed/${prefix}"
+    local fw_b="${platform_b_build}/framework/${framework_name}.framework"
+    local dsym_b="${fw_b}.dSYM"

    sudo mkdir -p "$prefix/lib/"
    sudo xcodebuild -create-xcframework \
-        "${xcframework_args[@]}" \
+        -framework "$fw_a" -debug-symbols "$dsym_a" \
+        -framework $fw_b -debug-symbols "$dsym_b" \
        -output "${prefix}/lib/${framework_name}.xcframework"
 }

-# Build for each chosen ABI
-for target_platform in "${target_platforms[@]}"; do
-    build_ffmpeg_ios "$target_platform"
-done
+build_ffmpeg_ios "arm64-iphoneos"
+build_ffmpeg_ios "x86_64-simulator"

-# Combine the ABIs of each SDK into universal dylibs
-for target_sdk in "${target_sdks[@]}"; do
-    lipo_dylibs "$target_sdk"
-done
-
-# Create .frameworks and dSYMs for each FFmpeg component, for each SDK
 for name in $ffmpeg_components; do
-    for target_sdk in "${target_sdks[@]}"; do
-        create_framework "$name" "$target_sdk"
-        create_dsym "$name" "$target_sdk"
-    done
+    create_framework "$name" "arm64-iphoneos"
+    create_framework "$name" "x86_64-simulator"
+
+    create_dsym "$name" "arm64-iphoneos"
+    create_dsym "$name" "x86_64-simulator"
 done

-# Create corresponding xcframeworks containing the frameworks of all target SDKs:
+# Create corresponding xcframeworks containing both arm64 and x86_64-simulator frameworks:
 for name in $ffmpeg_components; do
-    create_xcframework "$name" "${target_sdks[@]}"
+    create_xcframework "$name" "arm64-iphoneos" "x86_64-simulator"
 done

 # xcframeworks are already installed directly into the target output directory.
-# We need to install headers. These are the same for all target platforms,
-# so we take them from the first one.
-sudo cp -r "${ffmpeg_source_dir}/build_ios/${target_platforms[0]}/installed/${prefix}/include" "$prefix"
+# We need to install headers
+sudo cp -r "${ffmpeg_source_dir}/build_ios/arm64-iphoneos/installed/${prefix}/include" "$prefix"

 set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" "$prefix"
@@ -58,12 +58,7 @@ function InstallXCode() {
    # Xcode 26 ships a more minimal base install
    if ((majorVersion >= 26)); then
        xcodebuild -downloadComponent MetalToolchain
-        if ((majorVersion >= 27)); then
-            # No more universal iOS simulator in Xcode 27
-            xcodebuild -downloadPlatform iOS
-        else
-            xcodebuild -downloadPlatform iOS -architectureVariant universal
-        fi
+        xcodebuild -downloadPlatform iOS
        if [[ $(uname -m) == "arm64" ]]; then
            xcodebuild -downloadPlatform visionOS
        fi
@@ -34,6 +34,6 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Library/Frameworks/Python.framework/Versions
 SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin/python3"

 # Install Python certificates. Required at least for emsdk installation
-/Applications/Python\ 3.11/Install\ Certificates.command
+open /Applications/Python\ 3.11/Install\ Certificates.command

 echo "python3 = 3.11.9" >> ~/versions.txt
@@ -31,72 +31,29 @@ TCC_CLIENTS+=("/usr/libexec/sshd-keygen-wrapper")
 SERVICES=()

 # Qt Multimedia tests need microphone access
-SERVICES+=("kTCCServiceMicrophone|user")
+SERVICES+=("kTCCServiceMicrophone|$HOME")

 # Qt Connectivity tests need Bluetooth access
-SERVICES+=("kTCCServiceBluetoothAlways|user")
+SERVICES+=("kTCCServiceBluetoothAlways|$HOME")

 # Qt Multimedia might need screen capture, and it can
 # also be useful for capturing the state of the VM when
 # a test fails.
-SERVICES+=("kTCCServiceScreenCapture|system")
+SERVICES+=("kTCCServiceScreenCapture|/")

 # Squish requires kTCCServiceAccessibility
-SERVICES+=("kTCCServiceAccessibility|system")
+SERVICES+=("kTCCServiceAccessibility|/")

 # ------ Implementation ------

-# Starting with macOS 27, tccd's per-user database moved out of
-# ~/Library/Application Support/com.apple.TCC into a randomly named
-# container under ProtectedSystem. The container UUID is assigned by
-# containermanagerd and isn't derived from anything we can compute, so
-# look it up by identifier instead. The system-wide database (owned by
-# "tccd system", running as root) is unaffected and stays where it was.
-function find_tccd_container() {
-    local plist
-    for plist in /private/var/containers/Data/ProtectedSystem/*/.com.apple.containermanagerd.metadata.plist; do
-        if [[ "$(sudo defaults read "$plist" MCMMetadataIdentifier 2>/dev/null)" == "com.apple.tccd" ]]; then
-            dirname "$plist"
-            return 0
-        fi
-    done
-    return 1
-}
-
-function is_macos_27_or_later() {
-    local version
-    version=$(sw_vers -productVersion)
-    (( ${version%%.*} >= 27 ))
-}
-
-# Resolve both database locations once, up front, instead of on every
-# add_permission_for_client call. The user one in particular requires
-# walking ProtectedSystem containers on macOS 27+, which is wasteful
-# to repeat for each client/service pair.
-SYSTEM_TCC_DB="/Library/Application Support/com.apple.TCC/TCC.db"
-if is_macos_27_or_later; then
-    tccd_container=$(find_tccd_container) || {
-        echo "Could not locate tccd's ProtectedSystem container" >&2
-        exit 1
-    }
-    USER_TCC_DB="$tccd_container/Data/Library/Application Support/com.apple.TCC/TCC.db"
-else
-    USER_TCC_DB="$HOME/Library/Application Support/com.apple.TCC/TCC.db"
-fi
-
 function add_permission_for_client() {
    local client="$1"
    local service="$2"

-    local scope="${service#*|}"
+    local path="${service#*|}"
    local service="${service%|*}"

-    local tcc_database
-    if [[ "$scope" == "system" ]]; then
-        tcc_database="$SYSTEM_TCC_DB"
-    else
-        tcc_database="$USER_TCC_DB"
-    fi
+    tcc_database="${path%/}/Library/Application Support/com.apple.TCC/TCC.db"
    if ! sudo touch "$tcc_database"; then
        echo "TCC database is not writable. Is SIP disabled?" >&2
        exit 1
@@ -122,7 +79,6 @@ function add_permission_for_client() {
    local req_hex=$(echo "$req_str" | csreq -r- -b >(xxd -p | tr -d '\n'))

    sudo sqlite3 -echo "$tcc_database" <<EOF
-        PRAGMA busy_timeout = 5000;
        DELETE from access WHERE client = '$client' AND service = '$service';
        INSERT INTO access (service, client, client_type, auth_value, auth_reason, auth_version, csreq, flags) VALUES (
          '$service', -- service
@@ -4,8 +4,7 @@ plugins {

 android {
    namespace = 'org.qtproject.qt.gradlecache.app'
-    compileSdk = 37
-    compileSdkMinor = 0
+    compileSdk = 36

    defaultConfig {
        applicationId 'org.qtproject.qt.gradlecache.app'
@@ -4,8 +4,7 @@ plugins {

 android {
    namespace = 'org.qtproject.qt.gradlecache.feature'
-    compileSdk = 37
-    compileSdkMinor = 0
+    compileSdk = 36

    defaultConfig {
        minSdk = 28
@@ -4,8 +4,7 @@ plugins {

 android {
    namespace = 'org.qtproject.qt.gradlecache.lib'
-    compileSdk = 37
-    compileSdkMinor = 0
+    compileSdk = 36

    defaultConfig {
        minSdk = 28
@@ -3,7 +3,6 @@ spdx-tools>=0.8.0 ; python_version >= '3.9'
 ntia-conformance-checker ; python_version >= '3.9'
 sbomaudit ; python_version >= '3.9'
 sbom2doc ; python_version >= '3.9'
-reuse<=5.1.1 ; python_version == '3.9'
-reuse==6.2.0 ; python_version >= '3.10'
-cyclonedx-python-lib==11.12.0 ; python_version >= '3.9'
+reuse<=5.1.1 ; python_version >= '3.9'
+cyclonedx-python-lib==11.5.0 ; python_version >= '3.9'
 jsonschema>=4.20 ; python_version >= '3.12'
@@ -1,410 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-"""Unit tests for vcpkg_generate_attributions.py.
-
-Run from this directory with:
-    python3 -m unittest test_vcpkg_generate_attributions -v
-"""
-
-import json
-import tempfile
-import unittest
-from pathlib import Path
-
-from vcpkg_generate_attributions import (
-    CPE_FILE,
-    build_attribution,
-    compose_cpe,
-    find_purl,
-    generate,
-    index_entries,
-    load_cpe_map,
-    normalize_license,
-    port_installs_files,
-    select_download_location,
-    strip_port_version,
-)
-
-TRIPLET = "arm64-ohos-qt"
-
-FREETYPE_PORT = {
-    "name": "freetype",
-    "SPDXID": "SPDXRef-port",
-    "versionInfo": "2.14.3",
-    "homepage": "https://www.freetype.org/",
-    "licenseConcluded": "(FTL OR GPL-2.0-or-later)",
-    "description": "A library to render fonts.",
-    "externalRefs": [
-        {
-            "referenceCategory": "PACKAGE-MANAGER",
-            "referenceType": "purl",
-            "referenceLocator": "pkg:vcpkg/[email protected]?triplet=arm64-ohos-qt",
-        }
-    ],
-}
-
-FREETYPE_RESOURCE = {
-    "SPDXID": "SPDXRef-resource-0",
-    "name": "freetype/freetype",
-    "downloadLocation": "git+https://gitlab.freedesktop.org//freetype/freetype@VER-2-14-3",
-}
-
-MESON_RESOURCE = {
-    "SPDXID": "SPDXRef-resource-0",
-    "name": "meson-1.9.0.tar.gz",
-    "downloadLocation": "https://github.com/mesonbuild/meson/archive/1.9.0.tar.gz",
-}
-
-
-class TestStripPortVersion(unittest.TestCase):
-    def test_plain_version_is_unchanged(self):
-        self.assertEqual(strip_port_version("2.14.3"), "2.14.3")
-
-    def test_port_version_suffix_is_dropped(self):
-        self.assertEqual(strip_port_version("2.17.1#3"), "2.17.1")
-
-    def test_date_version_is_unchanged(self):
-        self.assertEqual(strip_port_version("2024-04-23"), "2024-04-23")
-
-    def test_empty_stays_empty(self):
-        self.assertEqual(strip_port_version(""), "")
-
-
-class TestComposeCpe(unittest.TestCase):
-    def test_vendor_and_product_are_inserted(self):
-        self.assertEqual(
-            compose_cpe("libpng:libpng", "1.6.50"),
-            "cpe:2.3:a:libpng:libpng:1.6.50:*:*:*:*:*:*:*",
-        )
-
-    def test_unmapped_port_yields_nothing(self):
-        self.assertIsNone(compose_cpe(None, "1.6.50"))
-
-    def test_missing_version_yields_nothing(self):
-        # A CPE with an empty version field matches no product at all.
-        self.assertIsNone(compose_cpe("libpng:libpng", ""))
-
-
-class TestLoadCpeMap(unittest.TestCase):
-    def test_shipped_table_has_vendor_and_product_everywhere(self):
-        ports = load_cpe_map(CPE_FILE)
-        self.assertIn("zlib", ports)
-        for port_name, vendor_product in ports.items():
-            with self.subTest(port=port_name):
-                vendor, _, product = vendor_product.partition(":")
-                self.assertTrue(vendor)
-                self.assertTrue(product)
-                self.assertNotIn(":", product)
-
-
-class TestNormalizeLicense(unittest.TestCase):
-    def test_expression_is_kept(self):
-        self.assertEqual(normalize_license("MIT"), "MIT")
-
-    def test_compound_expression_is_kept(self):
-        self.assertEqual(
-            normalize_license("(FTL OR GPL-2.0-or-later)"), "(FTL OR GPL-2.0-or-later)"
-        )
-
-    def test_noassertion_is_rejected(self):
-        self.assertIsNone(normalize_license("NOASSERTION"))
-
-    def test_vcpkg_null_marker_is_rejected(self):
-        self.assertIsNone(normalize_license("LicenseRef-vcpkg-null"))
-
-    def test_missing_is_rejected(self):
-        self.assertIsNone(normalize_license(None))
-
-    def test_empty_is_rejected(self):
-        self.assertIsNone(normalize_license(""))
-
-
-class TestFindPurl(unittest.TestCase):
-    def test_purl_is_found(self):
-        self.assertEqual(
-            find_purl(FREETYPE_PORT["externalRefs"]),
-            "pkg:vcpkg/[email protected]?triplet=arm64-ohos-qt",
-        )
-
-    def test_other_reference_types_are_ignored(self):
-        refs = [{"referenceType": "cpe23Type", "referenceLocator": "cpe:2.3:a:x:y:1:"}]
-        self.assertIsNone(find_purl(refs))
-
-    def test_missing_refs_are_tolerated(self):
-        self.assertIsNone(find_purl(None))
-
-
-class TestSelectDownloadLocation(unittest.TestCase):
-    def test_single_resource_is_used(self):
-        self.assertEqual(
-            select_download_location([FREETYPE_RESOURCE]),
-            "git+https://gitlab.freedesktop.org//freetype/freetype@VER-2-14-3",
-        )
-
-    def test_two_resources_are_ambiguous(self):
-        self.assertIsNone(select_download_location([MESON_RESOURCE, FREETYPE_RESOURCE]))
-
-    def test_no_resources_yields_nothing(self):
-        self.assertIsNone(select_download_location([]))
-
-
-class TestPortInstallsFiles(unittest.TestCase):
-    def test_library_counts_as_installed(self):
-        lines = [
-            "arm64-ohos-qt/",
-            "arm64-ohos-qt/lib/",
-            "arm64-ohos-qt/lib/libfreetype.a",
-            "arm64-ohos-qt/share/freetype/copyright",
-        ]
-        self.assertTrue(port_installs_files(lines, TRIPLET))
-
-    def test_headers_count_as_installed(self):
-        lines = ["arm64-ohos-qt/include/node_api.h"]
-        self.assertTrue(port_installs_files(lines, TRIPLET))
-
-    def test_metaport_installs_nothing(self):
-        lines = [
-            "arm64-ohos-qt/",
-            "arm64-ohos-qt/share/",
-            "arm64-ohos-qt/share/pthread/copyright",
-            "arm64-ohos-qt/share/pthread/vcpkg.spdx.json",
-        ]
-        self.assertFalse(port_installs_files(lines, TRIPLET))
-
-    def test_tools_only_installs_nothing_linkable(self):
-        lines = ["arm64-ohos-qt/tools/gperf/gperf"]
-        self.assertFalse(port_installs_files(lines, TRIPLET))
-
-    def test_other_triplets_are_ignored(self):
-        lines = ["x64-linux/lib/libfreetype.a"]
-        self.assertFalse(port_installs_files(lines, TRIPLET))
-
-
-class TestIndexEntries(unittest.TestCase):
-    def test_triplet_component_is_stripped(self):
-        lines = ["arm64-ohos-qt/lib/libfreetype.a"]
-        self.assertEqual(
-            index_entries(lines, TRIPLET, "freetype"), {"lib/libfreetype.a": "freetype"}
-        )
-
-    def test_bin_entries_are_indexed(self):
-        lines = ["arm64-ohos-qt/bin/libfreetype.so"]
-        self.assertEqual(
-            index_entries(lines, TRIPLET, "freetype"), {"bin/libfreetype.so": "freetype"}
-        )
-
-    def test_headers_are_not_indexed(self):
-        lines = ["arm64-ohos-qt/include/ft2build.h"]
-        self.assertEqual(index_entries(lines, TRIPLET, "freetype"), {})
-
-    def test_share_is_not_indexed(self):
-        lines = ["arm64-ohos-qt/share/freetype/copyright"]
-        self.assertEqual(index_entries(lines, TRIPLET, "freetype"), {})
-
-    def test_directory_entries_are_skipped(self):
-        lines = ["arm64-ohos-qt/lib/"]
-        self.assertEqual(index_entries(lines, TRIPLET, "freetype"), {})
-
-
-class TestBuildAttribution(unittest.TestCase):
-    def test_full_entry(self):
-        entry = build_attribution(
-            FREETYPE_PORT, [FREETYPE_RESOURCE], TRIPLET, True, "freetype:freetype"
-        )
-        self.assertEqual(entry["Id"], "freetype")
-        self.assertEqual(entry["Name"], "freetype")
-        self.assertEqual(entry["Version"], "2.14.3")
-        self.assertEqual(entry["Description"], "A library to render fonts.")
-        self.assertEqual(entry["Homepage"], "https://www.freetype.org/")
-        self.assertEqual(entry["License"], "(FTL OR GPL-2.0-or-later)")
-        self.assertEqual(entry["LicenseId"], "(FTL OR GPL-2.0-or-later)")
-        self.assertEqual(entry["LicenseFile"], "copyright")
-        self.assertEqual(entry["PURL"], "pkg:vcpkg/[email protected]?triplet=arm64-ohos-qt")
-        self.assertEqual(
-            entry["DownloadLocation"],
-            "git+https://gitlab.freedesktop.org//freetype/freetype@VER-2-14-3",
-        )
-        self.assertEqual(entry["CPE"], "cpe:2.3:a:freetype:freetype:2.14.3:*:*:*:*:*:*:*")
-        self.assertIn(TRIPLET, entry["QtUsage"])
-
-    def test_cpe_uses_the_version_without_the_port_version_suffix(self):
-        port = dict(FREETYPE_PORT)
-        port["versionInfo"] = "2.17.1#3"
-        entry = build_attribution(port, [], TRIPLET, False, "fontconfig_project:fontconfig")
-        self.assertEqual(
-            entry["CPE"], "cpe:2.3:a:fontconfig_project:fontconfig:2.17.1:*:*:*:*:*:*:*"
-        )
-
-    def test_port_absent_from_the_cpe_table_omits_cpe(self):
-        entry = build_attribution(FREETYPE_PORT, [FREETYPE_RESOURCE], TRIPLET, True)
-        self.assertNotIn("CPE", entry)
-
-    def test_port_version_is_stripped_from_version_but_not_purl(self):
-        port = dict(FREETYPE_PORT)
-        port["versionInfo"] = "2.17.1#3"
-        port["externalRefs"] = [
-            {
-                "referenceType": "purl",
-                "referenceLocator": "pkg:vcpkg/[email protected]#3?triplet=arm64-ohos-qt",
-            }
-        ]
-        entry = build_attribution(port, [], TRIPLET, False)
-        self.assertEqual(entry["Version"], "2.17.1")
-        self.assertEqual(entry["PURL"], "pkg:vcpkg/[email protected]#3?triplet=arm64-ohos-qt")
-
-    def test_missing_copyright_omits_license_file(self):
-        entry = build_attribution(FREETYPE_PORT, [FREETYPE_RESOURCE], TRIPLET, False)
-        self.assertNotIn("LicenseFile", entry)
-
-    def test_unusable_license_is_omitted(self):
-        port = dict(FREETYPE_PORT)
-        port["licenseConcluded"] = "LicenseRef-vcpkg-null"
-        entry = build_attribution(port, [], TRIPLET, False)
-        self.assertNotIn("License", entry)
-        self.assertNotIn("LicenseId", entry)
-
-    def test_ambiguous_resources_omit_download_location(self):
-        entry = build_attribution(
-            FREETYPE_PORT, [MESON_RESOURCE, FREETYPE_RESOURCE], TRIPLET, False
-        )
-        self.assertNotIn("DownloadLocation", entry)
-
-    def test_sparse_port_yields_minimal_entry(self):
-        port = {"name": "dirent", "SPDXID": "SPDXRef-port", "versionInfo": "1.26"}
-        entry = build_attribution(port, [], TRIPLET, False)
-        self.assertEqual(entry["Id"], "dirent")
-        self.assertEqual(entry["Version"], "1.26")
-        self.assertNotIn("Description", entry)
-        self.assertNotIn("Homepage", entry)
-        self.assertNotIn("License", entry)
-        self.assertNotIn("PURL", entry)
-
-
-class TestGenerate(unittest.TestCase):
-    def setUp(self):
-        self._temp = tempfile.TemporaryDirectory()
-        self.root = Path(self._temp.name)
-        self.addCleanup(self._temp.cleanup)
-
-    def _write_port(self, port_name, port_package, resources, list_lines=None, copyright_text=None):
-        port_dir = self.root / TRIPLET / "share" / port_name
-        port_dir.mkdir(parents=True)
-        document = {"packages": [port_package] + resources}
-        (port_dir / "vcpkg.spdx.json").write_text(json.dumps(document), encoding="utf-8")
-        if copyright_text is not None:
-            (port_dir / "copyright").write_text(copyright_text, encoding="utf-8")
-        if list_lines is not None:
-            info_dir = self.root / "vcpkg" / "info"
-            info_dir.mkdir(parents=True, exist_ok=True)
-            version = strip_port_version(port_package.get("versionInfo", "0"))
-            list_path = info_dir / f"{port_name}_{version}_{TRIPLET}.list"
-            list_path.write_text("\n".join(list_lines) + "\n", encoding="utf-8")
-
-    def test_writes_attribution_and_index(self):
-        self._write_port(
-            "freetype",
-            FREETYPE_PORT,
-            [FREETYPE_RESOURCE],
-            [
-                f"{TRIPLET}/lib/libfreetype.a",
-                f"{TRIPLET}/include/ft2build.h",
-                f"{TRIPLET}/share/freetype/copyright",
-            ],
-            copyright_text="FREETYPE LICENSES\n",
-        )
-
-        generate(self.root, TRIPLET, {"freetype": "freetype:freetype"})
-
-        attribution_path = self.root / TRIPLET / "share" / "freetype" / "qt_attribution.json"
-        entries = json.loads(attribution_path.read_text(encoding="utf-8"))
-        self.assertEqual(len(entries), 1)
-        self.assertEqual(entries[0]["Id"], "freetype")
-        self.assertEqual(entries[0]["Version"], "2.14.3")
-        self.assertEqual(entries[0]["LicenseFile"], "copyright")
-        self.assertEqual(
-            entries[0]["CPE"], "cpe:2.3:a:freetype:freetype:2.14.3:*:*:*:*:*:*:*"
-        )
-
-        index_path = self.root / TRIPLET / "share" / "qt_vcpkg_ports.json"
-        index = json.loads(index_path.read_text(encoding="utf-8"))
-        self.assertEqual(index, {"lib/libfreetype.a": "freetype"})
-
-    def test_metaport_is_skipped(self):
-        metaport = {
-            "name": "pthread",
-            "SPDXID": "SPDXRef-port",
-            "versionInfo": "3.0.0#2",
-            "licenseConcluded": "NOASSERTION",
-        }
-        self._write_port(
-            "pthread", metaport, [], [f"{TRIPLET}/share/pthread/vcpkg.spdx.json"]
-        )
-
-        generate(self.root, TRIPLET)
-
-        self.assertFalse(
-            (self.root / TRIPLET / "share" / "pthread" / "qt_attribution.json").exists()
-        )
-
-    def test_directory_without_spdx_document_is_ignored(self):
-        stray = self.root / TRIPLET / "share" / "unofficial-brotli"
-        stray.mkdir(parents=True)
-        (stray / "unofficial-brotli-config.cmake").write_text("", encoding="utf-8")
-        (self.root / "vcpkg" / "info").mkdir(parents=True)
-
-        generate(self.root, TRIPLET)
-
-        self.assertFalse((stray / "qt_attribution.json").exists())
-
-    def test_missing_list_file_emits_attribution_anyway(self):
-        # The core failure mode this script exists to fix: emit attribution
-        # even when the .list file is missing, so real libraries are not hidden.
-        # The info dir itself still exists here; only this one port's .list is missing.
-        (self.root / "vcpkg" / "info").mkdir(parents=True)
-        self._write_port(
-            "expat",
-            {
-                "name": "expat",
-                "SPDXID": "SPDXRef-port",
-                "versionInfo": "2.6.2",
-                "licenseConcluded": "MIT",
-            },
-            [],
-            list_lines=None,  # No .list file
-        )
-
-        generate(self.root, TRIPLET)
-
-        attribution_path = self.root / TRIPLET / "share" / "expat" / "qt_attribution.json"
-        self.assertTrue(attribution_path.exists())
-        entries = json.loads(attribution_path.read_text(encoding="utf-8"))
-        self.assertEqual(len(entries), 1)
-        self.assertEqual(entries[0]["Id"], "expat")
-
-        index_path = self.root / TRIPLET / "share" / "qt_vcpkg_ports.json"
-        index = json.loads(index_path.read_text(encoding="utf-8"))
-        self.assertEqual(index, {})  # No paths to index without .list file
-
-    def test_missing_info_dir_fails(self):
-        # Distinguish "no install database at all" from "one port is missing its
-        # .list": the former must fail loudly rather than silently emptying the
-        # index for every port, which is what Path.glob on a missing dir would do.
-        self._write_port(
-            "expat",
-            {
-                "name": "expat",
-                "SPDXID": "SPDXRef-port",
-                "versionInfo": "2.6.2",
-                "licenseConcluded": "MIT",
-            },
-            [],
-        )
-
-        with self.assertRaises(SystemExit):
-            generate(self.root, TRIPLET)
-
-
-if __name__ == "__main__":
-    unittest.main()
@@ -1,7 +1,7 @@
 set(VCPKG_ENV_PASSTHROUGH_UNTRACKED OHOS_SDK_ROOT)
 set(VCPKG_TARGET_ARCHITECTURE arm64)
 set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
 set(VCPKG_CMAKE_SYSTEM_NAME OHOS)
 set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-unknown-linux-ohos")
 set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DOHOS_ARCH=arm64-v8a -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON)
@@ -1,8 +0,0 @@
-set(VCPKG_ENV_PASSTHROUGH_UNTRACKED OHOS_SDK_ROOT)
-set(VCPKG_TARGET_ARCHITECTURE x64)
-set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_CMAKE_SYSTEM_NAME OHOS)
-set(VCPKG_MAKE_BUILD_TRIPLET "--host=x86_64-unknown-linux-ohos")
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DOHOS_ARCH=x86_64 -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON)
-set(VCPKG_BUILD_TYPE release)
@@ -3,7 +3,8 @@
  "default-registry": {
    "kind": "git",
    "repository": "https://git.qt.io/qtbuildsystem/vcpkg",
-    "baseline": "a3e9002baa5eb8ac3bd12ef85818ffe5c0c7322d"
+    "reference": "refs/tags/2026.05.05-ohos",
+    "baseline": "e59d4f2aeeb7f21a7d22b078111223ef71a509f2"
  },
  "overlay-triplets": [ "./../triplets" ]
 }
@@ -2,24 +2,18 @@
  "overrides": [
    {
      "name": "openssl",
-      "version": "3.5.4",
-      "port-version": 0
+      "version": "3.0.7",
+      "port-version": 2
    }
  ],
  "dependencies": [
    {
      "name": "openssl",
-      "platform": "!ohos & !android",
-      "features": [ "tools" ]
-    },
-    {
-      "name": "openssl",
-      "platform": "android"
+      "platform": "!ohos"
    },
    {
      "name": "protobuf",
-      "platform": "!osx & !ohos",
-      "features": [ "libprotoc" ]
+      "platform": "!osx & !ohos"
    },
    {
      "name": "protobuf",
@@ -1,290 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-"""Convert the SPDX documents vcpkg installs into qt_attribution.json files.
-
-vcpkg writes share/<port>/vcpkg.spdx.json for every installed port; Qt's SBOM
-machinery reads qt_attribution.json. Bridging the two gets vcpkg-provided
-third-party libraries into Qt's SBOM with license, version and provenance
-information, without duplicating that data in Qt repositories.
-
-vcpkg records no CPEs, so those are composed from the port name to vendor and
-product table in vcpkg_port_cpes.json.
-"""
-
-import argparse
-import json
-from pathlib import Path
-
-# vcpkg's markers for "no license recorded". The second one is what a port whose
-# manifest says "license": null produces.
-UNUSABLE_LICENSES = frozenset(["", "NOASSERTION", "NONE", "LicenseRef-vcpkg-null"])
-
-# A port that installs only into these provides nothing linkable.
-METADATA_DIRS = ("share/", "tools/")
-
-# Only these can show up as an IMPORTED_LOCATION, so only these go into the index.
-INDEXED_DIRS = ("lib/", "bin/")
-
-CPE_FILE = Path(__file__).resolve().with_name("vcpkg_port_cpes.json")
-
-
-def strip_port_version(version_info):
-    """Drop vcpkg's '#N' port-version suffix, keeping the upstream version.
-
-    The suffix is a packaging revision, so leaving it in would break version
-    matching against advisory data.
-    """
-    return version_info.split("#", 1)[0]
-
-
-def compose_cpe(vendor_product, version):
-    """Build a CPE 2.3 string for a 'vendor:product' pair at a given version.
-
-    The version is baked in instead of using Qt's $<VERSION> placeholder, which
-    is substituted with the version find_package reported. For libjpeg-turbo that
-    is libjpeg's API version 62, which would yield a CPE matching nothing.
-    """
-    if not vendor_product or not version:
-        return None
-    return f"cpe:2.3:a:{vendor_product}:{version}:*:*:*:*:*:*:*"
-
-
-def load_cpe_map(cpe_file):
-    """Read the port name to 'vendor:product' table used to compose CPEs."""
-    with open(cpe_file, encoding="utf-8") as handle:
-        return json.load(handle)["ports"]
-
-
-def normalize_license(expression):
-    """Return the SPDX license expression, or None when vcpkg recorded none."""
-    if expression is None or expression in UNUSABLE_LICENSES:
-        return None
-    return expression
-
-
-def find_purl(external_refs):
-    for reference in external_refs or []:
-        if reference.get("referenceType") == "purl":
-            return reference.get("referenceLocator")
-    return None
-
-
-def select_download_location(resources):
-    """Return the port's source URL, but only when it is unambiguous.
-
-    vcpkg lists downloads in the order they happened, so build tools, patches and
-    license files share the list with the source, and neither the first nor the
-    last entry identifies it. With one resource there is nothing to confuse.
-    """
-    if len(resources) != 1:
-        return None
-    return resources[0].get("downloadLocation") or None
-
-
-def _installed_paths(list_lines, triplet):
-    """Yield the prefix-relative path of every file in a vcpkg .list file."""
-    prefix = triplet + "/"
-    for line in list_lines:
-        entry = line.strip()
-        if not entry or entry.endswith("/") or not entry.startswith(prefix):
-            continue
-        yield entry[len(prefix):]
-
-
-def port_installs_files(list_lines, triplet):
-    """True when the port installs something outside share/ and tools/.
-
-    Metaports such as 'pthread' exist only to depend on other ports, so they can
-    never be linked and have no place in the SBOM.
-    """
-    for relative in _installed_paths(list_lines, triplet):
-        if not relative.startswith(METADATA_DIRS):
-            return True
-    return False
-
-
-def index_entries(list_lines, triplet, port_name):
-    """Map prefix-relative library paths to the port that owns them.
-
-    Keys are relative to the prefix so that the same index serves both layouts Qt
-    is configured against: the vcpkg installed tree and the flattened developer
-    archive, which both have lib/ directly under the prefix.
-    """
-    return {
-        relative: port_name
-        for relative in _installed_paths(list_lines, triplet)
-        if relative.startswith(INDEXED_DIRS)
-    }
-
-
-def build_attribution(port_package, resources, triplet, has_copyright, vendor_product=None):
-    """Map a vcpkg SPDXRef-port package onto a qt_attribution.json entry."""
-    name = port_package["name"]
-    entry = {
-        "Id": name,
-        "Name": name,
-        "QtUsage": (
-            f"Provided by vcpkg for the {triplet} triplet. "
-            "Linked into Qt when Qt is built against this vcpkg prefix."
-        ),
-    }
-
-    version = strip_port_version(port_package.get("versionInfo", ""))
-    if version:
-        entry["Version"] = version
-
-    for key, source_key in (("Description", "description"), ("Homepage", "homepage")):
-        value = port_package.get(source_key)
-        if value:
-            entry[key] = value
-
-    license_expression = normalize_license(port_package.get("licenseConcluded"))
-    if license_expression:
-        entry["License"] = license_expression
-        entry["LicenseId"] = license_expression
-
-    if has_copyright:
-        entry["LicenseFile"] = "copyright"
-
-    purl = find_purl(port_package.get("externalRefs"))
-    if purl:
-        entry["PURL"] = purl
-
-    cpe = compose_cpe(vendor_product, version)
-    if cpe:
-        entry["CPE"] = cpe
-
-    download_location = select_download_location(resources)
-    if download_location:
-        entry["DownloadLocation"] = download_location
-
-    return entry
-
-
-def read_port_document(spdx_path):
-    """Return the SPDXRef-port package and the resource packages of an SPDX document."""
-    with open(spdx_path, encoding="utf-8") as handle:
-        document = json.load(handle)
-
-    packages = document.get("packages", [])
-    port_package = next(
-        (package for package in packages if package.get("SPDXID") == "SPDXRef-port"), None
-    )
-    resources = [
-        package
-        for package in packages
-        if str(package.get("SPDXID", "")).startswith("SPDXRef-resource")
-    ]
-    return port_package, resources
-
-
-def find_list_file(info_dir, port_name, triplet):
-    """Locate a port's vcpkg .list file.
-
-    The file name omits the port-version altogether (fontconfig's SPDX document
-    says 'versionInfo: 2.17.1#3', but its .list file is
-    'fontconfig_2.17.1_arm64-ohos-qt.list'), so glob on the port and triplet
-    components instead of trying to reconstruct the exact file name.
-    """
-    matches = sorted(info_dir.glob(f"{port_name}_*_{triplet}.list"))
-    if len(matches) == 1:
-        return matches[0]
-    return None
-
-
-def generate(install_root, triplet, cpe_map=None):
-    share_dir = install_root / triplet / "share"
-    info_dir = install_root / "vcpkg" / "info"
-
-    if not share_dir.is_dir():
-        raise SystemExit(f"error: no such directory: {share_dir}")
-
-    # Path.glob on a missing directory silently yields nothing, which would otherwise make
-    # every port look like it has no .list file and write an empty index for the whole tree.
-    if not info_dir.is_dir():
-        raise SystemExit(f"error: no such directory: {info_dir}")
-
-    cpe_map = cpe_map or {}
-    index = {}
-    written = []
-    skipped = []
-    unusable_license = []
-    without_cpe = []
-
-    for spdx_path in sorted(share_dir.glob("*/vcpkg.spdx.json")):
-        port_dir = spdx_path.parent
-        port_package, resources = read_port_document(spdx_path)
-        if port_package is None:
-            raise SystemExit(f"error: no SPDXRef-port package in {spdx_path}")
-
-        port_name = port_package["name"]
-        list_file = find_list_file(info_dir, port_name, triplet)
-
-        if list_file is None:
-            # Emitting nothing would hide a real library, which is the very gap
-            # this script exists to close.
-            print(f"warning: no .list file for port '{port_name}' under {info_dir}")
-            list_lines = []
-        else:
-            list_lines = list_file.read_text(encoding="utf-8").splitlines()
-            if not port_installs_files(list_lines, triplet):
-                skipped.append(port_name)
-                continue
-            index.update(index_entries(list_lines, triplet, port_name))
-
-        entry = build_attribution(
-            port_package,
-            resources,
-            triplet,
-            (port_dir / "copyright").is_file(),
-            cpe_map.get(port_name),
-        )
-        if "License" not in entry:
-            unusable_license.append(port_name)
-        if "CPE" not in entry:
-            without_cpe.append(port_name)
-
-        with open(port_dir / "qt_attribution.json", "w", encoding="utf-8") as handle:
-            json.dump([entry], handle, indent=4, sort_keys=True)
-            handle.write("\n")
-        written.append(port_name)
-
-    with open(share_dir / "qt_vcpkg_ports.json", "w", encoding="utf-8") as handle:
-        json.dump(index, handle, indent=4, sort_keys=True)
-        handle.write("\n")
-
-    print(f"Wrote {len(written)} qt_attribution.json file(s) under {share_dir}")
-    print(f"Indexed {len(index)} installed librar(y/ies) in qt_vcpkg_ports.json")
-    if skipped:
-        print(f"Skipped {len(skipped)} port(s) installing no files: {', '.join(skipped)}")
-    if without_cpe:
-        print(f"No CPE for {len(without_cpe)} port(s): {', '.join(without_cpe)}")
-    for port_name in unusable_license:
-        print(f"warning: port '{port_name}' has no usable license expression")
-
-
-def main():
-    parser = argparse.ArgumentParser(description=__doc__)
-    parser.add_argument(
-        "--install-root",
-        required=True,
-        type=Path,
-        help="vcpkg install root, the directory holding <triplet>/ and vcpkg/info/",
-    )
-    parser.add_argument(
-        "--triplet", required=True, help="vcpkg triplet, for example arm64-ohos-qt"
-    )
-    arguments = parser.parse_args()
-
-    # Dropping CPEs on a missing table would silently defeat vulnerability scanning,
-    # which is the only thing that reads them.
-    if not CPE_FILE.is_file():
-        raise SystemExit(f"error: no such file: {CPE_FILE}")
-
-    generate(arguments.install_root.resolve(), arguments.triplet, load_cpe_map(CPE_FILE))
-
-
-if __name__ == "__main__":
-    main()
@@ -1,22 +0,0 @@
-{
-    "comment": [
-        "Maps a vcpkg port name to the CPE 2.3 vendor and product of the upstream project.",
-        "vcpkg records no CPEs, and Dependency-Track can only scan CPEs, so the attribution",
-        "generator composes one from this table and the port version.",
-        "brotli, fontconfig and icu were looked up in the NVD CPE dictionary at",
-        "https://services.nvd.nist.gov/rest/json/cpes/2.0?keywordSearch=<name> ; the others were",
-        "copied from the matching qt_attribution.json under qtbase/src/3rdparty.",
-        "Never guess an entry: the obvious icu:icu and fontconfig:fontconfig both match nothing in",
-        "NVD, and a CPE that matches nothing produces a clean scan that means nothing. A port that",
-        "is absent here gets no CPE at all, which is the safe outcome."
-    ],
-    "ports": {
-        "brotli": "google:brotli",
-        "fontconfig": "fontconfig_project:fontconfig",
-        "freetype": "freetype:freetype",
-        "icu": "icu-project:international_components_for_unicode",
-        "libjpeg-turbo": "libjpeg-turbo:libjpeg-turbo",
-        "libpng": "libpng:libpng",
-        "zlib": "zlib:zlib"
-    }
-}
--- a/Show More
+++ b/Show More