Update qtsaferenderer.yaml, add missing 'Target os' field

Add 'Target os' field for static configurations
to make sure targets are not overwritten when
exporting the integration.

Change-Id: Ib99f38f21c4324bf5ac8f8ef6d41e508aef9e7d7
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>

.gitmodules

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

.gitreview

@@ -1,4 +0,0 @@
-[gerrit]
-host=codereview.qt-project.org
-project=qt/qt5
-defaultbranch=dev

CMakeLists.txt

@@ -16,13 +16,9 @@ project(Qt
     VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt Libraries"
     HOMEPAGE_URL "https://qt.io/"
-    LANGUAGES CXX C
+    LANGUAGES CXX C ASM
 )
 
-if(UNIX AND NOT ANDROID)
-    enable_language(ASM)
-endif()
-
 qt_internal_top_level_setup_after_project()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

LICENSES/BSD-3-Clause.txt

@@ -1,9 +0,0 @@
-Copyright (c) <year> <owner>.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSES/GFDL-1.3-no-invariants-only.txt

@@ -1,451 +0,0 @@
-
-                GNU Free Documentation License
-                 Version 1.3, 3 November 2008
-
-
- Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
-     <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-functional and useful document "free" in the sense of freedom: to
-assure everyone the effective freedom to copy and redistribute it,
-with or without modifying it, either commercially or noncommercially.
-Secondarily, this License preserves for the author and publisher a way
-to get credit for their work, while not being considered responsible
-for modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work, in any medium, that
-contains a notice placed by the copyright holder saying it can be
-distributed under the terms of this License.  Such a notice grants a
-world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The "Document", below,
-refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as "you".  You accept the license if you
-copy, modify or distribute the work in a way requiring permission
-under copyright law.
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.  If a
-section does not fit the above definition of Secondary then it is not
-allowed to be designated as Invariant.  The Document may contain zero
-Invariant Sections.  If the Document does not identify any Invariant
-Sections then there are none.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.  A Front-Cover Text may
-be at most 5 words, and a Back-Cover Text may be at most 25 words.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, that is suitable for revising the document
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup, or absence of markup, has been arranged to thwart
-or discourage subsequent modification by readers is not Transparent.
-An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML, PostScript or PDF designed for human modification.  Examples of
-transparent image formats include PNG, XCF and JPG.  Opaque formats
-include proprietary formats that can be read and edited only by
-proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML, PostScript or PDF produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-The "publisher" means any person or entity that distributes copies of
-the Document to the public.
-
-A section "Entitled XYZ" means a named subunit of the Document whose
-title either is precisely XYZ or contains XYZ in parentheses following
-text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as "Acknowledgements",
-"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
-of such a section when you modify the Document means that it remains a
-section "Entitled XYZ" according to this definition.
-
-The Document may include Warranty Disclaimers next to the notice which
-states that this License applies to the Document.  These Warranty
-Disclaimers are considered to be included by reference in this
-License, but only as regards disclaiming warranties: any other
-implication that these Warranty Disclaimers may have is void and has
-no effect on the meaning of this License.
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no
-other conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies (or copies in media that commonly have
-printed covers) of the Document, numbering more than 100, and the
-Document's license notice requires Cover Texts, you must enclose the
-copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a computer-network location from which the general network-using
-public has access to download using public-standard network protocols
-a complete Transparent copy of the Document, free of added material.
-If you use the latter option, you must take reasonably prudent steps,
-when you begin distribution of Opaque copies in quantity, to ensure
-that this Transparent copy will remain thus accessible at the stated
-location until at least one year after the last time you distribute an
-Opaque copy (directly or through your agents or retailers) of that
-edition to the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to
-give them a chance to provide you with an updated version of the
-Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has fewer than five),
-   unless they release you from this requirement.
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section Entitled "History", Preserve its Title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section Entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. For any section Entitled "Acknowledgements" or "Dedications",
-   Preserve the Title of the section, and preserve in the section all
-   the substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section Entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section to be Entitled "Endorsements"
-   or to conflict in title with any Invariant Section.
-O. Preserve any Warranty Disclaimers.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section Entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice, and that you preserve all their Warranty Disclaimers.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections Entitled "History"
-in the various original documents, forming one section Entitled
-"History"; likewise combine any sections Entitled "Acknowledgements",
-and any sections Entitled "Dedications".  You must delete all sections
-Entitled "Endorsements".
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other
-documents released under this License, and replace the individual
-copies of this License in the various documents with a single copy
-that is included in the collection, provided that you follow the rules
-of this License for verbatim copying of each of the documents in all
-other respects.
-
-You may extract a single document from such a collection, and
-distribute it individually under this License, provided you insert a
-copy of this License into the extracted document, and follow this
-License in all other respects regarding verbatim copying of that
-document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an "aggregate" if the copyright
-resulting from the compilation is not used to limit the legal rights
-of the compilation's users beyond what the individual works permit.
-When the Document is included in an aggregate, this License does not
-apply to the other works in the aggregate which are not themselves
-derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one half of
-the entire aggregate, the Document's Cover Texts may be placed on
-covers that bracket the Document within the aggregate, or the
-electronic equivalent of covers if the Document is in electronic form.
-Otherwise they must appear on printed covers that bracket the whole
-aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License, and all the license notices in the
-Document, and any Warranty Disclaimers, provided that you also include
-the original English version of this License and the original versions
-of those notices and disclaimers.  In case of a disagreement between
-the translation and the original version of this License or a notice
-or disclaimer, the original version will prevail.
-
-If a section in the Document is Entitled "Acknowledgements",
-"Dedications", or "History", the requirement (section 4) to Preserve
-its Title (section 1) will typically require changing the actual
-title.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense, or distribute it is void, and
-will automatically terminate your rights under this License.
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, receipt of a copy of some or all of the same material does
-not give you any rights to use it.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions of the
-GNU Free Documentation License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in
-detail to address new problems or concerns.  See
-https://www.gnu.org/licenses/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.  If the Document
-specifies that a proxy can decide which future versions of this
-License can be used, that proxy's public statement of acceptance of a
-version permanently authorizes you to choose that version for the
-Document.
-
-11. RELICENSING
-
-"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
-World Wide Web server that publishes copyrightable works and also
-provides prominent facilities for anybody to edit those works.  A
-public wiki that anybody can edit is an example of such a server.  A
-"Massive Multiauthor Collaboration" (or "MMC") contained in the site
-means any set of copyrightable works thus published on the MMC site.
-
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
-published by that same organization.
-
-"Incorporate" means to publish or republish a Document, in whole or in
-part, as part of another Document.
-
-An MMC is "eligible for relicensing" if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole or
-in part into the MMC, (1) had no cover texts or invariant sections, and
-(2) were thus incorporated prior to November 1, 2008.
-
-The operator of an MMC Site may republish an MMC contained in the site
-under CC-BY-SA on the same site at any time before August 1, 2009,
-provided the MMC is eligible for relicensing.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c)  YEAR  YOUR NAME.
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the "with...Texts." line with this:
-
-    with the Invariant Sections being LIST THEIR TITLES, with the
-    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-
-If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.

README.md

@@ -29,7 +29,7 @@ Windows:
 
 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)
+ * Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 11.2 or later)
  * Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
 
 ```

REUSE.toml

@@ -1,39 +0,0 @@
-version = 1
-
-[[annotations]]
-path = ["tests/**"]
-comment = "tests"
-precedence = "closest"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
-SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only"
-
-[[annotations]]
-path = ["coin/**", "cmake/**", "**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml",
-        "coin/axivion/ci_config_linux.json",
-        "**.cfg", "**.plist", "**.pri", "**.prf", "configure.json"]
-precedence = "closest"
-comment = "build system"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-[[annotations]]
-path = [".tag", "**/.gitattributes", "**.gitignore",
-        ".gitmodules"]
-precedence = "closest"
-comment = "version control system. Licensed as build system"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
-SPDX-License-Identifier = "BSD-3-Clause"
-
-[[annotations]]
-path = ["**README*", "CONTRIBUTING.md", ".commit-template", ".github/pull_request_template.md"]
-comment = "documentation"
-precedence = "closest"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
-SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"
-
-[[annotations]]
-path = ["**.toml", "licenseRule.json"]
-comment = "documentation"
-precedence = "override"
-SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd."
-SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"

_clang-format

@@ -1,5 +1,7 @@
 # Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
-# SPDX-License-Identifier: BSD-3-Clause
+#
+# You may use this file under the terms of the 3-clause BSD license.
+# See the file LICENSE from this package for details.
 
 # This is the clang-format configuration style to be used by Qt,
 # based on the rules from https://wiki.qt.io/Qt_Coding_Style and
@@ -104,9 +106,6 @@ AlignEscapedNewlines: Left
 # initializer list in list-initialization.
 SpaceBeforeCpp11BracedList: false
 
-# Do not reflow any comment
-ReflowComments: false
-
 ---
 # Use the Google-based style for .proto files.
 Language: Proto

cmake/3rdparty/cmake/Copyright.txt

@@ -0,0 +1,136 @@
+CMake - Cross Platform Makefile Generator
+Copyright 2000-2024 Kitware, Inc. and Contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+* Neither the name of Kitware, Inc. nor the names of Contributors
+  may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+------------------------------------------------------------------------------
+
+The following individuals and institutions are among the Contributors:
+
+* Aaron C. Meadows <cmake@shadowguarddev.com>
+* Adriaan de Groot <groot@kde.org>
+* Aleksey Avdeev <solo@altlinux.ru>
+* Alexander Neundorf <neundorf@kde.org>
+* Alexander Smorkalov <alexander.smorkalov@itseez.com>
+* Alexey Sokolov <sokolov@google.com>
+* Alex Merry <alex.merry@kde.org>
+* Alex Turbov <i.zaufi@gmail.com>
+* Andreas Pakulat <apaku@gmx.de>
+* Andreas Schneider <asn@cryptomilk.org>
+* André Rigland Brodtkorb <Andre.Brodtkorb@ifi.uio.no>
+* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
+* Benjamin Eikel
+* Bjoern Ricks <bjoern.ricks@gmail.com>
+* Brad Hards <bradh@kde.org>
+* Christopher Harvey
+* Christoph Grüninger <foss@grueninger.de>
+* Clement Creusot <creusot@cs.york.ac.uk>
+* Daniel Blezek <blezek@gmail.com>
+* Daniel Pfeifer <daniel@pfeifer-mail.de>
+* Dawid Wróbel <me@dawidwrobel.com>
+* Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+* Eran Ifrah <eran.ifrah@gmail.com>
+* Esben Mose Hansen, Ange Optimization ApS
+* Geoffrey Viola <geoffrey.viola@asirobots.com>
+* Google Inc
+* Gregor Jasny
+* Helio Chissini de Castro <helio@kde.org>
+* Ilya Lavrenov <ilya.lavrenov@itseez.com>
+* Insight Software Consortium <insightsoftwareconsortium.org>
+* Intel Corporation <www.intel.com>
+* Jan Woetzel
+* Jordan Williams <jordan@jwillikers.com>
+* Julien Schueller
+* Kelly Thompson <kgt@lanl.gov>
+* Konstantin Podsvirov <konstantin@podsvirov.pro>
+* Laurent Montel <montel@kde.org>
+* Mario Bensi <mbensi@ipsquad.net>
+* Martin Gräßlin <mgraesslin@kde.org>
+* Mathieu Malaterre <mathieu.malaterre@gmail.com>
+* Matthaeus G. Chajdas
+* Matthias Kretz <kretz@kde.org>
+* Matthias Maennich <matthias@maennich.net>
+* Michael Hirsch, Ph.D. <www.scivision.co>
+* Michael Stürmer
+* Miguel A. Figueroa-Villanueva
+* Mike Durso <rbprogrammer@gmail.com>
+* Mike Jackson
+* Mike McQuaid <mike@mikemcquaid.com>
+* Nicolas Bock <nicolasbock@gmail.com>
+* Nicolas Despres <nicolas.despres@gmail.com>
+* Nikita Krupen'ko <krnekit@gmail.com>
+* NVIDIA Corporation <www.nvidia.com>
+* OpenGamma Ltd. <opengamma.com>
+* Patrick Stotko <stotko@cs.uni-bonn.de>
+* Per Øyvind Karlsen <peroyvind@mandriva.org>
+* Peter Collingbourne <peter@pcc.me.uk>
+* Petr Gotthard <gotthard@honeywell.com>
+* Philip Lowman <philip@yhbt.com>
+* Philippe Proulx <pproulx@efficios.com>
+* Raffi Enficiaud, Max Planck Society
+* Raumfeld <raumfeld.com>
+* Roger Leigh <rleigh@codelibre.net>
+* Rolf Eike Beer <eike@sf-mail.de>
+* Roman Donchenko <roman.donchenko@itseez.com>
+* Roman Kharitonov <roman.kharitonov@itseez.com>
+* Ruslan Baratov
+* Sebastian Holtermann <sebholt@xwmw.org>
+* Stephen Kelly <steveire@gmail.com>
+* Sylvain Joubert <joubert.sy@gmail.com>
+* The Qt Company Ltd.
+* Thomas Sondergaard <ts@medical-insight.com>
+* Tobias Hunger <tobias.hunger@qt.io>
+* Todd Gamblin <tgamblin@llnl.gov>
+* Tristan Carel
+* University of Dundee
+* Vadim Zhukov
+* Will Dicharry <wdicharry@stellarscience.com>
+
+See version control history for details of individual contributions.
+
+The above copyright and license notice applies to distributions of
+CMake in source and binary form.  Third-party software packages supplied
+with CMake under compatible licenses provide their own copyright notices
+documented in corresponding subdirectories or source files.
+
+------------------------------------------------------------------------------
+
+CMake was initially developed by Kitware with the following sponsorship:
+
+ * National Library of Medicine at the National Institutes of Health
+   as part of the Insight Segmentation and Registration Toolkit (ITK).
+
+ * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
+   Visualization Initiative.
+
+ * National Alliance for Medical Image Computing (NAMIC) is funded by the
+   National Institutes of Health through the NIH Roadmap for Medical Research,
+   Grant U54 EB005149.
+
+ * Kitware, Inc.

cmake/3rdparty/cmake/QtIRRunCMake.cmake

@@ -0,0 +1,349 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+#
+# Original file location was Tests/RunCMake/RunCMake.cmake
+
+foreach(
+  arg
+  IN ITEMS
+    RunCMake_GENERATOR
+    RunCMake_SOURCE_DIR
+    RunCMake_BINARY_DIR
+  )
+  if(NOT DEFINED ${arg})
+    message(FATAL_ERROR "${arg} not given!")
+  endif()
+endforeach()
+
+function(run_cmake test)
+  if(DEFINED ENV{RunCMake_TEST_FILTER})
+    set(test_and_variant "${test}${RunCMake_TEST_VARIANT_DESCRIPTION}")
+    if(NOT test_and_variant MATCHES "$ENV{RunCMake_TEST_FILTER}")
+      return()
+    endif()
+    unset(test_and_variant)
+  endif()
+
+  set(top_src "${RunCMake_SOURCE_DIR}")
+  set(top_bin "${RunCMake_BINARY_DIR}")
+  if(EXISTS ${top_src}/${test}-result.txt)
+    file(READ ${top_src}/${test}-result.txt expect_result)
+    string(REGEX REPLACE "\n+$" "" expect_result "${expect_result}")
+  elseif(DEFINED RunCMake_TEST_EXPECT_RESULT)
+    set(expect_result "${RunCMake_TEST_EXPECT_RESULT}")
+  else()
+    set(expect_result 0)
+  endif()
+
+  string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} platform_name)
+  #remove all additional bits from cygwin/msys name
+  if(platform_name MATCHES cygwin)
+    set(platform_name cygwin)
+  endif()
+  if(platform_name MATCHES msys)
+    set(platform_name msys)
+  endif()
+
+  foreach(o IN ITEMS stdout stderr config)
+    if(RunCMake-${o}-file AND EXISTS ${top_src}/${RunCMake-${o}-file})
+      file(READ ${top_src}/${RunCMake-${o}-file} expect_${o})
+      string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}")
+    elseif(EXISTS ${top_src}/${test}-${o}-${platform_name}.txt)
+      file(READ ${top_src}/${test}-${o}-${platform_name}.txt expect_${o})
+      string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}")
+    elseif(EXISTS ${top_src}/${test}-${o}.txt)
+      file(READ ${top_src}/${test}-${o}.txt expect_${o})
+      string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}")
+    elseif(DEFINED RunCMake_TEST_EXPECT_${o})
+      string(REGEX REPLACE "\n+$" "" expect_${o} "${RunCMake_TEST_EXPECT_${o}}")
+    else()
+      unset(expect_${o})
+    endif()
+  endforeach()
+  foreach(o IN ITEMS stdout stderr config)
+    if(DEFINED RunCMake_TEST_NOT_EXPECT_${o})
+      string(REGEX REPLACE "\n+$" "" not_expect_${o} "${RunCMake_TEST_NOT_EXPECT_${o}}")
+    endif()
+  endforeach()
+  if (NOT expect_stderr)
+    if (NOT RunCMake_DEFAULT_stderr)
+      set(RunCMake_DEFAULT_stderr "^$")
+    endif()
+    set(expect_stderr ${RunCMake_DEFAULT_stderr})
+  endif()
+
+  if (NOT RunCMake_TEST_SOURCE_DIR)
+    set(RunCMake_TEST_SOURCE_DIR "${top_src}")
+  endif()
+  if(NOT RunCMake_TEST_BINARY_DIR)
+    set(RunCMake_TEST_BINARY_DIR "${top_bin}/${test}-build")
+  endif()
+  if(NOT RunCMake_TEST_NO_CLEAN)
+    file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
+  endif()
+  file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  if(RunCMake-prep-file AND EXISTS ${top_src}/${RunCMake-prep-file})
+    include(${top_src}/${RunCMake-prep-file})
+  else()
+    include(${top_src}/${test}-prep.cmake OPTIONAL)
+  endif()
+  if(RunCMake_TEST_OUTPUT_MERGE)
+    set(actual_stderr_var actual_stdout)
+    set(actual_stderr "")
+  else()
+    set(actual_stderr_var actual_stderr)
+  endif()
+  if(DEFINED RunCMake_TEST_TIMEOUT)
+    set(maybe_timeout TIMEOUT ${RunCMake_TEST_TIMEOUT})
+  else()
+    set(maybe_timeout "")
+  endif()
+  if(RunCMake-stdin-file AND EXISTS ${top_src}/${RunCMake-stdin-file})
+    set(maybe_input_file INPUT_FILE ${top_src}/${RunCMake-stdin-file})
+  elseif(EXISTS ${top_src}/${test}-stdin.txt)
+    set(maybe_input_file INPUT_FILE ${top_src}/${test}-stdin.txt)
+  else()
+    set(maybe_input_file "")
+  endif()
+  if(NOT RunCMake_TEST_COMMAND)
+    if(NOT DEFINED RunCMake_TEST_OPTIONS)
+      set(RunCMake_TEST_OPTIONS "")
+    endif()
+    if(APPLE)
+      list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW)
+    endif()
+    if(RunCMake_TEST_LCC AND NOT RunCMake_TEST_NO_CMP0129)
+      list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0129=NEW)
+    endif()
+    if(RunCMake_MAKE_PROGRAM)
+      list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}")
+    endif()
+    set(RunCMake_TEST_COMMAND ${CMAKE_COMMAND})
+    if(NOT RunCMake_TEST_NO_SOURCE_DIR)
+      list(APPEND RunCMake_TEST_COMMAND "${RunCMake_TEST_SOURCE_DIR}")
+    endif()
+    list(APPEND RunCMake_TEST_COMMAND -G "${RunCMake_GENERATOR}")
+    if(RunCMake_GENERATOR_PLATFORM)
+      list(APPEND RunCMake_TEST_COMMAND -A "${RunCMake_GENERATOR_PLATFORM}")
+    endif()
+    if(RunCMake_GENERATOR_TOOLSET)
+      list(APPEND RunCMake_TEST_COMMAND -T "${RunCMake_GENERATOR_TOOLSET}")
+    endif()
+    if(RunCMake_GENERATOR_INSTANCE)
+      list(APPEND RunCMake_TEST_COMMAND "-DCMAKE_GENERATOR_INSTANCE=${RunCMake_GENERATOR_INSTANCE}")
+    endif()
+    list(APPEND RunCMake_TEST_COMMAND
+      -DRunCMake_TEST=${test}
+      --no-warn-unused-cli
+      )
+  else()
+    set(RunCMake_TEST_OPTIONS "")
+  endif()
+  if(NOT DEFINED RunCMake_TEST_RAW_ARGS)
+    set(RunCMake_TEST_RAW_ARGS "")
+  endif()
+  if(NOT RunCMake_TEST_COMMAND_WORKING_DIRECTORY)
+    set(RunCMake_TEST_COMMAND_WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
+  endif()
+  string(CONCAT _code [[execute_process(
+    COMMAND ${RunCMake_TEST_COMMAND}
+            ${RunCMake_TEST_OPTIONS}
+            ]] "${RunCMake_TEST_RAW_ARGS}\n" [[
+    WORKING_DIRECTORY "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}"
+    OUTPUT_VARIABLE actual_stdout
+    ERROR_VARIABLE ${actual_stderr_var}
+    RESULT_VARIABLE actual_result
+    ENCODING UTF8
+    ${maybe_timeout}
+    ${maybe_input_file}
+    )]])
+  if(DEFINED ENV{PWD})
+    set(old_pwd "$ENV{PWD}")
+  else()
+    set(old_pwd)
+  endif()
+  # Emulate a shell using this directory.
+  set(ENV{PWD} "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}")
+  cmake_language(EVAL CODE "${_code}")
+  if(DEFINED old_pwd)
+    set(ENV{PWD} "${old_pwd}")
+  else()
+    set(ENV{PWD})
+  endif()
+  set(msg "")
+  if(NOT "${actual_result}" MATCHES "${expect_result}")
+    string(APPEND msg "Result is [${actual_result}], not [${expect_result}].\n")
+  endif()
+  set(config_file "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}/CMakeFiles/CMakeConfigureLog.yaml")
+  if(EXISTS "${config_file}")
+    file(READ "${config_file}" actual_config)
+  else()
+    set(actual_config "")
+  endif()
+
+  # Special case: remove ninja no-op line from stderr, but not stdout.
+  # Test cases that look for it should use RunCMake_TEST_OUTPUT_MERGE.
+  string(REGEX REPLACE "(^|\r?\n)ninja: no work to do\\.\r?\n" "\\1" actual_stderr "${actual_stderr}")
+
+  # Remove incidental content from both stdout and stderr.
+  string(CONCAT ignore_line_regex
+    "(^|\n)((==[0-9]+=="
+    "|BullseyeCoverage"
+    "|[a-z]+\\([0-9]+\\) malloc:"
+    "|clang[^:]*: warning: the object size sanitizer has no effect at -O0, but is explicitly enabled:"
+    "|flang-new: warning: argument unused during compilation: .-flang-experimental-exec."
+    "|icp?x: remark: Note that use of .-g. without any optimization-level option will turn off most compiler optimizations"
+    "|ifx: remark #10440: Note that use of a debug option without any optimization-level option will turnoff most compiler optimizations"
+    "|lld-link: warning: procedure symbol record for .* refers to PDB item index [0-9A-Fa-fx]+ which is not a valid function ID record"
+    "|Error kstat returned"
+    "|Hit xcodebuild bug"
+    "|Recompacting log\\.\\.\\."
+
+    "|LICENSE WARNING:"
+    "|Your license to use PGI[^\n]*expired"
+    "|Please obtain a new version at"
+    "|contact PGI Sales at"
+    "|ic(p?c|l): remark #10441: The Intel\\(R\\) C\\+\\+ Compiler Classic \\(ICC\\) is deprecated"
+
+    "|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:"
+    "|[^\n]*(createItemModels|_NSMainThread|Please file a bug at)"
+    "|[^\n]*xcodebuild[^\n]*DVTAssertions: Warning"
+    "|[^\n]*xcodebuild[^\n]*DVTCoreDeviceEnabledState: DVTCoreDeviceEnabledState_Disabled set via user default"
+    "|[^\n]*xcodebuild[^\n]*DVTPlugInManager"
+    "|[^\n]*xcodebuild[^\n]*DVTSDK: Warning: SDK path collision for path"
+    "|[^\n]*xcodebuild[^\n]*Requested but did not find extension point with identifier"
+    "|[^\n]*xcodebuild[^\n]*nil host used in call to allows.*HTTPSCertificateForHost"
+    "|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type"
+    "|[^\n]*objc[^\n]*: Class [^\n]* One of the two will be used. Which one is undefined."
+    "|[^\n]*is a member of multiple groups"
+    "|[^\n]*offset in archive not a multiple of 8"
+    "|[^\n]*from Time Machine by path"
+    "|[^\n]*Bullseye Testing Technology"
+    ${RunCMake_TEST_EXTRA_IGNORE_LINE_REGEX}
+    ")[^\n]*\n)+"
+    )
+  if(RunCMake_IGNORE_POLICY_VERSION_DEPRECATION)
+    string(REGEX REPLACE [[
+^CMake Deprecation Warning at [^
+]*CMakeLists.txt:1 \(cmake_minimum_required\):
+  Compatibility with CMake < 3\.5 will be removed from a future version of
+  CMake.
+
+  Update the VERSION argument <min> value or use a \.\.\.<max> suffix to tell
+  CMake that the project does not need compatibility with older versions\.
++
+]] "" actual_stderr "${actual_stderr}")
+  endif()
+  foreach(o IN ITEMS stdout stderr config)
+    string(REGEX REPLACE "\r\n" "\n" actual_${o} "${actual_${o}}")
+    string(REGEX REPLACE "${ignore_line_regex}" "\\1" actual_${o} "${actual_${o}}")
+    string(REGEX REPLACE "\n+$" "" actual_${o} "${actual_${o}}")
+    if(DEFINED expect_${o})
+      if(NOT "${actual_${o}}" MATCHES "${expect_${o}}")
+        string(APPEND msg "${o} does not match that expected.\n")
+      endif()
+    endif()
+    if(DEFINED not_expect_${o})
+      if("${actual_${o}}" MATCHES "${not_expect_${o}}")
+        string(APPEND msg "${o} matches that not expected.\n")
+      endif()
+    endif()
+  endforeach()
+  unset(RunCMake_TEST_FAILED)
+  if(RunCMake-check-file AND EXISTS ${top_src}/${RunCMake-check-file})
+    include(${top_src}/${RunCMake-check-file})
+  else()
+    include(${top_src}/${test}-check.cmake OPTIONAL)
+  endif()
+  if(RunCMake_TEST_FAILED)
+    set(msg "${RunCMake_TEST_FAILED}\n${msg}")
+  endif()
+  if(msg)
+    string(REPLACE ";" "\" \"" command "\"${RunCMake_TEST_COMMAND}\"")
+    if(RunCMake_TEST_OPTIONS)
+      string(REPLACE ";" "\" \"" options "\"${RunCMake_TEST_OPTIONS}\"")
+      string(APPEND command " ${options}")
+    endif()
+    if(RunCMake_TEST_RAW_ARGS)
+      string(APPEND command " ${RunCMake_TEST_RAW_ARGS}")
+    endif()
+    string(APPEND msg "Command was:\n command> ${command}\n")
+  endif()
+  if(msg)
+    foreach(o IN ITEMS stdout stderr config)
+      if(DEFINED expect_${o})
+        string(REGEX REPLACE "\n" "\n expect-${o}> " expect_${o} " expect-${o}> ${expect_${o}}")
+        string(APPEND msg "Expected ${o} to match:\n${expect_${o}}\n")
+      endif()
+      if(NOT o STREQUAL "config" OR DEFINED expect_${o})
+        string(REGEX REPLACE "\n" "\n actual-${o}> " actual_${o} " actual-${o}> ${actual_${o}}")
+        string(APPEND msg "Actual ${o}:\n${actual_${o}}\n")
+      endif()
+    endforeach()
+    message(SEND_ERROR "${test}${RunCMake_TEST_VARIANT_DESCRIPTION} - FAILED:\n${msg}")
+  else()
+    message(STATUS "${test}${RunCMake_TEST_VARIANT_DESCRIPTION} - PASSED")
+  endif()
+endfunction()
+
+function(run_cmake_command test)
+  set(RunCMake_TEST_COMMAND "${ARGN}")
+  run_cmake(${test})
+endfunction()
+
+function(run_cmake_script test)
+  set(RunCMake_TEST_COMMAND ${CMAKE_COMMAND} ${ARGN} -P ${RunCMake_SOURCE_DIR}/${test}.cmake)
+  run_cmake(${test})
+endfunction()
+
+function(run_cmake_with_options test)
+  set(RunCMake_TEST_OPTIONS "${ARGN}")
+  run_cmake(${test})
+endfunction()
+
+function(run_cmake_with_raw_args test args)
+  set(RunCMake_TEST_RAW_ARGS "${args}")
+  run_cmake(${test})
+endfunction()
+
+function(ensure_files_match expected_file actual_file)
+  if(NOT EXISTS "${expected_file}")
+    message(FATAL_ERROR "Expected file does not exist:\n  ${expected_file}")
+  endif()
+  if(NOT EXISTS "${actual_file}")
+    message(FATAL_ERROR "Actual file does not exist:\n  ${actual_file}")
+  endif()
+  file(READ "${expected_file}" expected_file_content)
+  file(READ "${actual_file}" actual_file_content)
+  if(NOT "${expected_file_content}" STREQUAL "${actual_file_content}")
+    message(FATAL_ERROR "Actual file content does not match expected:\n
+    \n
+      expected file: ${expected_file}\n
+      expected content:\n
+      ${expected_file_content}\n
+    \n
+      actual file: ${actual_file}\n
+      actual content:\n
+      ${actual_file_content}\n
+    ")
+  endif()
+endfunction()
+
+# Get the user id on unix if possible.
+function(get_unix_uid var)
+  set("${var}" "" PARENT_SCOPE)
+  if(UNIX)
+    set(ID "id")
+    if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND EXISTS "/usr/xpg4/bin/id")
+      set (ID "/usr/xpg4/bin/id")
+    endif()
+    execute_process(COMMAND ${ID} -u $ENV{USER} OUTPUT_VARIABLE uid ERROR_QUIET
+                    RESULT_VARIABLE status OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(status EQUAL 0)
+      set("${var}" "${uid}" PARENT_SCOPE)
+    endif()
+  endif()
+endfunction()
+
+# Protect RunCMake tests from calling environment.
+unset(ENV{MAKEFLAGS})

cmake/3rdparty/cmake/QtIRTestHelpers.cmake

@@ -0,0 +1,39 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+#
+# Original file location was Tests/RunCMake/CMakeLists.txt
+
+macro(add_RunCMake_test test)
+  set(TEST_ARGS ${ARGN})
+  if ("${ARGV1}" STREQUAL "TEST_DIR")
+    if ("${ARGV2}" STREQUAL "")
+      message(FATAL_ERROR "Invalid args")
+    endif()
+    set(Test_Dir ${ARGV2})
+    list(REMOVE_AT TEST_ARGS 0)
+    list(REMOVE_AT TEST_ARGS 0)
+  else()
+    set(Test_Dir ${test})
+  endif()
+  if(CMAKE_C_COMPILER_ID STREQUAL "LCC")
+    list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1)
+  endif()
+  add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND}
+    -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
+    -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig}
+    -DRunCMake_GENERATOR=${CMAKE_GENERATOR}
+    -DRunCMake_GENERATOR_INSTANCE=${CMAKE_GENERATOR_INSTANCE}
+    -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+    -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET}
+    -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
+    -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
+    -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+    ${${test}_ARGS}
+    ${TEST_ARGS}
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake"
+    )
+  set_tests_properties("RunCMake.${test}" PROPERTIES LABELS "CMake;run")
+  if(${test} MATCHES ^CMP)
+    set_property(TEST "RunCMake.${test}" APPEND PROPERTY LABELS "policy")
+  endif()
+endmacro()

cmake/3rdparty/cmake/qt_attribution.json

@@ -0,0 +1,16 @@
+{
+    "Id": "cmake-test-modules",
+    "Name": "cmake-test-modules",
+    "QDocModule": "qtcore",
+    "QtUsage": "Used as part of the build system.",
+    "QtParts" : [ "tests" ],
+
+    "Description": "CMake helpers for running CMake tests.",
+    "Homepage": "https://cmake.org/",
+    "Version": "3.29.0",
+
+    "License": "BSD 3-Clause \"New\" or \"Revised\" License",
+    "LicenseId": "BSD-3-Clause",
+    "LicenseFile": "Copyright.txt",
+    "Copyright": "Copyright © 2000-2024 Kitware, Inc. and Contributors"
+}

cmake/QtIRCommandLineHelpers.cmake

@@ -421,19 +421,3 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
     endif()
     set(${out_var} "${cmake_option}" PARENT_SCOPE)
 endfunction()
-
-# Get the value of a command line option as existing absolute path.
-# Yield error if the path does not exist.
-# Convert to absolute path if necessary.
-function(qt_ir_get_option_as_existing_absolute_path name value)
-    qt_ir_get_option_value("${name}" path)
-    if(NOT "${path}" STREQUAL "")
-        if(NOT EXISTS "${path}")
-            qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
-        endif()
-        if(NOT IS_ABSOLUTE "${path}")
-            get_filename_component(path "${path}" ABSOLUTE)
-        endif()
-    endif()
-    set("${value}" "${path}" PARENT_SCOPE)
-endfunction()

cmake/QtIRGitHelpers.cmake

@@ -93,42 +93,24 @@ function(qt_ir_run_git_submodule_init submodules working_directory)
     qt_ir_setup_commit_template("${working_directory}" "${working_directory}")
 endfunction()
 
-# Add gerrit remotes to the repository located in the working_directory.
-# repo_relative_url is the relative URL of the repository.
-# Examples:
-# - qt5
-# - qttools.git
-# - ../playground/qlitehtml.git
-# - ../qt/qttools-litehtml.git
-function(qt_ir_add_git_remotes repo_relative_url working_directory)
-    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
-    set(gerrit_https_base "https://@USER@codereview.qt-project.org@AUTH@/")
+# Add gerrit remotes to the repository.
+function(qt_ir_add_git_remotes repo_name working_directory)
+    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/")
+    set(gerrit_repo_url "${gerrit_ssh_base}")
 
     qt_ir_get_option_value(codereview-username username)
-    qt_ir_get_option_value(codereview-https https)
-
-    if(https)
-        set(gerrit_repo_url "${gerrit_https_base}")
-    else()
-        set(gerrit_repo_url "${gerrit_ssh_base}")
-    endif()
 
     # If given a username, make a "verbose" remote.
     # Otherwise, rely on proper SSH configuration.
     if(username)
         string(REPLACE "@USER@" "${username}@" gerrit_repo_url "${gerrit_repo_url}")
         string(REPLACE "@PORT@" ":29418" gerrit_repo_url "${gerrit_repo_url}")
-        string(REPLACE "@AUTH@" "/a" gerrit_repo_url "${gerrit_repo_url}")
     else()
         string(REPLACE "@USER@" "" gerrit_repo_url "${gerrit_repo_url}")
         string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
-        string(REPLACE "@AUTH@" ""   gerrit_repo_url "${gerrit_repo_url}")
     endif()
 
-    set(namespace "qt")
-    set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}")
-    qt_ir_normalize_git_url("${repo_relative_url_with_namespace}" normalized_url)
-    string(APPEND gerrit_repo_url "${normalized_url}")
+    string(APPEND gerrit_repo_url "${repo_name}")
 
     qt_ir_execute_process_and_log_and_handle_error(
         COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}"
@@ -211,21 +193,15 @@ function(qt_ir_clone_one_submodule submodule_name)
     set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}")
 
     set(submodule_url "${submodule_base_git_path}")
-    qt_ir_parse_git_url(
-        URL "${submodule_url}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-    )
-
+    qt_ir_has_url_scheme("${submodule_url}" has_url_scheme)
     if(NOT has_url_scheme AND arg_BASE_URL)
         set(submodule_url "${arg_BASE_URL}${submodule_url}")
-        qt_ir_normalize_git_url("${submodule_url}" submodule_url)
     endif()
 
     qt_ir_get_mirror(mirror_url)
     set(mirror "")
     if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH))
         set(mirror "${mirror_url}${submodule_base_git_path}")
-        qt_ir_normalize_git_url("${mirror}" mirror)
     endif()
 
     set(mirror_or_original_url "${submodule_url}")

cmake/QtIRHelp.txt

@@ -98,9 +98,6 @@ Options:
         username and port number, and thus relies on a correct SSH
         configuration.
 
-    --codereview-https
-        Specify this option to use HTTPs instead of SSH.
-
     --alternates <path to other Qt5 repo>
         Adds alternates for each submodule to another full qt5 checkout.
         This makes this qt5 checkout very small, as it will use the object

cmake/QtIRHelpers.cmake

@@ -8,6 +8,7 @@ macro(qt_ir_include_all_helpers)
     include(QtIROptionsHelpers)
     include(QtIRParsingHelpers)
     include(QtIRProcessHelpers)
+    include(QtIRTestHelpers)
     include(QtTopLevelHelpers)
 endmacro()
 
@@ -295,7 +296,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
         "${working_directory}")
 
     # Get some additional options to pass down.
-    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
+    qt_ir_get_option_value(alternates alternates)
     qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)
 
     # The prefix for the cmake-style 'dictionary' that will be used by various functions.

cmake/QtIROptionsHelpers.cmake

@@ -14,7 +14,6 @@ macro(qt_ir_set_known_command_line_options)
     qt_ir_commandline_option(berlin TYPE boolean)
     qt_ir_commandline_option(branch TYPE boolean)
     qt_ir_commandline_option(codereview-username TYPE string)
-    qt_ir_commandline_option(codereview-https TYPE boolean)
     qt_ir_commandline_option(copy-objects TYPE boolean)
     qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
     qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)

cmake/QtIRParsingHelpers.cmake

@@ -40,77 +40,16 @@ function(qt_ir_get_git_config_contents out_var)
     set(${out_var} "${git_output}" PARENT_SCOPE)
 endfunction()
 
-# Parses a git repo url to:
-# - check if the given url has a scheme like https:// or git:// or is just a
-# relative path with no scheme (possibly containing '../' segments)
-# - extracts the scheme if it exists
-# - extracts the url without the scheme
-function(qt_ir_parse_git_url)
-    set(options "")
-    set(oneValueArgs
-        URL
-        OUT_VAR_HAS_URL_SCHEME
-        OUT_VAR_SCHEME
-        OUT_VAR_URL_WITHOUT_SCHEME
-    )
-    set(multiValueArgs "")
-    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    string(REGEX MATCH "^([a-z][a-z0-9+\-.]*://)(.+)" url_scheme_match "${arg_URL}")
-
-    if(url_scheme_match)
-        set(has_url_scheme TRUE)
-        set(scheme "${CMAKE_MATCH_1}")
-        set(url_without_scheme "${CMAKE_MATCH_2}")
-    else()
-        set(has_url_scheme FALSE)
-        set(scheme "")
-        set(url_without_scheme "${url}")
-    endif()
-
-    if(arg_OUT_VAR_HAS_URL_SCHEME)
-        set(${arg_OUT_VAR_HAS_URL_SCHEME} "${has_url_scheme}" PARENT_SCOPE)
-    endif()
-
-    if(arg_OUT_VAR_SCHEME)
-        set(${arg_OUT_VAR_SCHEME} "${scheme}" PARENT_SCOPE)
-    endif()
-
-    if(arg_OUT_VAR_URL_WITHOUT_SCHEME)
-        set(${arg_OUT_VAR_URL_WITHOUT_SCHEME} "${url_without_scheme}" PARENT_SCOPE)
-    endif()
-endfunction()
-
-# Normalizes a url that contains '../' path segments.
-# Removes the '../' segments and the directories that they precede.
-# Example:
-#  git://code.qt.io/qt/../playground/qlitehtml.git
-# will be normalized to:
-#  git://code.qt.io/playground/qlitehtml.git
-function(qt_ir_normalize_git_url url out_var)
-    # The exact perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
-    # That got rid of ../ and ../../ in the path, but it broke down
-    # when more than two '../' segments were present.
-    #
-    # In CMake, we instead parse the url to get the non-scheme suffix,
-    # use get_filename_component(ABSOLUTE) to resolve the url as if it was a relative path
-    # and then re-add the scheme if it was present.
-    qt_ir_parse_git_url(
-        URL "${url}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-        OUT_VAR_SCHEME url_scheme
-        OUT_VAR_URL_WITHOUT_SCHEME url_without_scheme
-    )
-
-    # Note the empty BASE_DIR is important, otherwise the path is relative to
-    # ${CMAKE_CURRENT_SOURCE_DIR}.
-    get_filename_component(normalized_url "${url_without_scheme}" ABSOLUTE BASE_DIR "")
+# Checks whether the given url has a scheme like https:// or is just a
+# relative path.
+function(qt_ir_has_url_scheme url out_var)
+    string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}")
 
     if(has_url_scheme)
-        string(PREPEND normalized_url "${url_scheme}")
+        set(${out_var} TRUE PARENT_SCOPE)
+    else()
+        set(${out_var} FALSE PARENT_SCOPE)
     endif()
-
-    set(${out_var} "${normalized_url}" PARENT_SCOPE)
 endfunction()
 
 # Parses a key-value line from a .git/config or .gitmodules file
@@ -140,22 +79,14 @@ endmacro()
 # url_value
 #   the url where to clone a repo from
 #   in perl script it was called $base
-#   Examples:
-#    - '../qtbase.git'
-#    - 'https://code.qt.io/playground/qlitehtml.git'
-#    - '../../playground/qlitehtml.git'
+#   e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git'
 # parent_repo_base_git_path
 #   the base git path of the parent of the submodule
 #   it is either a relative dir or a full url
 #   in the perl script it was called $my_repo_base,
 #   it was passed as first arg to git_clone_all_submodules,
 #   it was passed the value of $subbases{$module} when doing recursive submodule cloning
-#   Examples:
-#    - 'qt5'
-#    - 'tqtc-qt5'
-#    - 'qtdeclarative.git'
-#    - 'qttools.git'
-#    - 'https://code.qt.io/playground/qlitehtml.git'
+#   e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git'
 #
 # Outputs
 #
@@ -163,21 +94,21 @@ endmacro()
 #   just the value of ${url_value}
 # ${out_var_prefix}_${submodule_name}_base_git_path
 #   the whole url if it has a scheme, otherwise it's the value of
-#   ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments
-#   are collapsed depending on how many path segments are available in
-#   ${parent_repo_base_git_path}.
-#   Examples:
-#    - 'qtdeclarative.git'
-#    - 'https://code.qt.io/playground/qlitehtml.git'
-#    - '../playground/qlitehtml.git'
+#   ${url_value} relative to ${parent_repo_base_git_path}, so all the ../ are collapsed
+#   e.g. 'qtdeclarative.git'
+#        'https://code.qt.io/playground/qlitehtml.git',
 macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path)
-    qt_ir_parse_git_url(
-        URL "${url_value}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-    )
+    qt_ir_has_url_scheme("${url_value}" has_url_scheme)
     if(NOT has_url_scheme)
         set(base_git_path "${parent_repo_base_git_path}/${url_value}")
-        qt_ir_normalize_git_url("${base_git_path}" base_git_path)
+
+        # The exact code perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
+        # That got rid of ../ and ../../ in the path, but it broke down
+        # when more than two ../ were present.
+        # We just use ABSOLUTE to resolve the path and get rid of all ../
+        # Note the empty BASE_DIR is important, otherwise the path is relative to
+        # ${CMAKE_CURRENT_SOURCE_DIR}.
+        get_filename_component(base_git_path "${base_git_path}" ABSOLUTE BASE_DIR "")
     else()
         set(base_git_path "${url_value}")
     endif()

cmake/QtIRScript.cmake

@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.16)
 macro(qt_ir_setup_include_paths)
     list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_LIST_DIR}"
+        "${CMAKE_CURRENT_LIST_DIR}/3rdparty/cmake"
     )
     include(QtIRHelpers)
 endmacro()

cmake/QtSortModuleDependencies.cmake

@@ -5,7 +5,6 @@
 # in the QT_BUILD_SUBMODULES variable. The resulting list preserves the required build order.
 # Usage:
 # cmake [-DQT_BUILD_SUBMODULES="<repo;..>"] [-BUILD_<repo>=<TRUE|FALSE>] \
-#     [-DSEPARATOR=<list separator>] \
 #    -P <path/to>/qt6/cmake/QtSortModuleDependencies.cmake
 cmake_minimum_required(VERSION 3.16)
 
@@ -13,9 +12,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/QtTopLevelHelpers.cmake)
 
 qt_internal_collect_modules_only(result "${QT_BUILD_SUBMODULES}")
 
-if(NOT DEFINED SEPARATOR)
-    set(SEPARATOR " ")
-endif()
-
-list(JOIN result "${SEPARATOR}" result)
+list(JOIN result " " result)
 message("${result}")

cmake/QtTopLevelConfigureScript.cmake

@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.16)
 macro(qt_tl_setup_include_paths)
     list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_LIST_DIR}"
+        "${CMAKE_CURRENT_LIST_DIR}/3rdparty/cmake"
     )
     include(QtTopLevelHelpers)
 endmacro()

cmake/QtTopLevelHelpers.cmake

@@ -169,9 +169,6 @@ endfunction()
 # EXCLUDE_OPTIONAL_DEPS is a boolean that controls whether optional dependencies are excluded from
 # the final result.
 #
-# EXCLUDE_OPTIONAL_DEPS_VAR is an output variable where to save the list of optional dependencies
-# that were excluded due to EXCLUDE_OPTIONAL_DEPS.
-#
 # GITMODULES_PREFIX_VAR is the prefix of all the variables containing dependencies for the
 # PARSE_GITMODULES mode.
 # The function expects the following variables to be set in the parent scope
@@ -192,7 +189,7 @@ endfunction()
 function(qt_internal_resolve_module_dependencies module out_ordered out_revisions)
     set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED PARSE_GITMODULES
                 EXCLUDE_OPTIONAL_DEPS)
-    set(oneValueArgs REVISION SKIPPED_VAR GITMODULES_PREFIX_VAR EXCLUDE_OPTIONAL_DEPS_VAR)
+    set(oneValueArgs REVISION SKIPPED_VAR GITMODULES_PREFIX_VAR)
     set(multiValueArgs PARSED_DEPENDENCIES SKIP_MODULES)
     cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -234,12 +231,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
                         list(GET dependency_split 2 required)
                         if(required)
                             list(APPEND filtered_dependencies "${dependency}")
-                        elseif(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-                            # Add any potentially skipped dependency to the list and
-                            # filter out the required ones later
-                            list(GET dependency_split 0 dependency_name)
-                            list(APPEND ${arg_EXCLUDE_OPTIONAL_DEPS_VAR}
-                                "${dependency_name}")
                         endif()
                     endforeach()
                     set(dependencies "${filtered_dependencies}")
@@ -298,12 +289,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
             set(exclude_optional_deps "EXCLUDE_OPTIONAL_DEPS")
         endif()
 
-        set(exclude_optional_deps_var "")
-        if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-            set(exclude_optional_deps_var
-                EXCLUDE_OPTIONAL_DEPS_VAR "${arg_EXCLUDE_OPTIONAL_DEPS_VAR}")
-        endif()
-
         set(extra_options "")
         if(arg_SKIP_MODULES)
             list(APPEND extra_options SKIP_MODULES ${arg_SKIP_MODULES})
@@ -316,7 +301,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
             ${normalize_arg}
             ${parse_gitmodules}
             ${exclude_optional_deps}
-            ${exclude_optional_deps_var}
             GITMODULES_PREFIX_VAR ${arg_GITMODULES_PREFIX_VAR}
             ${extra_options}
         )
@@ -330,13 +314,6 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
     list(APPEND revisions ${arg_REVISION})
     set(${out_ordered} "${ordered}" PARENT_SCOPE)
     set(${out_revisions} "${revisions}" PARENT_SCOPE)
-    if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-        # Filter out all dependencies that were marked as required and remove any duplicates
-        list(REMOVE_DUPLICATES ${arg_EXCLUDE_OPTIONAL_DEPS_VAR})
-        list(REMOVE_ITEM ${arg_EXCLUDE_OPTIONAL_DEPS_VAR} ${ordered})
-        set(${arg_EXCLUDE_OPTIONAL_DEPS_VAR}
-            "${${arg_EXCLUDE_OPTIONAL_DEPS_VAR}}" PARENT_SCOPE)
-    endif()
 endfunction()
 
 # Resolves the dependencies of the given modules.
@@ -352,16 +329,12 @@ endfunction()
 # EXCLUDE_OPTIONAL_DEPS is a keyword argument that excludes optional dependencies from the result.
 # See qt_internal_resolve_module_dependencies for details.
 #
-# EXCLUDE_OPTIONAL_DEPS_VAR is an output variable where to save the list of optional dependencies
-# that were excluded due to EXCLUDE_OPTIONAL_DEPS.
-# See qt_internal_resolve_module_dependencies for details.
-#
 # SKIP_MODULES Modules that should be skipped from evaluation completely.
 #
 # See qt_internal_resolve_module_dependencies for side effects.
 function(qt_internal_sort_module_dependencies modules out_all_ordered)
     set(options PARSE_GITMODULES EXCLUDE_OPTIONAL_DEPS)
-    set(oneValueArgs GITMODULES_PREFIX_VAR EXCLUDE_OPTIONAL_DEPS_VAR)
+    set(oneValueArgs GITMODULES_PREFIX_VAR)
     set(multiValueArgs SKIP_MODULES)
     cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -375,12 +348,6 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
         set(exclude_optional_deps "EXCLUDE_OPTIONAL_DEPS")
     endif()
 
-    set(exclude_optional_deps_var "")
-    if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-        set(exclude_optional_deps_var
-            EXCLUDE_OPTIONAL_DEPS_VAR "${arg_EXCLUDE_OPTIONAL_DEPS_VAR}")
-    endif()
-
     # Create a fake repository "all_selected_repos" that has all repositories from the input as
     # required dependency. The format must match what qt_internal_parse_dependencies_yaml produces.
     set(all_selected_repos_as_parsed_dependencies)
@@ -397,7 +364,6 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
         PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
         NORMALIZE_REPO_NAME_IF_NEEDED
         ${exclude_optional_deps}
-        ${exclude_optional_deps_var}
         ${parse_gitmodules}
         GITMODULES_PREFIX_VAR ${arg_GITMODULES_PREFIX_VAR}
         ${extra_args}
@@ -411,10 +377,6 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
         "qt_internal_sort_module_dependencies
     input modules: ${modules}\n    topo-sorted:   ${ordered}")
     set(${out_all_ordered} "${ordered}" PARENT_SCOPE)
-    if(arg_EXCLUDE_OPTIONAL_DEPS_VAR)
-        set(${arg_EXCLUDE_OPTIONAL_DEPS_VAR}
-                "${${arg_EXCLUDE_OPTIONAL_DEPS_VAR}}" PARENT_SCOPE)
-    endif()
 endfunction()
 
 # Checks whether any unparsed arguments have been passed to the function at the call site.
@@ -1401,7 +1363,6 @@ function(qt_internal_foreach_repo_run)
         set(color "--red")
     endif()
 
-    set(failing_modules "")
     foreach(module IN LISTS modules)
         message("Entering '${module}'")
         execute_process(
@@ -1419,7 +1380,6 @@ function(qt_internal_foreach_repo_run)
                 ${CMAKE_COMMAND} -E cmake_echo_color "${color}"
                 "Process execution failed here ^^^^^^^^^^^^^^^^^^^^"
             )
-            list(APPEND failing_modules "${module}")
         else()
             math(EXPR count_success "${count_success}+1")
         endif()
@@ -1441,15 +1401,6 @@ function(qt_internal_foreach_repo_run)
             ${CMAKE_COMMAND} -E env CLICOLOR_FORCE=1
             ${CMAKE_COMMAND} -E cmake_echo_color "${color}" "${count_failure}"
     )
-    if(failing_modules)
-        list(JOIN failing_modules ", " failing_modules)
-        execute_process(
-            COMMAND
-                ${CMAKE_COMMAND} -E cmake_echo_color --normal
-                    "Failing submodules: ${failing_modules}"
-        )
-    endif()
-
     message("Successes: ${count_success}")
 endfunction()
 

coin/instructions/cmake_run_ctest.yaml

@@ -1,29 +0,0 @@
-type: Group
-instructions:
-  - type: AppendToEnvironmentVariable
-    variableName: CTEST_ARGS
-    variableValue: " -V"
-
-  - type: AppendToEnvironmentVariable
-    variableName: CTEST_ARGS
-    variableValue: " --stop-on-failure"
-    enable_if:
-      condition: property
-      property: features
-      contains_value: AbortTestingOnFirstFailure
-
-  - type: AppendToEnvironmentVariable
-    variableName: CTEST_ARGS
-    variableValue: " --no-label-summary"
-
-  - type: Group
-    instructions:
-      - type: ExecuteCommand
-        command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"
-        executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-        ignoreExitCode: false
-        maxTimeInSeconds: 14400
-        maxTimeBetweenOutput: 14400
-        userMessageOnFailure: >
-          Failed to run tests.
-

coin/instructions/coin_qt_configure.yaml

@@ -47,20 +47,3 @@ instructions:
       condition: property
       property: features
       contains_value: UseConfigure
-disable_if:
-  condition: or
-  conditions:
-    - condition: property
-      property: target.osVersion
-      in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
-    - condition: and
-      conditions:
-        - condition: property
-          property: target.os
-          equals_value: Windows
-        - condition: property
-          property: target.arch
-          not_equals_property: host.arch
-        - condition: property
-          property: features
-          not_contains_value: "DebianPackaging"

coin/instructions/coin_run_top_level_cmake_tests.yaml

@@ -1,27 +0,0 @@
-type: Group
-instructions:
-  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-
-  - type: SetBuildDirectory
-    directory: "{{.SourceDir}}/run_cmake_tests_build"
-  - type: MakeDirectory
-    directory: "{{.BuildDir}}"
-  - type: ChangeDirectory
-    directory: "{{.BuildDir}}"
-
-  - type: EnvironmentVariable
-    variableName: COIN_CMAKE_ARGS
-    variableValue: "{{.Env.CMAKE_ARGS}} {{.Env.COMMON_CMAKE_ARGS}}"
-  - type: EnvironmentVariable
-    variableName: CONFIGURE_ENV_PREFIX
-    variableValue: "{{.Env.ENV_PREFIX}}"
-
-  - type: ExecuteCommand
-    command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake {{.SourceDir}}/tests/manual/RunCMake"
-    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to configure the RunCMake tests.
-
-  - !include "{{qt/qt5}}/cmake_run_ctest.yaml"

coin/module_config.yaml

@@ -6,26 +6,7 @@ accept_configuration:
 
 instructions:
   Build:
-    - type: Group
-      instructions:
     - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
-      enable_if:
-        condition: property
-        property: features
-        not_contains_value: "TopLevelRunCMakeTests"
-    - type: Group
-      instructions:
-        - !include "{{qt/qt5}}/coin_run_top_level_cmake_tests.yaml"
-      enable_if:
-        condition: property
-        property: features
-        contains_value: "TopLevelRunCMakeTests"
 
   Test:
-    - type: Group
-      instructions:
     - !include "{{qt/qt5}}/coin_bic_tests.yaml"
-      enable_if:
-        condition: property
-        property: features
-        not_contains_value: "TopLevelRunCMakeTests"

coin/platform_configs/address_sanitizer_platforms.yaml

@@ -1,14 +1,12 @@
 Version: 2
 Configurations:
 -
-    Id: 'opensuse-15.6-host-asan'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
+    Id: 'opensuse-15.5-host-asan'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
     Configure arguments: '-nomake examples -developer-build'
     Environment variables: [
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]

coin/platform_configs/android-studio-tools.yaml

@@ -1,8 +0,0 @@
-Version: 2
-Include: []
-Configurations:
--
-    Id: 'qttas-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['UseConfigure', 'Packaging', 'DisableTests']

coin/platform_configs/cmake_platforms.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms_qemu.yaml,
-    cmake_platforms_qemu_qnx.yaml,
+    cmake_platforms_qemu_qnx710.yaml,
     cmake_platforms_target_android.yaml,
     cmake_platforms_wasm.yaml,
     macos.yaml
@@ -9,31 +9,29 @@ Include: [
 Configurations:
 # Build on Ubuntu 22.04 and test on both X11 and Wayland later
 -
-    Id: 'ubuntu-22.04-developer-build'
+    Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
     Id: 'ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2']
+    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 -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 # Test on Ubuntu 22.04 X11
 -
-    Id: 'ubuntu-22.04-developer-build-x11-tests'
+    Id: 'ubuntu-22.04-documentation-x11-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'ubuntu-22.04-developer-build'
+    Features: ['Sccache', 'TestDocs', 'TestOnly']
+    Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-x11-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
@@ -42,47 +40,30 @@ Configurations:
     Platform dependency: 'ubuntu-22.04'
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
-    Id: 'ubuntu-24.04-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Id: 'ubuntu-24.04-arm64-documentation'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
     Environment variables: [
         'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 -
     Id: 'ubuntu-24.04-arm64'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -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',
-        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
-# Test on Ubuntu 24.04 ARM64 Wayland
--
-    Id: 'ubuntu-24.04-arm64-developer-build-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-24.04-arm64-developer-build'
--
-    Id: 'ubuntu-24.04-arm64-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-24.04-arm64'
 # Test on Ubuntu 24.04 ARM64 offscreen
 -
     Id: 'ubuntu-24.04-arm64-offscreen-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: [
@@ -93,37 +74,33 @@ Configurations:
     Platform dependency: 'ubuntu-24.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'
+    Id: 'ubuntu-24.04-x64-documentation'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: [
         'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 -
     Id: 'ubuntu-24.04-x64'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2']
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
 # Test on Ubuntu 24.04 x64 X11
 -
-    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
+    Id: 'ubuntu-24.04-x64-documentation-x11-tests'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'TestOnly', 'InsignificantTests']
-    Platform dependency: 'ubuntu-24.04-x64-developer-build'
+    Platform dependency: 'ubuntu-24.04-x64-documentation'
 -
     Id: 'ubuntu-24.04-x64-x11-tests'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
@@ -131,46 +108,29 @@ Configurations:
     Features: ['Sccache', 'TestOnly', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x64'
 -
-    Id: 'opensuse-15.6-developer-build'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
+    Id: 'opensuse-15.5-developer-build'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-nomake examples -developer-build'
     Environment variables: [
         'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 -
-    Id: 'opensuse-16.0-developer-build'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Configure arguments: '-nomake examples -developer-build'
-    Environment variables: [
-        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
-    ]
--
-    Id: 'sles-15_sp6-static'
-    Template: 'qtci-linux-SLES-15_SP6-x86_64-52'
+    Id: 'sles-15_sp5-static'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Configure arguments: '-nomake examples -static -no-sql-mysql'
     Environment variables: [
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
 -
     Id: 'windows-10_22h2-msvc2022'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -178,93 +138,89 @@ Configurations:
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
-    Id: 'windows-11_24H2-msvc2022'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
-    Id: 'windows-11_23h2-arm64-msvc2022'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Id: 'windows-11_22h2-arm64-msvc2022'
+    Template: 'qtci-windows-11_22H2-aarch64-54'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
         'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
-    Id: 'windows-11_24H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022-arm64'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'MSVC2022'
     Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'windows-11_23H2-msvc2022'
     Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
+        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
         'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
         'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
         'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
-    Id: 'windows-11-x86_64-arm64-tests'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly']
-    Configure arguments: '-cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
--
-    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022-developer-build'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
+    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'rhel-9.6'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-8.10'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
+    ]
+
+-
+    Id: 'rhel-9.2'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
+    ]
+-
+    Id: 'rhel-9.4'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
 -
     Id: 'ios-universal'
@@ -273,27 +229,15 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
         'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
     ]
 -
-    Id: 'visionos-developer-build'
-    Template: 'qtci-macos-15-arm-104'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
-    ]
--
-    Id: 'windows-11_24h2-mingw13'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-10_22h2-mingw13'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -305,10 +249,10 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
 -
-    Id: 'windows-11_24H2-llvm'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-llvm'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'Clang'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
     Environment variables: [
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
@@ -318,10 +262,10 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
     ]
 -
-    Id: 'windows-11_24H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-mingw13-developer-build'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
     Environment variables: [
         'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -336,7 +280,7 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.11_dev',
+        'DEBIAN_RULES_REF=6.8_dev',
         'COIN_TARGET_DIST=tqtc-jammy',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
@@ -349,35 +293,10 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.11_dev',
+        'DEBIAN_RULES_REF=6.8_dev',
         'COIN_TARGET_DIST=tqtc-jammy',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
--
-    Id: 'bookworm-gles-arm64-debian-pkg-packaging'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
-    Environment variables: [
-        'DEBIAN_RULES_REF=6.11_gles',
-        'COIN_TARGET_DIST=tqtc-bookworm',
-        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
-        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
-        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
-    ]
--
-    # This configuration runs for every submodule, using externally
-    # built qdoc and qattributionscanner binaries, to ensure that no
-    # new qdoc warnings are introduced. The resulting documentation
-    # is not used for anything (neither online or offline docs). See
-    # qt5.yaml for a config that builds offline docs.
-    Id: 'documentation-warnings'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
-    Platform dependency: 'ubuntu-22.04'
-

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -7,7 +7,7 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'GCC'
     Platform dependency: 'ubuntu-22.04'
-    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
+    Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
@@ -16,8 +16,6 @@ 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'
@@ -35,8 +33,6 @@ 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'
@@ -54,6 +50,4 @@ 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',
     ]

coin/platform_configs/cmake_platforms_qemu_qnx.yaml

@@ -1,88 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'qnx-710-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'QNX_QEMU={{.Env.QNX_710_QEMU}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-qnx-qt',
-    ]
--
-    Id: 'qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-qnx-qt',
-    ]
--
-    Id: 'qnx-710-armv7-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-qnx-qt',
-    ]
--
-    Id: 'qnx-800-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_800'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'QNX_QEMU={{.Env.QNX_800_QEMU}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-qnx-qt',
-    ]
--
-    Id: 'qnx-800-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'QNX_800'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-qnx-qt',
-    ]

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -0,0 +1,46 @@
+Version: 2
+Configurations:
+-
+    Id: 'qnx-710-x86_64-developer-build-on-linux'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
+        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+    ]
+-
+    Id: 'qnx-710-arm64-on-linux'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+    ]
+-
+    Id: 'qnx-710-armv7-on-linux'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QNX_710'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+    ]

coin/platform_configs/cmake_platforms_qemu_vxworks.yaml

@@ -0,0 +1,15 @@
+Version: 2
+Configurations:
+-
+    Id: 'vxworks-imx6'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'VxWorks'
+    Target arch: 'ARMv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples',
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
+    ]

coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml

@@ -0,0 +1,15 @@
+Version: 2
+Configurations:
+-
+    Id: 'vxworks-imx6-buildtest'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'VxWorks'
+    Target arch: 'ARMv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples',
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
+    ]

coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml

@@ -1,48 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'vxworks-imx6-buildtest'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'ARMv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
-    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-vxworks-qt',
-    ]
--
-    Id: 'vxworks-imx8-buildtest'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'ARMv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
-    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/nxp_imx8_1_0_7_0_VSB',
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
-    ]
--
-    Id: 'vxworks-x86_64-buildtest'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'X86_64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'ubuntu-22.04'
-    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
-    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-vxworks-qt',
-    ]

coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml

@@ -1,36 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'vxworks-imx6-tests'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'ARMv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'vxworks-imx6-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
-    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
-        'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=armv7-vxworks-qt',
-   ]
--
-    Id: 'vxworks-x86_64-tests'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Target os: 'VxWorks'
-    Target arch: 'X86_64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'vxworks-x86_64-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
-    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
-        'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
-        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-vxworks-qt',
-    ]

coin/platform_configs/cmake_platforms_static_release.yaml

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

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -1,27 +1,23 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15_sp6-minimal-static'
-    Template: 'qtci-linux-SLES-15_SP6-x86_64-52'
+    Id: 'sles-15_sp5-minimal-static'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Configure arguments: '-nomake examples -static -no-sql-mysql'
     Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
-    Id: 'windows-11_24H2-minimal-static'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-minimal-static'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -2,70 +2,81 @@ Version: 2
 Configurations:
 -
     Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
     Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-10_22h2-mingw13'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
     Id: 'android-9-x86-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
+    Platform dependency: 'rhel-8.10'
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds
-        # without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
 -
-    Id: 'android-16-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'android-14-x86_64-on-linux'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
+    Platform dependency: 'rhel-8.10'
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -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_36'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
+        'ANDROID_EMULATOR=emulator_x86_64_api_34'
     ]
+-
+    Id: 'android-15-x86_64-on-linux'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-8.10'
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
+        'ANDROID_EMULATOR=emulator_x86_64_api_35'
+    ]
+

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -2,38 +2,24 @@ Version: 2
 Configurations:
 -
     Id: 'webassembly-linux-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['DoNotRunTests', 'UseConfigure']
+    Platform dependency: 'opensuse-15.5-developer-build'
+    Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
         "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
-        'HEADLESS_CHROME_FOR_TESTING=true'
-    ]
--
-    Id: 'webassembly-linux-thread-asyncify-new'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
-    Features: ['DoNotRunTests', 'UseConfigure']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
-        'HEADLESS_CHROME_FOR_TESTING=true'
+        -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
     ]
 -
     Id: 'webassembly-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'WebAssembly'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw13'
-    Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'windows-10_22h2-mingw13'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -43,53 +29,14 @@ Configurations:
     ]
 -
     Id: 'webassembly-linux-thread'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
+    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'opensuse-15.5-developer-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
         'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
     ]
--
-    Id: 'webassembly-linux-thread-new'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
-    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
--
-    Id: 'webassembly-linux-shared'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
--
-    Id: 'webassembly-linux-shared-new'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
-    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]

coin/platform_configs/default.yaml

@@ -1,5 +1,10 @@
 Version: 2
 Configurations:
+-
+    Id: 'ubuntu-22.04-license-check'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheckV2']
 -
     Id: 'ubuntu-24.04-x64-license-check'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'

coin/platform_configs/doc.yaml

@@ -1,4 +1,4 @@
 Version: 2
 Module only: True
-Include: [offline_documentation.yaml]
+Include: [cmake_platforms.yaml]
 Configurations: []

coin/platform_configs/integrity.yaml

@@ -17,6 +17,4 @@ Configurations:
           'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
           'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
           'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
-          'VCPKG_HOST_TRIPLET=x64-linux-qt',
-          'VCPKG_TARGET_TRIPLET=arm64-integrity-qt',
       ]

coin/platform_configs/ios-tests.yaml

@@ -2,12 +2,12 @@ Version: 2
 Configurations:
 -
     Id: "ios-tests-on-macos"
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'

coin/platform_configs/linux_android_tests_developer.yaml

@@ -2,16 +2,16 @@ Version: 2
 Configurations:
 -
     Id: 'android-x86-developer-build-testrun-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
+    Platform dependency: 'rhel-8.10'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=',
         'ANDROID_EMULATOR=emulator_x86_api_28']

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -2,29 +2,27 @@ Version: 2
 Configurations:
 -
     Id: 'android-9-multi-abi'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Target os: 'Android_ANY'
     Target arch: 'multi'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: [
-        'rhel-9.6',
+        'rhel-8.10',
         'android-9-x86-on-linux',
-        'android-16-x86_64-on-linux'
+        'android-14-x86_64-on-linux'
     ]
     Features: [
         'Sccache',
         'WarningsAreErrors',
         'AndroidTestRun',
         'MinimalAndroidMultiABITests',
-        'InstallDepsPerPlatformSubdir',
-        'InsignificantTests',
-        'DoNotAbortTestingOnFirstFailure'
+        'InstallDepsPerPlatformSubdir'
     ]
     Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6',
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
         'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux',
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]

coin/platform_configs/macos.yaml

@@ -8,74 +8,100 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-15-arm-104'
+        Id: 'macos-universal-on-x86_64'
+        Template: 'qtci-macos-14-x86_64-105'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
         Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
         Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
+        ]
+
+    -
+        Id: 'macos-universal-on-arm64'
+        Template: 'qtci-macos-14-arm-106'
+        Compiler: 'Clang'
+        Target arch: 'x86_64-arm64'
+        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
+        Environment variables: [
+            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
+            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
         ]
 
     # Test on all supported macOS versions (deployment targets)
 
     # On x86_64
 
+    -
+        Id: 'macos-12-x86_64-tests'
+        Template: 'qtci-macos-12-x86_64-107'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-13-x86_64-tests'
         Template: 'qtci-macos-13-x86_64-103'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-14-x86_64-tests'
         Template: 'qtci-macos-14-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-15-x86_64-tests'
-        Template: 'qtci-macos-15-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-26-x86_64-tests'
-        Template: 'qtci-macos-26-x86_64-100'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
-        Platform dependency: 'macos-universal-on-arm64'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
+        Platform dependency: 'macos-universal-on-x86_64'
 
     # And arm64
 
+    -
+        Id: 'macos-12-arm64-tests'
+        Template: 'qtci-macos-12-arm-102'
+        Compiler: 'Clang'
+        Features: ['TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-13-arm64-tests'
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Features: ['TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['TestOnly', 'Packaging']
+        Platform dependency: 'macos-universal-on-x86_64'
+
+    # Test the universal packaging built on arm64
+
+    -
+        Id: 'macos-12-arm-on-arm64-tests'
+        Template: 'qtci-macos-12-arm-102'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
     -
-        Id: 'macos-15-arm64-tests'
-        Template: 'qtci-macos-15-arm-104'
+        Id: 'macos-12-arm-on-x86_64-tests'
+        Template: 'qtci-macos-12-x86_64-107'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
     -
-        Id: 'macos-26-arm64-tests'
-        Template: 'qtci-macos-26-arm-104'
+        Id: 'macos-13-arm-on-x86_64-tests'
+        Template: 'qtci-macos-13-x86_64-103'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-universal-on-arm64'
+    -
+        Id: 'macos-14-arm-on-x86_64-tests'
+        Template: 'qtci-macos-14-x86_64-105'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
 
     # =========================================================================
@@ -85,75 +111,44 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-x86_64-developer-build'
-        Template: 'qtci-macos-15-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
-        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
-        ]
-    -
-        Id: 'macos-26-x86_64-developer-build'
-        Template: 'qtci-macos-26-x86_64-100'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
-        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        ]
-    -
-        Id: 'macos-arm64-developer-build'
-        Template: 'qtci-macos-15-arm-104'
+        Id: 'macos-14-x86_64-developer-build'
+        Template: 'qtci-macos-14-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -nomake examples -debug -framework'
+        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=universal-osx-qt',
-            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
         ]
     -
-        Id: 'macos-26-arm64-developer-build'
-        Template: 'qtci-macos-26-arm-104'
+        Id: 'macos-14-arm64-developer-build'
+        Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
-        Configure arguments: '-developer-build -nomake examples -debug -framework'
+        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Configure arguments: '-developer-build -nomake examples -release -force-asserts -force-debug-info -separate-debug-info -framework'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'VCPKG_HOST_TRIPLET=arm64-osx-qt',
-            'VCPKG_TARGET_TRIPLET=arm64-osx-qt',
         ]
 
     # Test on all supported macOS versions (deployment targets)
+    -
+        Id: 'macos-12-arm64-developer-build-tests'
+        Template: 'qtci-macos-12-arm-102'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
+        Platform dependency: 'macos-14-arm64-developer-build'
     -
         Id: 'macos-13-arm64-developer-build-tests'
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-arm64-developer-build'
+        Platform dependency: 'macos-14-arm64-developer-build'
     -
         Id: 'macos-14-arm64-developer-build-tests'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-arm64-developer-build'
-    -
-        Id: 'macos-15-arm64-developer-build-tests'
-        Template: 'qtci-macos-15-arm-104'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-arm64-developer-build'
-    -
-        Id: 'macos-26-arm64-developer-build-tests'
-        Template: 'qtci-macos-26-arm-104'
-        Compiler: 'Clang'
-        Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-        Platform dependency: 'macos-26-arm64-developer-build'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
+        Platform dependency: 'macos-14-arm64-developer-build'

coin/platform_configs/meta-boot2qt-qcom-hwe.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/meta-qbsp-nxp.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/meta-qbsp-qcom.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/nightly_android_namespace.yaml

@@ -1,33 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux'
-    ]
-]
-Configurations: []
-# Android nightly to check for -qtnamespace errors/issues
-Overrides:
--
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
--
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]

coin/platform_configs/nightly_android_ndk1.yaml

@@ -1,58 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6',
-        'windows-11_24h2-mingw13'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux',
-        'android-armv7-on-windows',
-        'android-arm64-on-macos'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
-# Android nightly to check for older (but still supported for the branch) NDKs
-Overrides:
--
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
--
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
--
-    Id: 'android-armv7-on-windows'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}'
-    ]
--
-    Id: 'android-arm64-on-macos'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}'
-    ]

coin/platform_configs/nightly_android_ndk2.yaml

@@ -1,58 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6',
-        'windows-11_24h2-mingw13'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux',
-        'android-armv7-on-windows',
-        'android-arm64-on-macos'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
-# Android nightly to check for older (but still supported for the branch) NDKs
-Overrides:
--
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
--
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
--
-    Id: 'android-armv7-on-windows'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}'
-    ]
--
-    Id: 'android-arm64-on-macos'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}'
-    ]

coin/platform_configs/nightly_android_ndk_preview.yaml

@@ -1,33 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-16-x86_64-on-linux',
-        'android-9-x86-on-linux'
-    ]
-]
-Configurations: []
-# Android nightly to check for preview NDKs (beta/RC or a newer NDK than the _LATEST used in CI)
-Overrides:
--
-    Id: 'android-16-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_PREVIEW}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_PREVIEW}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_PREVIEW}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_PREVIEW}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
--
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_PREVIEW}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_PREVIEW}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_PREVIEW}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_PREVIEW}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]

coin/platform_configs/nightly_cxx23.yaml

@@ -1,28 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'windows-11_24H2-msvc2022-developer-build-cxx23'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++23'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'VCPKG_HOST_TRIPLET=x64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
-        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
-    ]
-# Test gcc-14 on Ubuntu 24.04 ARM64 Wayland
--
-    Id: 'ubuntu-24.04-arm64-gcc14-cxx23'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput -c++std c++23'
-    Environment variables: [
-        'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14',
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
-    ]

coin/platform_configs/nightly_examples_and_tests.yaml

@@ -1,14 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'ubuntu-24.04-x64-examples-and-tests-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'NoSubmoduleDependencies']
-    Configure arguments: '-make examples -make tests'
-    Environment variables: [
-        'COMMON_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=OFF -DQT_GENERATE_SBOM=OFF',
-        'COMMON_NON_QTBASE_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=OFF -DQT_GENERATE_SBOM=OFF',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
-    ]

coin/platform_configs/nightly_macos.yaml

@@ -1,14 +0,0 @@
-Version: 2
-Module only: True
-
-# Please add nightly/beta configs to macos.yaml with the appropriate
-# COIN_CTEST_IGNORE_EXIT_CODE to make it insignificant.
-
-Include: [
-    macos.yaml: [
-        'macos-universal-on-arm64',
-        'macos-26-arm64-tests',
-        'macos-26-arm64-developer-build',
-        'macos-26-arm64-developer-build-tests'
-    ],
-]

coin/platform_configs/nightly_macos14_arm.yaml

@@ -0,0 +1,20 @@
+Version: 2
+Module only: True
+Configurations:
+-
+    Id: 'macos-14-arm64-developer-build'
+    Template: 'qtci-macos-14-arm64'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+    Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
+    Environment variables: [
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
+        'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
+    ]
+-
+    Id: 'macos-14-arm64-developer-build-tests'
+    Template: 'qtci-macos-14-arm64'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'TestOnly']
+    Platform dependency: 'macos-14-arm64-developer-build'

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -1,22 +1,21 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
-        'windows-11_24h2-mingw13'
+        windows-10_22h2-msvc2019-developer-build
     ]
 ]
 Configurations:
 -
     Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'QNX_710'
     Target arch: 'arm64'
-    Compiler: 'Mingw'
+    Compiler: 'MSVC2019'
     Target compiler: 'QCC'
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
     Features: ['DisableTests', 'UseConfigure']
     Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include'
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
     ]

coin/platform_configs/nightly_qsr-coverage.yaml

@@ -1,14 +0,0 @@
-Version: 2
-Configurations:
-
--
-    Id: 'ubuntu-22.04-qsr-coverity'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'QSR_COVERAGE', 'AllowNightlyExport', 'Packaging']
-    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'
-    ]

coin/platform_configs/nightly_qsr-runtime-coverage.yaml

@@ -1,14 +0,0 @@
-Version: 2
-Configurations:
-
--
-    Id: 'ubuntu-22.04-qsr-rt-coverity'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'QSR_RT_COVERAGE', 'AllowNightlyExport', 'Packaging']
-    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'
-    ]

coin/platform_configs/nightly_qt5_axivion.yaml

@@ -1,12 +1,13 @@
 Version: 2
 Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-22.04"
-  ]
-]
-Configurations: []
-Overrides:
+Configurations:
 -
-    Id: 'ubuntu-22.04'
-    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize16']
+    Id: 'ubuntu-22.04-axivion'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize8']
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
+    ]

coin/platform_configs/nightly_top_level_run_cmake_tests.yaml

@@ -1,9 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'ubuntu-24.04-x64-run-cmake-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'NoSubmoduleDependencies', 'TopLevelRunCMakeTests', 'DisableTests', 'VMSize16']
-    Configure arguments: ''
-    Environment variables: []

coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml

@@ -4,7 +4,7 @@ Configurations:
     # cmake_platforms.yaml
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'UseConfigure', 'StandaloneExamples', 'DocsGenerationV2']
+    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
     Id: 'Ubuntu-22.04-xwayland-host'

coin/platform_configs/nightly_unity_builds.yaml

@@ -1,57 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'windows-11_24H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
-    Id: 'rhel-9.6-unity-build'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
-    Configure arguments: '-make examples -debug -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DQT_UNITY_BUILD=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
--
-    Id: 'ubuntu-24.04-arm64-unity-build'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DQT_UNITY_BUILD=ON',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
--
-    Id: 'ubuntu-24.04-x64-unity-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DQT_UNITY_BUILD=ON',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
--
-    Id: 'macos-universal-on-arm64-unity-build'
-    Template: 'qtci-macos-14-arm-106'
-    Compiler: 'Clang'
-    Target arch: 'x86_64-arm64'
-    Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework'
-    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON',
-    ]

coin/platform_configs/nightly_vxworks.yaml

@@ -2,15 +2,10 @@ Version: 2
 Module only: True
 Include: [
     cmake_platforms.yaml: [
-        ubuntu-22.04
+        "ubuntu-22.04"
     ],
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml: [
-        vxworks-imx6-buildtest,
-        vxworks-x86_64-buildtest
-    ],
-    cmake_platforms_qemu_vxworks_tests_static.yaml: [
-        vxworks-imx6-tests,
-        vxworks-x86_64-tests
+    cmake_platforms_qemu_vxworks.yaml: [
+        "vxworks-imx6"
     ]
 ]
 Configurations: []

coin/platform_configs/nightly_windows.yaml

@@ -1,21 +0,0 @@
-Version: 2
-Configurations: []
-Include: [
-    cmake_platforms.yaml: [
-        'windows-11_24H2-msvc2022-developer-build',
-        'windows-11_24H2-mingw13-developer-build',
-        'windows-11_24H2-llvm'
-    ]
-]
-# Windows nightly to check for -qtnamespace errors/issues
-Overrides:
--
-    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Configure arguments: '-qtnamespace TestNamespace -debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
--
-    Id: 'windows-11_24H2-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'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-qtnamespace TestNamespace -release -force-debug-info -separate-debug-info -nomake examples'

coin/platform_configs/offline_documentation.yaml

@@ -1,13 +0,0 @@
-Version: 2
-Include: []
-Configurations:
--
-    # This configuration builds offline documentation for use in
-    # e.g. Qt Creator. It uses qdoc and qtattributionscanner from
-    # the same build. See also the 'documentation-warnings' config.
-    # FIXME: Add dependency on existing build for tools
-    Id: 'offline-documentation'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DoNotRunTests', 'Documentation', 'UseConfigure']
-    Configure arguments: '-developer-build -nomake examples -nomake tests -linker gold'

coin/platform_configs/precheck.yaml

@@ -3,14 +3,13 @@ Module only: True
 Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-22.04-developer-build",
-    "ubuntu-22.04-developer-build-x11-tests",
-    "windows-11_24H2-msvc2022-developer-build",
-    "ios-universal",
-    "documentation-warnings",
+    "ubuntu-22.04-documentation",
+    "ubuntu-22.04-documentation-x11-tests",
+    "windows-11_23H2-msvc2022-developer-build",
+    "ios-universal"
   ],
   macos.yaml: [
-    "macos-arm64-developer-build",
+    "macos-14-arm64-developer-build",
     "macos-14-arm64-developer-build-tests",
   ],
   cmake_platforms_target_android.yaml: [
@@ -19,7 +18,7 @@ Include: [
   cmake_platforms_qemu.yaml: [
     "qemu-armv7-developer-build"
   ],
-  cmake_platforms_qemu_qnx.yaml: [
+  cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux"
   ]
 ]

coin/platform_configs/qmake2cmake.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2019'
     Features: ['DisableTests']
 -
@@ -10,7 +10,11 @@ Configurations:
     Compiler: 'Clang'
     Features: ['DisableTests']
 -
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+-
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['DisableTests']
 -

coin/platform_configs/qt-creator.yaml

@@ -2,33 +2,33 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-14-arm-106'
     Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
@@ -36,34 +36,21 @@ Configurations:
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
--
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
-    Configure arguments: ''
-    Environment variables: []
 -
     Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
-    Configure arguments: ''
-    Environment variables: []
--
-    Template: 'qtci-macos-15-arm-104'
-    Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []
-# Tests GCC 11
 -
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
+    Template: 'qtci-macos-14-arm-106'
+    Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []

coin/platform_configs/qt5.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
+    address_sanitizer_platforms.yaml
 ]
 Configurations: []

coin/platform_configs/qtapplicationmanager.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
+    address_sanitizer_platforms.yaml
     ]
 Configurations: []

coin/platform_configs/qtbase-new-compiler-testing.yaml

@@ -1,9 +1,9 @@
 Version: 2
 Configurations:
-# Test gcc-12 on RHEL 9.6
+# Test gcc-12 on RHEL 9.2
 -
-    Id: 'rhel-9.6-gcc12'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-9.2-gcc12'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
@@ -12,15 +12,14 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
     ]
-# Test gcc-14 on Ubuntu 24.04 ARM64 Wayland
 -
-    Id: 'ubuntu-24.04-arm64-gcc14'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Id: 'rhel-9.4-gcc12'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'InsignificantTests']
     Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
     Environment variables: [
-        'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc-14 -DCMAKE_CXX_COMPILER=g++-14',
+        'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}',
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
     ]

coin/platform_configs/qtbase.yaml

@@ -7,11 +7,8 @@ Include: [
     address_sanitizer_platforms.yaml,
     linux_android_tests_multi_abi.yaml,
     wasm_qtbase_tests.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    cmake_platforms_qemu_vxworks_buildtest.yaml,
     qtlite.yaml,
-    qtbase_new_compiler_testing.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    qtbase-new-compiler-testing.yaml
 ]
 Configurations: []

coin/platform_configs/qtcanvaspainter.yaml

@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-]
-Configurations: []

coin/platform_configs/qtcharts.yaml

@@ -1,20 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml
+    address_sanitizer_platforms.yaml
     ]
 Configurations: []
-Overrides:
-# Make VxWorks tests insignificant.
--
-    Id: 'vxworks-imx6-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--
-    Id: 'vxworks-x86_64-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-# Remove imx8 tests.
--
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']

coin/platform_configs/qtdeclarative.yaml

@@ -4,20 +4,8 @@ Include: [
     integrity.yaml,
     ios-tests.yaml,
     address_sanitizer_platforms.yaml,
-    wasm_qtdeclarative_tests.yaml,
     cmake_platforms_static_tests.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    qtlite.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks.yaml,
+    qtlite.yaml
 ]
 Configurations: []
-Overrides:
-# Make VxWorks tests insignificant.
--
-    Id: 'vxworks-imx6-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--
-    Id: 'vxworks-x86_64-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

coin/platform_configs/qtdeviceutilities.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
+    address_sanitizer_platforms.yaml
     ]
 Configurations: []

coin/platform_configs/qtdotnet.yaml

@@ -1,13 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "windows-quick-bridges"
-  ]
-]
-Configurations:
--
-    Id: 'windows-quick-bridges-dotnet'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Platform dependency: 'windows-quick-bridges'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']

coin/platform_configs/qtgamepad.yaml

@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-    ]
-Configurations: []

coin/platform_configs/qtgradleplugin.yaml

@@ -1,18 +0,0 @@
-Version: 2
-Include: []
-Configurations:
--
-    Id: 'qtgp-on-linux-rhel_9_6'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure']
--
-    Id: 'qtgp-on-macos'
-    Template: 'qtci-macos-14-arm-106'
-    Compiler: 'Clang'
-    Features: ['TestOnly']
--
-    Id: 'qtgp-on-windows-24h2'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly']

coin/platform_configs/qtgraphs.yaml

@@ -1,8 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    cmake_platforms_qemu_vxworks.yaml,
     address_sanitizer_platforms.yaml
     ]
 Configurations: []

coin/platform_configs/qtgrpc.yaml

@@ -1,8 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    cmake_platforms_qemu_vxworks.yaml,
     address_sanitizer_platforms.yaml
 ]
 Configurations: []

coin/platform_configs/qtimageformats.yaml

@@ -3,14 +3,6 @@ Include: [
     cmake_platforms.yaml,
     address_sanitizer_platforms.yaml,
     integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks.yaml
 ]
 Configurations: []
-Overrides:
-# Make VxWorks x86_64 tests insignificant.
--
-    Id: 'vxworks-x86_64-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

coin/platform_configs/qtinterfaceframework.yaml

@@ -1,8 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    offline_documentation.yaml
+    address_sanitizer_platforms.yaml
     ]
 Configurations:
 -

coin/platform_configs/qtjenny.yaml

@@ -1,11 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-9.6'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux'
-    ]
-]
-Configurations: []

coin/platform_configs/qtlanguageserver.yaml

@@ -3,9 +3,6 @@ Include: [
     cmake_platforms.yaml,
     address_sanitizer_platforms.yaml,
     integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks.yaml
 ]
 Configurations: []

coin/platform_configs/qtlite.yaml

@@ -1,8 +1,8 @@
 Version: 2
 Configurations:
 -
-    Id: 'ubuntu-24.04-x86-static-qtlite'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Id: 'ubuntu-24.04-arm64-static-qtlite'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
     Configure arguments: >
@@ -15,19 +15,6 @@ Configurations:
         -gc-binaries
         -feature-linuxfb
         -disable-deprecated-up-to 0x070000
-        -no-feature-wayland
-        -no-feature-exceptions
-        -no-feature-itemmodeltester
-        -no-feature-getifaddrs
-        -no-feature-ipv6ifname
-        -no-feature-libresolv
-        -no-feature-system-proxies
-        -no-feature-stack_protector
-        -no-feature-stack_clash_protection
-        -no-feature-libstdcpp_assertions
-        -no-feature-glibc_fortify_source
-        -no-feature-network
-        -no-feature-opensslv30
         -no-feature-abstractbutton
         -no-feature-abstractslider
         -no-feature-accessibility
@@ -195,9 +182,6 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=
          -DFEATURE_qdoc=off
-         -DFEATURE_quick3d_assimp=off
-         -DFEATURE_quick3dxr_openxr=off
-         -DFEATURE_qml_animation=off
          -DFEATURE_qml_debug=off
          -DFEATURE_qml_jit=off
          -DFEATURE_qml_locale=off
@@ -211,10 +195,6 @@ Configurations:
          -DFEATURE_quickcontrols2_universal=off
          -DFEATURE_quickcontrols2_windows=off
          -DFEATURE_quick_designer=off
-         -DFEATURE_quick_pathview=off
-         -DFEATURE_quick_canvas=off
-         -DFEATURE_quick_tableview=off
-         -DFEATURE_quick_treeview=off
          -DFEATURE_quick_particles=off
          -DFEATURE_quick_pixmap_cache_threaded_download=off
          -DFEATURE_quick_shadereffect=off
@@ -222,10 +202,3 @@ Configurations:
          -DFEATURE_quicktemplates2_hover=off
          -DFEATURE_quicktemplates2_multitouch=off'
     ]
--
-    Id: 'ubuntu-24.04-x86-static-qtlite-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly','InsignificantTests']
-    Platform dependency: 'ubuntu-24.04-x86-static-qtlite'
-

coin/platform_configs/qtmultimedia.yaml

@@ -1,13 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    cmake_platforms_qemu_vxworks.yaml,
     address_sanitizer_platforms.yaml
     ]
 Configurations: []
-Overrides:
-# Remove imx8 tests.
--
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']

coin/platform_configs/qtopenapi.yaml

@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-  cmake_platforms.yaml,
-  address_sanitizer_platforms.yaml
-]
-Configurations: []

coin/platform_configs/qtquick3d.yaml

@@ -2,14 +2,7 @@ Version: 2
 Include: [
     cmake_platforms.yaml,
     integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    address_sanitizer_platforms.yaml,
-    qtlite.yaml
+    cmake_platforms_qemu_vxworks.yaml,
+    address_sanitizer_platforms.yaml
 ]
 Configurations: []
-Overrides:
-# Make VxWorks x86_64 tests insignificant.
--
-    Id: 'vxworks-x86_64-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

coin/platform_configs/qtquicktimeline.yaml

@@ -1,9 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    address_sanitizer_platforms.yaml,
-    quick-minimal.yaml
+    cmake_platforms_qemu_vxworks.yaml,
+    address_sanitizer_platforms.yaml
     ]
 Configurations: []

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -1,25 +1,24 @@
 Version: 2
 Include: [
   macos.yaml: [
-     "macos-universal-on-arm64",
-     "macos-13-x86_64-tests"
+     "macos-universal-on-x86_64",
+     "macos-12-x86_64-tests",
+     "macos-12-arm-on-arm64-tests"
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-22.04-developer-build",
-    "ubuntu-24.04-arm64",
-    "opensuse-15.6-developer-build",
-    "opensuse-16.0-developer-build",
-    "sles-15_sp6-static",
+    "ubuntu-22.04-documentation",
+    "opensuse-15.5-developer-build",
+    "sles-15_sp5-static",
     "windows-10_22h2-msvc2022",
-    "rhel-9.6",
-    "windows-11_24h2-mingw13",
-    "windows-11_24H2-mingw13-developer-build",
-    "windows-11_24H2-llvm",
-    "windows-11_24H2-msvc2022",
-    "windows-11_23h2-arm64-msvc2022"
+    "windows-11_23H2-msvc2022-developer-build",
+    "rhel-8.10",
+    "windows-10_22h2-mingw13",
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022"
   ],
-  cmake_platforms_qemu_qnx.yaml: [
+  cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
     "qnx-710-arm64-on-linux",
     "qnx-710-armv7-on-linux"
@@ -31,16 +30,9 @@ Include: [
     "qemu-arm64-developer-build",
     "qemu-armv7-developer-build",
     "qemu-mips64-developer-build"
-  ],
-  offline_documentation.yaml
+  ]
 ]
 Configurations:
--
-    Id: 'macos-13-arm64-tests'
-    Template: 'qtci-macos-13-arm-107'
-    Compiler: 'Clang'
-    Features: ['TestOnly']
-    Platform dependency: 'macos-universal-on-arm64'
 -
     Id: 'Axivion-QEMU_build'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'

coin/platform_configs/qtsaferenderer.yaml

@@ -1,37 +1,33 @@
 Version: 2
 Include: [
   macos.yaml: [
-     "macos-universal-on-arm64",
-     "macos-14-x86_64-tests",
-     "macos-14-arm64-tests"
+     "macos-universal-on-x86_64",
+     "macos-12-x86_64-tests",
+     "macos-12-arm-on-arm64-tests"
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-22.04-developer-build",
-    "ubuntu-24.04-arm64",
-    "opensuse-15.6-developer-build",
-    "opensuse-16.0-developer-build",
-    "sles-15_sp6-static",
+    "ubuntu-22.04-documentation",
+    "opensuse-15.5-developer-build",
+    "sles-15_sp5-static",
     "windows-10_22h2-msvc2022",
-    "rhel-9.6",
-    "windows-11_24h2-mingw13",
-    "windows-11_24H2-mingw13-developer-build",
-    "windows-11_24H2-llvm",
-    "windows-11_24H2-msvc2022",
-    "windows-11_23h2-arm64-msvc2022"
+    "rhel-8.10",
+    "windows-10_22h2-mingw13",
+    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022"
   ],
-  cmake_platforms_qemu_qnx.yaml: [
+  cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
     "qnx-710-arm64-on-linux",
     "qnx-710-armv7-on-linux"
-  ],
-  offline_documentation.yaml
+  ]
 ]
 # Static build configurations for tools
 Configurations:
 -
-    Id: 'macos-14-latest-xcode-universal_Static'
-    Template: 'qtci-macos-14-arm-106'
+    Id: 'macos-latest-xcode-universal-static-build'
+    Template: 'qtci-macos-12-x86_64-107'
+    Target os: 'MacOS_12_Static'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -40,8 +36,9 @@ Configurations:
         'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
     ]
 -
-    Id: 'Linux-RHEL_9_6_Static'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'Linux-RHEL_8_10_Static'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Target os: 'RHEL_8_10_Static'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
@@ -49,31 +46,10 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
     ]
--
-    Id: 'Ubuntu-24.04-arm64_Static'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
--
-    Id: 'Windows-MSVC2022-arm64_Static'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
     Id: 'Windows-MSVC2022_Static'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Target os: 'Windows_10_Static'
     Compiler: 'MSVC2022'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'

coin/platform_configs/qtshadertools.yaml

@@ -3,9 +3,6 @@ Include: [
     cmake_platforms.yaml,
     address_sanitizer_platforms.yaml,
     integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks.yaml
 ]
 Configurations: []

coin/platform_configs/qtsvg.yaml

@@ -3,9 +3,6 @@ Include: [
     cmake_platforms.yaml,
     address_sanitizer_platforms.yaml,
     integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml,
-    quick-bridges.yaml
+    cmake_platforms_qemu_vxworks.yaml
 ]
 Configurations: []

coin/platform_configs/qttasktree.yaml

@@ -1,10 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    quick-minimal.yaml
-]
-Configurations: []

coin/platform_configs/qtvirtualkeyboard.yaml

@@ -1,20 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    cmake_platforms_qemu_vxworks.yaml,
     address_sanitizer_platforms.yaml
     ]
 Configurations: []
-Overrides:
-# Make VxWorks tests insignificant.
--
-    Id: 'vxworks-imx6-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--
-    Id: 'vxworks-x86_64-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-# Remove imx8 tests.
--
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']

coin/platform_configs/qtwayland.yaml

@@ -3,4 +3,18 @@ Include: [
     cmake_platforms.yaml,
     address_sanitizer_platforms.yaml
 ]
-Configurations: []
+Configurations:
+# Test on Ubuntu 24.04 ARM64 Wayland
+-
+    Id: 'ubuntu-24.04-arm64-documentation-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-arm64-documentation'
+# Test on Ubuntu 24.04 x64 Wayland
+-
+    Id: 'ubuntu-24.04-x64-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-x64'