Update submodules on '6.5.2 in qt/qt5'

Change-Id: I08ce333a6e43447f3990211b5ac38f8e42b361ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-24 17:06:14 +08:00 · 2023-07-07 21:59:52 +00:00 · 2023-07-06 03:18:34 +00:00 · 2023-07-03 05:53:15 +00:00 · 2023-06-30 03:01:24 +00:00 · 2023-06-29 08:05:21 +00:00
230 changed files with 1671 additions and 1733 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ Makefile
 .qmake.cache
 .qmake.super
 *.pro.user*
+CMakeUserPresets.json
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.5.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.5.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.5.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,15 +47,15 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.5.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia
+	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.5.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.5.2
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,80 +252,80 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.5.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.5.2
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.5.2
 	status = preview
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
-	status = preview
+	branch = 6.5.2
+	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.5.2
 	status = preview
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.5.2
 	status = addon
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,15 @@ if(NOT QT_BUILD_SUBMODULES)
 endif()
 set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")

+foreach(module IN LISTS QT_BUILD_SUBMODULES)
+    if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt)
+        message(FATAL_ERROR
+            "Module '${module}' cannot be found. Please double-check the "
+            "spelling and try again. Or run `./init-repository` to get "
+            "the submodules.")
+    endif()
+endforeach()
+
 qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)

 foreach(module IN LISTS QT_BUILD_SUBMODULES)
--- a/LICENSE.QT-LICENSE-AGREEMENT
+++ b/LICENSE.QT-LICENSE-AGREEMENT
@@ -1061,6 +1061,7 @@ The Agreement includes following Appendices 1-10, as applicable.
 - Appendix 8: Intentionally left blank (optional)
 - Appendix 9: Support Terms
 - Appendix 10: Conversion from legacy Licenses to Subscription (optional)
+- Appendix 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY


 APPENDIX 1: LICENSED SOFTWARE
@@ -1252,7 +1253,7 @@ only ("Redistributables") are marked with "R" in the below table.
 +----------------------------------------------------------+
 | Device Utilities                 |     |     | X,R | X,R |
 +----------------------------------------------------------+
-| Qt Debugging Bridge (QBD) Daemon |     |     | X,R | X,R |
+| Qt Debugging Bridge (QDB) Daemon |     |     | X,R | X,R |
 +----------------------------------------------------------+
 | Qt Quick Ultralite Controls      |     |     | X,R | X,R |
 +----------------------------------------------------------+
@@ -1668,116 +1669,152 @@ Content Format and Channel as mentioned in paragraph 3 and 4.
 APPENDIX 8: INTENTIONALLY LEFT BLANK

 APPENDIX 9: SUPPORT TERMS
+Version 2023-04

-These Qt support terms and conditions ("Support Terms") set forth the legal
-framework, where under The Qt Company ("The Qt Company") provides support
+These Qt support terms and conditions (“Support Terms”) set forth the legal
+framework, where under The Qt Company (“The Qt Company”) provides support
 services (as herein defined) to the Licensee.

 1 DEFINITIONS

-"Application Code" shall mean a computer software program written strictly
+“Application Code” shall mean a computer software program written strictly
 using the Qt programming language, by or for the Licensee, with a user
 interface, enabling the Licensee or their users to accomplish a specific task
 and display any results of the task on the display monitor or screen.

-"Dedicated Contact" shall mean the employee of The Qt Company who will be the
-first point of contact for all Designated Users' requests for Support.
+“Customer Portal” shall mean The Qt Company’s web-based service and support
+user interface located at https://account.qt.io/ or at another location
+designated by The Qt Company. Customer Portal is used by a Designated User with
+Qt Account, and it provides downloads, license management, license certificate
+and other services for Designated Users.

-"Errors" shall mean an error, flaw, mistake, failure, or fault in Licensed
+“Dedicated Contact” shall mean the employee of The Qt Company who will be the
+first point of contact for all Designated Users’ requests for Support.
+
+“Errors” shall mean an error, flaw, mistake, failure, or fault in Licensed
 Software that prevents it from behaving as described in the relevant
-documentation or as agreed between the Parties.
+documentation or as agreed between the Parties. Designated User can follow the
+state and progress of Errors in Customer Portal.

-"Extended Support" shall mean a continuation to the normal Support period,
+“Extended Support” shall mean a continuation to the normal Support period,
 which allows Designated Users to receive selected Support (Standard Support or
 Premium Support) for a version of Licensed Software that is no longer generally
 supported by The Qt Company.

-"Install Support" shall mean Support that is limited to installation related
+”Install Support” shall mean Support that is limited to installation-related
 Error(s) on Development Platforms specified as supported host platforms for
-each Qt release under doc.qt.io.
+each Qt release under doc.qt.io. Install Support covers also operational use of
+the QA Tools, but not operational use of Qt Software.

-"Maintenance Release" shall mean a release or version of Licensed Software
+“Maintenance Release” shall mean a release or version of Licensed Software
 containing bug fixes, error corrections and other changes targeted to
 maintaining and improving product stability and quality. Maintenance Releases
 are generally depicted as a change to the third digit of Licensed Software
 version number.

-"Platforms" shall mean both Development Platforms and Deployment Platforms.
+“Platforms” shall mean both Development Platforms and Deployment Platforms.
 Supported host and target Platforms may vary from for each Qt release as
 defined under doc.qt.io.

-"Premium Support" shall mean an upgraded level of Support that The Qt Company
+“Premium Support” shall mean an upgraded level of Support that The Qt Company
 provides pursuant to these Support Terms to Licensee if Licensee has purchased
-Premium Support instead of Standard Support. Premium Support shall always be
-purchased for all Designated User(s) in the respective development team of the
-Licensee.
+Premium Support instead of Standard Support. Premium Support also covers what
+is included in Standard Support. Premium Support shall always be purchased for
+all Designated User(s) in the respective development team of the Licensee.

-"Response Time" shall mean the period of time from when Licensee notifies
-TheQt Company about an Error or requests Support until The Qt Company provides
+“Qt Account” shall mean the Qt Account for a Designated User used for using Qt
+services and Customer Portal. A Qt Account is mapped to the Licensee company
+with the corporate email domain or domains.
+
+”Qualification Kit” shall mean a set of documents and validation test cases
+used for product certification needs as defined in section 2.6.
+
+“Response Time” shall mean the period of time from when Licensee notifies The
+Qt Company about an Error or requests Support until The Qt Company provides
 Licensee with a response that addresses (but not necessarily resolves) the
 reported Error or provides the requested Support.

-"Standard Support" shall mean standard level of Support that The Qt Company
-provides pursuant to these Support Terms to Licensee.
+“Standard Support” shall mean standard level of Support that The Qt Company
+provides pursuant to these Support Terms to Licensee.  Standard Support also
+covers what is included in Install Support.

-"Support" shall mean developer assistance that is provided by The Qt Company
-to assist eligible Designated Users in Licensed Software installation, usage
-and functionality problem resolution for Error(s) and Error workarounds
-pursuant to the terms of these Support Terms. Support for different products is
-available as specified in the below table ("X" marking the Support that is
-included in the license price, optional Add-on Support services are marked as
-"O"):
+“Security Issue” shall mean an Error that may cause a vulnerability in a system
+or application that uses the Licensed Software.

-+-----------------------------------------------------------------------+
-|                       |ADP|ADE|DCP|DCE|DSP|DSE|Squish|Coco|Test Center|
-+-----------------------------------------------------------------------+
-| Install Support       | X | X | X | X | X | X |  X   |  X |     X     |
-+-----------------------------------------------------------------------+
-| Standard Support      |   | X | X | X | X | X |  X   |  X |     X     |
-+-----------------------------------------------------------------------+
-| Premium Support       |   | O | O | O | O | O |  O   |  O |     O     |
-+-----------------------------------------------------------------------+
-| Extended Support      |   | O | O | O | O | O |      |    |           |
-+-----------------------------------------------------------------------+
-| Tool Qualification Kit|   |   |   |   |   |   |  O   |  O |           |
-+-----------------------------------------------------------------------+
+“Support” shall mean developer assistance that is provided by The Qt Company to
+assist eligible Designated Users in Licensed Software installation, usage and
+functionality problem resolution for Error(s) and Error workarounds pursuant to
+the terms of these Support Terms. Support for different products is available
+as specified in the below table (‘X’ marking the Support that is included in
+the license price, optional Add-on Support services are marked as ‘O’):

-"Support Validity Term" shall mean the Development License Term or any other
-fixed time period agreed between the Parties during which time the Customer is
+-----------------------------------------------------------------------------+
+|                        | Install| Standard| Premium| Extended| Qualification|
+|                        | Support| Support | Support| Support | Kit          |
+-----------------------------------------------------------------------------+
+| DSP                    |    X   |     X   |    O   |     O   |              |
+-----------------------------------------------------------------------------+
+| DSE                    |    X   |     X   |    O   |     O   |              |
+-----------------------------------------------------------------------------+
+| ADP                    |    X   |         |        |         |              |
+-----------------------------------------------------------------------------+
+| ADE                    |    X   |     X   |    O   |     O   |              |
+-----------------------------------------------------------------------------+
+| DCP                    |    X   |     X   |    O   |     O   |              |
+-----------------------------------------------------------------------------+
+| DCE                    |    X   |     X   |    O   |     O   |              |
+-----------------------------------------------------------------------------+
+| Squish                 |    X   |     X   |    O   |         |       O      |
+-----------------------------------------------------------------------------+
+| Coco                   |    X   |     X   |    O   |         |       O      |
+-----------------------------------------------------------------------------+
+| Test Center            |    X   |     X   |    O   |         |       O      |
+-----------------------------------------------------------------------------+
+| Axivion Suite          |    X   |     X   |        |         |              |
+-----------------------------------------------------------------------------+
+| Architecture Analysis  |    X   |     X   |        |         |              |
+-----------------------------------------------------------------------------+
+| Static Code Analysis   |    X   |     X   |        |         |              |
+-----------------------------------------------------------------------------+
+| Static Coverage        |    X   |     X   |        |         |              |
+| Analysis Professional  |        |         |        |         |              |
+-----------------------------------------------------------------------------+
+| Qt Insight             |        |     X   |        |         |              |
+-----------------------------------------------------------------------------+
+
+“Support Validity Term” shall mean the Development License Term or any other
+fixed time period agreed between the Parties during which time the Licensee is
 eligible to receive Support from The Qt Company.

-"Tool Qualification Kit" shall mean a customized set of documents and
-validation test cases.
-
 2 SUPPORT SERVICES

 2.1  Support Services Provided by The Qt Company

 Subject to these Support Terms and during the Support Validity Term, The Qt
-Company will via its web-based support user-interface, provide Designated
-User(s) with Support for the Platforms which Customer has licensed under the
-Agreement.
-The Qt Company will make commercially reasonable efforts to solve any Errors
-reported by Designated User(s).  Resolution of an Error may be provided through
+Company will via its Customer Portal, provide Designated User(s) with Support
+for the Licensed Software which Licensee has licensed under the Agreement. The
+Qt Company will make commercially reasonable efforts to solve any Errors
+reported by Designated User(s). Resolution of an Error may be provided through
 Designated User(s) themselves downloading of a later released version of the
 applicable Licensed Software product(s) or providing the Designated User with a
-temporary workaround addressing such Error.
+workaround addressing such Error or providing the Designated User with an
+updated tool configuration.

 2.2  Licensee's Obligations

-To report an Error, the Designated User shall register the Error on The Qt
-Company's web-based support user interface located at:
-https://account.qt.io/login or at another location designated by The Qt Company.
+To report an Error, the Designated User shall register the Error on the
+Customer Portal. If the Designated User considers the reported Error to be a
+Security Issue, the Error shall be marked as a Security Issue.

 The Designated User must provide adequate information and documentation to The
 Qt Company to enable it to recreate the Error or problem for which the
-Designated User has sought assistance.
-To ensure efficient handling of Errors, the Designated User must provide the
-following information, where relevant:
+Designated User has sought assistance. To ensure efficient handling of Errors,
+the Designated User must provide the following information, where relevant:
 - A clear, detailed description of the problem, question or suggestion;
 - Identification of which Licensed Software product and version is affected;
 - Identification of the operating environment (e.g. operating system, hardware
-  Platform, build tools, etc.) on which the problem exists;
+  Platform, build tools, tool configuration, etc.) on which the problem exists;
+- Marking the issue as a Security Issue, when reporting a Security Issue;
 - On Standard Support: A complete and compilable test case of not more than 500
 lines of code that demonstrates the problem;
 - On Premium Support: A complete and compilable test case that demonstrates the
@@ -1799,29 +1836,30 @@ General limitations:

 Each version or release of the Licensed Software will be Supported under
 Standard Support or Premium Support only for limited time period as set forth
-in doc.qt.io. For example, regular releases of Qt Software are supported for
-one (1) year from the release date of the version x.y.0 and Long Term Support
-(LTS) Releases are supported for a period of three (3) years from the release
-date of the LTS version x.y.0.
+in doc.qt.io or in documentation provided with the respective Licensed Software
+product. If nothing is documented, a release of Licensed Software is supported
+for one (1) year from the release date of the version x.y.0 and Long Term
+Support (LTS) Releases are supported for a period of three (3) years from the
+release date of the LTS version x.y.0.

-The Qt Company shall only provide Support for Designated User(s).
-
-Support is made available for the entire development teams only: It is not
-allowed to purchase Support only for some members of the development team, and
-all Designated Users of the respective development team must be eligible for
-the same level of Support.
+The Qt Company shall only provide Support for Designated User(s) through
+Customer Portal.Support is made available for the entire development teams
+only: It is not allowed to purchase Support only for some members of the
+development team, and all Designated Users of the respective development team
+must be eligible for the same level of Support.

 Support is not provided for snapshots, preview releases, beta releases or
 release candidates.

-The Qt Company shall have no obligation to provide Support for hardware or
-operating system specific  problems or problems arising from improper use,
-accident, neglect or modification of Qt.
+The Qt Company shall have no obligation to provide Support for 3rd party
+components, hardware or operating system specific problems or problems arising
+from improper use, accident, neglect, or modification of Qt.

 Limitations with Install Support:

-Support limited to Error(s) regarding installation and setting up of the Qt
-development environment on host Platforms.
+Support limited to (i) Error(s) regarding installation and setting up of the Qt
+development environment on host Platforms, or (ii) Errors impacting operational
+use of the QA Tools.

 Limitations with Standard Support:

@@ -1847,31 +1885,60 @@ will make commercially reasonable efforts to provide a solution on closest
 corresponding supported Platform.

 Premium Support is optional and purchased for an agreed bucket of hours
-("Bucket"). Hours can be used by any Designated User in the respective
+(“Bucket”). Hours can be used by any Designated User in the respective
 development team. To encourage continuous usage of the Support, ten percent
 (10%) of the purchased Bucket shall automatically expire (regardless of whether
 such support hours are actually used or not by the Licensee) each month after
 three (3) months from the purchase of the Premium Support.

-2.4 Extended Support
+2.4 Handling of Security Issues
+
+The reported Errors marked as Security Issues will be assessed by experts to
+determine the severity of the issue and to verify if it indeed is a valid
+Security Issue. The Designated User who reported the issue may be contacted for
+more details. If the reported issue is not deemed to be a Security Issue, it
+will be treated as a normal Error and handled accordingly.
+
+A verified Security Issue will be fixed as soon as possible. Qt Company will
+notify all Licensees via appropriate channels about the Security Errors and
+availability of patches for Licensed Software. Typically, a fix for the
+Security Issue is included in the next Maintenance Release of Licensed
+Software.
+
+If the Security Issue is reported in a third-party library used in Licensed
+Software, The Qt Company will notify the relevant third party of such Security
+Issue detected in their library. When the Security Issue is fixed in the
+third-party library, the new version of the third-party library will be in the
+next feasible Maintenance Release of the Licensed Software. If a fixed version
+of the third-party library is not available, The Qt Company may instead decide
+to include documentation regarding the issue, or a patch for this third-party
+library.
+
+All known Security Issues in Licensed Software will be mentioned as part of the
+change notes released with each version of Licensed Software.
+
+2.5 Extended Support

 Extended Support extends the Support Validity Term for a release of Licensed
 Software that is no longer generally supported.

 Extended Support includes and is by default provided with Standard Support
-rules and limitations, unless Extended Support is purchased with Premium
-Support in which case Premium Support rules and limitations will apply.
+rules and limitations, unless Extended Support is purchased together with
+Premium Support in which case Premium Support rules and limitations will apply.

 Extended Support is optional and purchased with annual fee and separately per
 each Licensee product. Extended Support will need definition of (i) Licensee
-product, (ii) used Platform(s) and (iii) Licensed Software version(s).
+product, (ii) used Platform(s) and (iii) Licensed Software version(s). For
+avoidance of doubt, Extended Support requires that the Designated User has a
+valid license for the respective Licensed Software.

-2.5 Tool Qualification Kit
+2.6 Qualification Kit

-The Qt Company shall provide set of customized documents and validation tests
-that enable Licensee to qualify QA testing tool for the purpose of ISO 26262,
-EN 50128, DO-330, IEC 61508, IEC 62304 or IEC 13485 certification Licensee end
-to end solution.
+The Qt Company shall provide a set of documents and validation tests that
+enable the Licensee to qualify QA testing tool (subject to a separate fee) or
+Qt Safe Renderer for the purpose of safety certification of Licensee end-to-end
+solution. Exact complied safety standards may vary between products, used
+features, use case, and industry.

 3 RESPONSE TIME

@@ -1884,6 +1951,9 @@ exceed two (2) business days.
 Premium Support: Errors and Support requests will have a Response Time not to
 exceed one (1) business day.

+Security Issues: Errors that are Security Issues will have a Response Time not
+to exceed one (1) business day.
+
 For complex issues, The Qt Company may provide an initial response to the
 Designated User and then follow up, without undue delay, with additional
 communication before an Error is properly addressed or Support provided.
@@ -1907,7 +1977,7 @@ All Support requests will be handled with high priority.

 5 MAINTENANCE RELEASES, UPDATES AND UPGRADES

-Under the Support the Customer is eligible for Maintenance Releases and Updates
+Under the Support the Licensee is eligible for Maintenance Releases and Updates
 that The Qt Company generally makes available to customers who has purchased
 Support. Unless otherwise decided by The Company at its free and absolute
 discretion, Upgrades will not be provided under the Support.
@@ -1919,6 +1989,7 @@ previous version of Licensed Software:
 - Fixes related to build issues on supported Platforms;
 - Error corrections specific to a single Platform that are not present on other
  Platforms;
+- Corrections to Security Issues;
 - Critical Error corrections such as crashes, data corruption, loss of data,
  race conditions; and
 - Updates to documentation and license information when deemed necessary by
@@ -1975,3 +2046,46 @@ remain outstanding on the Current Licenses under the applicable terms Licensee
 will continue to make such payments in accordance with the applicable order
 documentation, notwithstanding the fact that the Current Licenses are being
 converted to Development Licenses pursuant to this Appendix.
+
+APPENDIX 11: TERMS OF USE - QT INSIGHT TRACKER LIBRARY
+Version 1.0
+
+Qt Insight Tracker Library ("Tracker Library") is a software module used to
+collect end user data from Customer's Application and Devices relating to The
+Qt Company's Qt Insight online service the Customer is ordering from The Qt
+Company under a separate service agreement ("Service Agreement").
+
+Unless otherwise set forth herein, definitions written in capital letters used
+herein shall have the meaning set forth in the Service Agreement.
+
+Subject to these terms The Qt Company grants to Customer a worldwide,
+non-exclusive, non-transferable, royalty-free, revocable (for cause) right and
+license, valid for the term of the Service Agreement, to
+    (i)  use, copy and modify Tracker Library for the purpose of including it
+         into the Devices and Applications and solely for the purpose of being
+         used only in conjunction with Insight Cloud or Insight Private Cloud,
+         and
+    (ii) distribute, by itself or through its Contractors, Tracker Library as
+         installed, incorporated, or integrated into Applications and/or
+         Devices.
+
+Use of Tracker Library in a way or for the purpose other than the above is
+strictly prohibited. Tracker Library is licensed to the Customer in all
+respects "as is".
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
+ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
+WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
+NON-INFRINGEMENT WITH REGARD TO THE TRACKER LIBRARY. THE QT COMPANY DOES NOT
+WARRANT THAT THE TRACKER LIBRARY WILL SATISFY CUSTOMER'S REQUIREMENTS OR THAT
+IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
+UNINTERRUPTED.
+IN NO EVENT SHALL THE QT COMPANY BE LIABLE TO THE CUSTOMER FOR ANY LOSS OF
+PROFIT, LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT,
+SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY
+KIND, HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THE USE OF THE TRACKER
+LIBRARY.
+
+THE TOTAL MAXIMUM LIABILITY OF THE QT COMPANY UNDER THESE TERMS SHALL IN NO
+EVENT EXCEED 10,000 EUROS.
--- a/coin/platform_configs/address_sanitizer_platforms.yaml
+++ b/coin/platform_configs/address_sanitizer_platforms.yaml
@@ -1,12 +1,14 @@
 Version: 2
 Configurations:
 -
-    Id: 'OpenSUSE-15.4-host-ASAN'
+    Id: 'opensuse-15.4-host-asan'
    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
+        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -7,41 +7,61 @@ Include: [
    macos.yaml
    ]
 Configurations:
+# Build on Ubuntu 22.04 and test on both X11 and Wayland later
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04-documentation'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
+    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'Ubuntu-20.04-host'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure']
+    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',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
+# Test on Ubuntu 22.04 X11
 -
-    Id: 'OpenSUSE-15.4-host'
+    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-documentation'
+-
+    Id: 'ubuntu-22.04-x11-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly']
+    Platform dependency: 'ubuntu-22.04'
+-
+    Id: 'opensuse-15.4-developer-build'
    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
+        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
 -
+    Id: 'sles-15_sp4-static'
    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-mysql'
    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
 -
+    Id: 'windows-10_22h2-msvc2019'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
@@ -55,6 +75,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
+    Id: 'windows-11_22h2-msvc2019'
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
@@ -67,18 +88,20 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
+    Id: 'windows-10_22h2-msvc2022'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'MSVC2022'
    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
    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}}\..',
+        '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}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
+    Id: 'windows-11_22h2-msvc2022'
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'MSVC2022'
    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
@@ -91,7 +114,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
-    Id: 'Windows10_22H2-MSVC2019-x64-host'
+    Id: 'windows-10_22h2-msvc2019-developer-build'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
@@ -104,11 +127,12 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
+    Id: 'windows-10_22h2-msvc2019-arm64'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
    Environment variables: [
        '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}}',
@@ -121,11 +145,11 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
-    Id: 'Windows11_22H2-MSVC2019-x64-host'
+    Id: 'windows-11_22h2-msvc2019-developer-build'
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
+    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}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
@@ -133,11 +157,12 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
+    Id: 'windows-11_22h2-msvc2019-arm64'
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'Windows11_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
@@ -147,11 +172,22 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
-    Id: 'RHEL-8.4-host'
+    Id: 'rhel-8.4'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
    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}}',
+        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+    ]
+-
+    Id: 'rhel-9.0'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    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',
        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
@@ -164,7 +200,7 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
@@ -172,7 +208,7 @@ Configurations:
        'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
    ]
 -
-    Id: 'Windows10_22H2-Mingw11-x64-host'
+    Id: 'windows-10_22h2-mingw11'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure']
@@ -187,7 +223,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
    ]
 -
-    Id: 'Windows10_22H2-LLVM-x64-host'
+    Id: 'windows-10_22h2-llvm'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'Clang'
    Features: ['Sccache', 'UseConfigure']
@@ -201,7 +237,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
    ]
 -
-    Id: 'Windows11_22H2-LLVM-x64-host'
+    Id: 'windows-11_22h2-llvm'
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'Clang'
    Features: ['Sccache', 'UseConfigure']
@@ -215,6 +251,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
    ]
 -
+    Id: 'windows-10_22h2-mingw11-developer-build'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
@@ -228,6 +265,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
    ]
 -
+    Id: 'windows-11_22h2-mingw11-developer-build'
    Template: 'qtci-windows-11_22H2-x86_64-50'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -1,12 +1,12 @@
 Version: 2
 Configurations:
 -
-    Id: 'qemu-armv7-on-ubuntu20.04'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'qemu-armv7-developer-build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -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',
@@ -18,11 +18,12 @@ Configurations:
        'QT_QUICK_BACKEND=software',
    ]
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'qemu-arm64-developer-build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
@@ -34,11 +35,12 @@ Configurations:
        'QT_QUICK_BACKEND=software',
    ]
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'qemu-mips64-developer-build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'mips64'
    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -1,13 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: 'qnx-x86_64-on-ubuntu20.04'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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-20.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -16,24 +16,26 @@ Configurations:
        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
    ]
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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-20.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    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',
    ]
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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-20.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15-static'
+    Id: 'sles-15_sp4-minimal-static'
    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -10,6 +10,7 @@ Configurations:
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
    ]
 -
+    Id: 'windows-10_22h2-minimal-static'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'MSVC2019'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -21,6 +22,7 @@ Configurations:
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
 -
+    Id: 'macos-11-minimal-static'
    Template: 'qtci-macos-11-x86_64-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -7,23 +7,24 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
    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 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',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}}',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
+    Id: 'android-armv7-on-windows'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
+    Platform dependency: 'windows-10_22h2-mingw11'
    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -31,39 +32,42 @@ Configurations:
        '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',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}}',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
-    Id: 'RHEL-8.4-Android-x86'
+    Id: 'android-6-x86-on-linux'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    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',
        '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}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
        'ANDROID_EMULATOR=@emulator_x86_api_23',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
-    Id: 'RHEL-8.4-Android-x86_64'
+    Id: 'android-13-x86_64-on-linux'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Platform dependency: 'rhel-8.4'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    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}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
+        'ANDROID_EMULATOR=@emulator_x86_64_api_33'
    ]
--- a/coin/platform_configs/cmake_platforms_target_android_12.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml
@@ -1,18 +0,0 @@
-Version: 2
-Configurations:
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    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',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=@emulator_x86_64_api_31'
-    ]
--- a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml
@@ -1,18 +0,0 @@
-Version: 2
-Configurations:
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', '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',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=@emulator_x86_64_api_31'
-    ]
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -5,7 +5,7 @@ Configurations:
    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'OpenSUSE-15.4-host'
+    Platform dependency: 'opensuse-15.4-developer-build'
    Features: ['Sccache', 'DisableTests']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -17,7 +17,7 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
+    Platform dependency: 'windows-10_22h2-mingw11'
    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -34,7 +34,7 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'ubuntu-22.04-license-check'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -34,6 +34,6 @@ Configurations:
        Features: ['Packaging', 'UseLegacyInstructions']
        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'GCC'
        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -1,14 +1,14 @@
 Version: 2
 Configurations:
    -
-      Id: "integrity-arm64-on-ubuntu20.04"
-      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+      Id: "integrity-arm64"
+      Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
      Compiler: 'GCC'
      Target os: 'INTEGRITY'
-      Platform dependency: 'Ubuntu-20.04-host'
+      Platform dependency: 'ubuntu-22.04'
      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
      Environment variables: [
-          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
+          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
          'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
          'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -1,13 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: "ios-tests-target"
+    Id: "ios-tests-on-macos"
    Template: 'qtci-macos-12-x86_64-105'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    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'
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/coin/platform_configs/linux_android_tests_developer.yaml
@@ -1,16 +1,18 @@
 Version: 2
 Configurations:
 -
+    Id: 'android-x86-developer-build-testrun-on-linux'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
    Environment variables: [
        '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}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
        'CONAN_INSTALL_DIR={{.InstallDir}}/target',
        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -1,16 +1,16 @@
 Version: 2
 Configurations:
 -
-    Id: 'RHEL_Android_Multi'
+    Id: 'rhel_8.4_android_multi'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'multi'
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: [
-        'RHEL-8.4-host',
-        'RHEL-8.4-Android-x86',
-        'RHEL-8.4-Android-x86_64'
+        'rhel-8.4',
+        'android-6-x86-on-linux',
+        'android-13-x86_64-on-linux'
    ]
    Features: [
        'Sccache',
@@ -19,8 +19,8 @@ Configurations:
        'InstallDepsPerPlatformSubdir'
    ]
    Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-host',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86_64',
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.4',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
    ]
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -8,7 +8,7 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-latest-xcode-universal-packaging-build'
+        Id: 'macos-universal-on-x86_64'
        Template: 'qtci-macos-12-x86_64-105'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
@@ -22,7 +22,7 @@ Configurations:
        ]

    -
-        Id: 'macos-latest-xcode-arm64-universal-build'
+        Id: 'macos-universal-on-arm64'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
@@ -41,43 +41,43 @@ Configurations:
        Template: 'qtci-macos-11-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
    -
        Id: 'macos-11-arm64-tests'
        Template: 'qtci-macos-11.0-arm64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
    -
        Id: 'macos-12-arm64-tests'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
    -
        Id: 'macos-13-arm64-tests'
        Template: 'qtci-macos-13-arm64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
    -
        Id: 'macos-12-x86_64-tests'
        Template: 'qtci-macos-12-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
    -
-        Id: 'macos-12-arm64-arm64-universal-build-tests'
+        Id: 'macos-12-arm-on-arm64-tests'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
+        Platform dependency: 'macos-universal-on-arm64'
    -
-        Id: 'macos-12-x86_64-arm64-universal-build-tests'
+        Id: 'macos-12-arm-on-x86_64-tests'
        Template: 'qtci-macos-12-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
+        Platform dependency: 'macos-universal-on-arm64'

    # =========================================================================
    # Developer build. Single architecture builds.
@@ -86,7 +86,7 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-latest-xcode-x86_64-developer-build'
+        Id: 'macos-12-x86_64-developer-build'
        Template: 'qtci-macos-12-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -97,7 +97,7 @@ Configurations:
            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
        ]
    -
-        Id: 'macos-latest-xcode-arm64-developer-build'
+        Id: 'macos-12-arm64-developer-build'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -116,28 +116,28 @@ Configurations:
        Template: 'qtci-macos-11-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+        Platform dependency: 'macos-12-x86_64-developer-build'
    -
        Id: 'macos-11-arm64-developer-build-tests'
        Template: 'qtci-macos-11.0-arm64'
        Compiler: 'Clang'
        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
    -
        Id: 'macos-12-x86_64-developer-build-tests'
        Template: 'qtci-macos-12-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+        Platform dependency: 'macos-12-x86_64-developer-build'
    -
        Id: 'macos-12-arm64-developer-build-tests'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
    -
        Id: 'macos-13-arm64-developer-build-tests'
        Template: 'qtci-macos-13-arm64'
        Compiler: 'Clang'
        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
--- a/coin/platform_configs/meta-boot2qt.yaml
+++ b/coin/platform_configs/meta-boot2qt.yaml
@@ -2,42 +2,42 @@ Version: 2
 Module only: True
 Configurations:
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET1'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET2'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET3'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET4'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET5'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET6'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET7'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET8'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET9'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
        Compiler: 'Yocto'
        Target arch: 'TARGET10'
--- a/coin/platform_configs/nightly_macos13.yaml
+++ b/coin/platform_configs/nightly_macos13.yaml
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Include: [
    macos.yaml: [
-        "macos-latest-xcode-arm64-developer-build"
+        "macos-12-arm64-developer-build"
    ]
 ]
 Configurations:
@@ -11,4 +11,4 @@ Configurations:
    Template: 'qtci-macos-13-arm64'
    Compiler: 'Clang'
    Features: ['TestOnly']
-    Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+    Platform dependency: 'macos-12-arm64-developer-build'
--- a/coin/platform_configs/nightly_qnx710_host_windows.yaml
+++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml
@@ -1,17 +1,18 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        Windows10_22H2-MSVC2019-x64-host
+        windows-10_22h2-msvc2019-developer-build
    ]
 ]
 Configurations:
 -
+    Id: 'qnx-710-arm64-on-windows'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'MSVC2019'
    Target compiler: 'QCC'
-    Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
    Features: ['DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
--- a/coin/platform_configs/nightly_rhel_9.yaml
+++ b/coin/platform_configs/nightly_rhel_9.yaml
@@ -1,44 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'RHEL-9.0-host'
-    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure']
-    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',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
-
-    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    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}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
--- a/coin/platform_configs/nightly_ubuntu_22_04.yaml
+++ b/coin/platform_configs/nightly_ubuntu_22_04.yaml
@@ -2,12 +2,13 @@ Version: 2
 Configurations:
 -
    # cmake_platforms.yaml
+    Id: 'ubuntu-22.04-documentation'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'UseConfigure']
    Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
-    Id: 'Ubuntu-22.04-host'
+    Id: 'ubuntu-22.04'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
@@ -17,11 +18,12 @@ Configurations:
    ]
 -
    # cmake_platforms_qemu.yaml
+    Id: 'qemu-armv7-developer-build-on-ubuntu-22.04'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -32,11 +34,12 @@ Configurations:
        'QT_QUICK_BACKEND=software',
    ]
 -
+    Id: 'qemu-arm64-developer-build-on-ubuntu-22.04'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -47,11 +50,12 @@ Configurations:
        'QT_QUICK_BACKEND=software',
    ]
 -
+    Id: 'qemu-mips64-developer-build-on-ubuntu-22.04'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Target os: 'QEMU'
    Target arch: 'mips64'
    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Sccache', 'DisableTests']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -63,12 +67,13 @@ Configurations:
    ]
 -
    # cmake_platforms_qemu_qnx710.yaml
+    Id: 'qnx-710-x86_64-developer-build-on-ubuntu-22.04'
    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-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -77,24 +82,26 @@ Configurations:
        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
    ]
 -
+    Id: 'qnx-710-arm64-on-ubuntu-22.04'
    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-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    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',
    ]
 -
+    Id: 'qnx-710-armv7-on-ubuntu-22.04'
    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-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['Packaging', 'DisableTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -102,15 +109,17 @@ Configurations:
    ]
 -
    # default.yaml
+    Id: 'ubuntu-22.04-license-check'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
 -
    # integrity.yaml
+    Id: 'integrity-arm64-on-ubuntu-22.04-x86_64'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Target os: 'INTEGRITY'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
    Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -2,8 +2,8 @@ Version: 2
 Module only: True
 Include: [
  cmake_platforms.yaml: [
-    "Ubuntu-20.04-host",
-    "Windows10_22H2-MSVC2019-x64-host",
+    "ubuntu-22.04",
+    "windows-10_22h2-msvc2019-developer-build",
    "ios-universal"
  ],
  macos.yaml: [
@@ -13,10 +13,10 @@ Include: [
    "android-arm64-on-macos"
  ],
  cmake_platforms_qemu.yaml: [
-    "qemu-armv7-on-ubuntu20.04"
+    "qemu-armv7-developer-build"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
-    "qnx-x86_64-on-ubuntu20.04"
+    "qnx-710-x86_64-developer-build-on-linux"
  ]
 ]
 Configurations: []
--- a/coin/platform_configs/pyside-setup.yaml
+++ b/coin/platform_configs/pyside-setup.yaml
@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']

--- a/coin/platform_configs/qmake2cmake.yaml
+++ b/coin/platform_configs/qmake2cmake.yaml
@@ -10,10 +10,10 @@ Configurations:
    Compiler: 'Clang'
    Features: ['DisableTests']
 -
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
    Compiler: 'GCC'
    Features: ['DisableTests']
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -22,18 +22,18 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
    Compiler: 'GCC'
    Features: ['Qt5', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-10.15-x86_64-1022'
+    Template: 'qtci-macos-11-x86_64-106'
    Compiler: 'Clang'
    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']
--- a/coin/platform_configs/qt3d.yaml
+++ b/coin/platform_configs/qt3d.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+]
 Configurations: []
--- a/coin/platform_configs/qt5compat.yaml
+++ b/coin/platform_configs/qt5compat.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtactiveqt.yaml
+++ b/coin/platform_configs/qtactiveqt.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -5,7 +5,6 @@ Include: [
    integrity.yaml,
    ios-tests.yaml,
    address_sanitizer_platforms.yaml,
-    cmake_platforms_target_android_12_insignificant.yaml,
    linux_android_tests_multi_abi.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtcharts.yaml
+++ b/coin/platform_configs/qtcharts.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtconnectivity.yaml
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtdatavis3d.yaml
+++ b/coin/platform_configs/qtdatavis3d.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -3,7 +3,6 @@ Include: [
    cmake_platforms.yaml,
    integrity.yaml,
    ios-tests.yaml,
-    cmake_platforms_static_tests.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms_static_tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtdoc.yaml
+++ b/coin/platform_configs/qtdoc.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qthttpserver.yaml
+++ b/coin/platform_configs/qthttpserver.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_target_android_12.yaml
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtlanguageserver.yaml
+++ b/coin/platform_configs/qtlanguageserver.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_target_android_12.yaml
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtlottie.yaml
+++ b/coin/platform_configs/qtlottie.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtmqtt.yaml
+++ b/coin/platform_configs/qtmqtt.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtmultimedia.yaml
+++ b/coin/platform_configs/qtmultimedia.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtnetworkauth.yaml
+++ b/coin/platform_configs/qtnetworkauth.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtopcua.yaml
+++ b/coin/platform_configs/qtopcua.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtpositioning.yaml
+++ b/coin/platform_configs/qtpositioning.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtqa.yaml
+++ b/coin/platform_configs/qtqa.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtquick3d.yaml
+++ b/coin/platform_configs/qtquick3d.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_target_android_12.yaml
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtquick3dphysics.yaml
+++ b/coin/platform_configs/qtquick3dphysics.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtquicktimeline.yaml
+++ b/coin/platform_configs/qtquicktimeline.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtremoteobjects.yaml
+++ b/coin/platform_configs/qtremoteobjects.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_target_android_12.yaml
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtsaferenderer-runtime.yaml
+++ b/coin/platform_configs/qtsaferenderer-runtime.yaml
@@ -0,0 +1,32 @@
+Version: 2
+Include: [
+  macos.yaml: [
+     "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-documentation",
+    "opensuse-15.4-developer-build",
+    "sles-15_sp4-static",
+    "windows-10_22h2-msvc2019",
+    "windows-10_22h2-msvc2022",
+    "windows-10_22h2-msvc2019-developer-build",
+    "rhel-8.4",
+    "windows-10_22h2-mingw11",
+    "windows-10_22h2-mingw11-developer-build",
+    "windows-10_22h2-llvm",
+    "windows-11_22h2-msvc2019"
+  ],
+  cmake_platforms_qemu_qnx710.yaml: [
+    "qnx-710-x86_64-developer-build-on-linux",
+    "qnx-710-arm64-on-linux",
+    "qnx-710-armv7-on-linux"
+  ],
+  integrity.yaml: [
+    "integrity-arm64"
+  ]
+]
+Configurations: []
+
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,24 +1,59 @@
 Version: 2
+Include: [
+  macos.yaml: [
+     "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-documentation",
+    "opensuse-15.4-developer-build",
+    "sles-15_sp4-static",
+    "windows-10_22h2-msvc2019",
+    "windows-10_22h2-msvc2022",
+    "rhel-8.4",
+    "windows-10_22h2-mingw11",
+    "windows-10_22h2-llvm",
+    "windows-11_22h2-msvc2019"
+  ],
+  cmake_platforms_qemu_qnx710.yaml: [
+    "qnx-710-x86_64-developer-build-on-linux",
+    "qnx-710-arm64-on-linux",
+    "qnx-710-armv7-on-linux"
+  ]
+]
+# Static build configurations for tools
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-    Features: ['UseLegacyInstructions']
-
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
+    Id: 'macos-latest-xcode-universal-static-build'
+    Template: 'qtci-macos-12-x86_64-105'
+    Target os: 'MacOS_12_Static'
+    Compiler: 'Clang'
+    Target arch: 'x86_64-arm64'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
+    Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-sql-mysql'
+    Environment variables: [
+        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
+    ]
 -
+    Id: 'Linux-RHEL_8_4_Static'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'RHEL_8_4_Static'
    Compiler: 'GCC'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+    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',
+        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
+    ]
 -
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+    Id: 'Windows-MSVC2019_Static'
+    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Target os: 'Windows_10_Static'
+    Compiler: 'MSVC2019'
+    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 -plugin-sql-sqlite -plugin-sql-odbc'
+    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}}']
--- a/coin/platform_configs/qtscxml.yaml
+++ b/coin/platform_configs/qtscxml.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtsensors.yaml
+++ b/coin/platform_configs/qtsensors.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtserialbus.yaml
+++ b/coin/platform_configs/qtserialbus.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtserialport.yaml
+++ b/coin/platform_configs/qtserialport.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_target_android_12.yaml
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtspeech.yaml
+++ b/coin/platform_configs/qtspeech.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    integrity.yaml,
-    cmake_platforms_target_android_12.yaml
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qttools.yaml
+++ b/coin/platform_configs/qttools.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qttranslations.yaml
+++ b/coin/platform_configs/qttranslations.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtvirtualkeyboard.yaml
+++ b/coin/platform_configs/qtvirtualkeyboard.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtwayland.yaml
+++ b/coin/platform_configs/qtwayland.yaml
@@ -1,6 +1,18 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
-Configurations: []
+Configurations:
+# Test on Ubuntu 22.04 Wayland
+-
+    Id: 'ubuntu-22.04-documentation-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-22.04-documentation'
+-
+    Id: 'ubuntu-22.04-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-22.04'
--- a/coin/platform_configs/qtwebchannel.yaml
+++ b/coin/platform_configs/qtwebchannel.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtwebengine.yaml
+++ b/coin/platform_configs/qtwebengine.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtwebsockets.yaml
+++ b/coin/platform_configs/qtwebsockets.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/qtwebview.yaml
+++ b/coin/platform_configs/qtwebview.yaml
@@ -1,6 +1,5 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml,
-    cmake_platforms_target_android_12.yaml
+    cmake_platforms.yaml
    ]
 Configurations: []
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -2,13 +2,14 @@ Version: 2
 Include: [ cmake_platforms_target_android.yaml ]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Id: 'automotive-ubuntu-22.04-documentation'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'Windows10_22H2-Mingw11-x64-host'
+    Id: 'windows-10_22h2-mingw11'
    Template: 'qtci-windows-10_22H2-x86_64-50'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
@@ -20,7 +21,7 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
    ]
 -
-    Id: 'macos-latest-xcode-universal-packaging-build'
+    Id: 'macos-universal-on-x86_64'
    Template: 'qtci-macos-12-x86_64-105'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
@@ -32,7 +33,7 @@ Configurations:
        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
    ]
 -
-    Id: 'RHEL-8.4-host'
+    Id: 'rhel-8.4'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
@@ -42,16 +43,18 @@ Configurations:
        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
    ]
 -
+    Id: "automotive-android-x86-on-linux"
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    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',
        '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}}',
        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
        'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
--- a/coin/platform_configs/tqtc-pyside-setup.yaml
+++ b/coin/platform_configs/tqtc-pyside-setup.yaml
@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']

--- a/coin/platform_configs/webos.yaml
+++ b/coin/platform_configs/webos.yaml
@@ -1,54 +1,54 @@
 Version: 2
 Module only: true
 Configurations:
-  - Id: 'WebOS-emulator-build'
+  - Id: 'webos-emulator-build'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['DoNotRunTests']
    Environment variables: ['BUILD_EMULATOR=enabled']
-  - Id: 'WebOS-emulator-qtbase-tests'
+  - Id: 'webos-emulator-qtbase-tests'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtbase']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtdeclarative-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtdeclarative-tests'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtdeclarative']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtwayland-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtwayland-tests'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtwayland']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtshadertools-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtshadertools-tests'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtshadertools']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtgraphicaleffects-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtgraphicaleffects-tests'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtgraphicaleffects']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-raspberry-build'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-raspberry-build'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['DoNotRunTests']
    Environment variables: ['BUILD_RASPBERRY=enabled']
-  - Id: 'WebOS-NDK-installer-build'
+  - Id: 'webos-ndk-installer-build'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['DoNotRunTests']
    Environment variables: ['BUILD_NDK_INSTALLER=enabled']
-  - Id: 'WebOS-NDK-install'
+  - Id: 'webos-ndk-install'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
    Compiler: 'GCC'
    Features: ['TestOnly']
-    Platform dependency: ['WebOS-raspberry-build', 'WebOS-NDK-installer-build']
+    Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']
    Environment variables: ['TEST_INSTALL_NDK=enabled']
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -63,8 +63,8 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r25b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="31.0.0"
-sdkApiLevel="android-31"
+sdkBuildToolsVersion="33.0.1"
+sdkApiLevel="android-33"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
@@ -155,8 +155,9 @@ echo "Android NDK = $ndkVersion" >> ~/versions.txt
 cd "$sdkTargetFolder/cmdline-tools/tools/bin"
 ./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
    | eval $sdkmanager_no_progress_bar_cmd
-echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
-    "system-images;android-31;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
+echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
+
+echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd


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

-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_31 -c 2048M -f \
-    -k "system-images;android-31;google_apis;x86_64"
+echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \
+    -k "system-images;android-33;google_apis;x86_64"

 echo "Install $sdkApiLevelAutomovie $androidAutomotive"
 DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \
--- a/coin/provisioning/common/linux/disable-ntp_linux.sh
+++ b/coin/provisioning/common/linux/disable-ntp_linux.sh
@@ -43,7 +43,7 @@ set -ex

 echo "Disable Network Time Protocol (NTP)"

-if uname -a |grep -q "Ubuntu"; then
+if uname -a |grep -q "Ubuntu\|Debian" ; then
    sudo timedatectl set-ntp false
 elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then
    (sudo systemctl stop chronyd && sudo systemctl disable chronyd)
--- a/coin/provisioning/common/linux/docker.sh
+++ b/coin/provisioning/common/linux/docker.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2023 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -48,12 +48,12 @@ PROVISIONING_DIR="$(dirname "$0")/../../"


 localRepo=http://ci-files01-hki.intra.qt.io/input/docker
-upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64
+upstreamRepo=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/

 echo '
-    f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb
-    ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb
-    09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb
+    2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
+    ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
+    130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
 ' \
    | xargs -n2 | while read  sha f
 do
@@ -68,10 +68,11 @@ sudo docker --version

 # Download and install the docker-compose extension from https://github.com/docker/compose/releases
 f=docker-compose-$(uname -s)-$(uname -m)
+dockerComposeVersion="v2.15.1"
 DownloadURL  \
-    $localRepo/$f-1.24.1  \
-    https://github.com/docker/compose/releases/download/1.24.1/$f \
-    cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
+    $localRepo/$f-${dockerComposeVersion}  \
+    https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f \
+    bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5
 sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
 sudo docker-compose --version
 rm ./docker-compose*
--- a/coin/provisioning/common/linux/remove-update_notifier.sh
+++ b/coin/provisioning/common/linux/remove-update_notifier.sh
@@ -1,3 +1,13 @@
 #!/usr/bin/env bash

-sudo apt -q -y remove update-notifier update-manager python3-distupgrade python3-update-manager ubuntu-release-upgrader-core update-manager-core
+installPackages+=(update-notifier)
+
+if uname -a |grep -q "Ubuntu" ; then
+installPackages+=(update-manager-core)
+installPackages+=(update-manager)
+installPackages+=(python3-distupgrade)
+installPackages+=(python3-update-manager)
+installPackages+=(ubuntu-release-upgrader-core)
+fi
+
+sudo apt -q -y remove "${installPackages[@]}"
--- a/coin/provisioning/common/macos/android.sh
+++ b/coin/provisioning/common/macos/android.sh
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"

 ndkVersionLatest="r25b"
 ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-31"
+sdkApiLevel="android-33"

 toolsSourceFile="$basePath/$toolsFile"

--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto_ssh_configurations.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/04-yocto_ssh_configurations.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,24 +39,36 @@
 ##
 #############################################################################

-set -ex
+# shellcheck source=./../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

-# shellcheck source=../common/unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+# This script will install Docker which is needed by RTA

-url="http://ci-files01-hki.intra.qt.io/input/semisecure/test_farm_id_rsa"
-sha1="1b0d651661c33a654ac89ef3c97bbe06d6bf1ca1"
-sshKey="$HOME/.ssh/test_farm_id_rsa"
+chip=$1

-DownloadURL "$url" "$url" "$sha1" "$sshKey"
-chmod 600 "$sshKey"
+if [[ $chip == "amd64" ]]; then
+    sha="158eae1d2f81cc8a0754d2ea3af8c6e6e555f69b"
+else
+    sha="6adf6cc8558af69296208b045187406a95b020bf"
+fi

-echo "Configuring ssh config file for Yocto"
-cat <<EOT >> "$HOME/.ssh/config"
-StrictHostKeyChecking=no
-Host codereview.qt-project.org
-  Port 29418
-  User qt-builder
-  IdentityFile "$sshKey"
-EOT
+echo "Installing Docker for $chip chip"
+urlOccifical="https://desktop.docker.com/mac/main/${chip}/Docker.dmg?utm_source=docker"
+urlCache="http://ci-files01-hki.ci.qt.io/input/mac/Docker_${chip}.dmg"

+DownloadURL $urlCache $urlOccifical $sha "/tmp/Docker_${chip}.dmg"
+
+sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
+sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
+sudo hdiutil detach /Volumes/Docker
+
+# Add registry mirror for docker images
+mkdir "$HOME/.docker"
+sudo tee -a $HOME/.docker/daemon.json <<"EOF"
+{
+        "builder": { "gc": { "defaultKeepStorage": "20GB", "enabled": true } },
+        "experimental": false,
+        "features": { "buildkit": true },
+        "registry-mirrors": ["http://repo-clones.ci.qt.io:5000"]
+}
+EOF
--- a/coin/provisioning/common/shared/ffmpeg_config_options.txt
+++ b/coin/provisioning/common/shared/ffmpeg_config_options.txt
@@ -1 +1 @@
--disable-programs --disable-doc --disable-debug --disable-network --disable-lzma --enable-pic
+--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -41,7 +41,7 @@
 # shellcheck source=./SetEnvVar.sh
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"

-version="3.1.10"
+version="3.1.25"
 versionNode="v14.18.2"

 mkdir -p /opt
--- a/coin/provisioning/common/unix/install-ffmpeg-android.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh
@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+
+############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 3 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL3 included in the
+## packaging of this file. Please review the following information to
+## ensure the GNU Lesser General Public License version 3 requirements
+## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 2.0 or (at your option) the GNU General
+## Public license version 3 or any later version approved by the KDE Free
+## Qt Foundation. The licenses are as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-2.0.html and
+## https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script will build and install FFmpeg static libs
+set -ex
+os="$1"
+
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+version="n6.0"
+url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+sha1="78435ec71cc2227017a99c030e858719b8c7c74d"
+url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
+ffmpeg_name="FFmpeg-$version"
+
+target_dir="$HOME"
+app_prefix=""
+ffmpeg_source_dir="$target_dir/$ffmpeg_name"
+
+if [ ! -d "$ffmpeg_source_dir" ];
+then
+   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
+fi
+
+build_ffmpeg_android() {
+
+  target_arch=$1
+  target_dir=$2
+
+  sudo mkdir -p "$target_dir"
+
+  if [ "$target_arch" == "x86_64" ]; then
+    target_toolchain_arch="x86_64-linux-android"
+    target_arch=x86_64
+    target_cpu=x86_64
+  elif [ "$target_arch" == "x86" ]; then
+    target_toolchain_arch="i686-linux-android"
+    target_arch=x86
+    target_cpu=i686
+  elif [ "$target_arch" == "arm64" ]; then
+    target_toolchain_arch="aarch64-linux-android"
+    target_arch=aarch64
+    target_cpu=armv8-a
+  fi
+
+  api_version=24
+
+  ndk_root=/opt/android/android-ndk-r25b
+  if uname -a |grep -q "Darwin"; then
+    ndk_host=darwin-x86_64
+  else
+    ndk_host=linux-x86_64
+  fi
+
+  toolchain=${ndk_root}/toolchains/llvm/prebuilt/${ndk_host}
+  toolchain_bin=${toolchain}/bin
+  sysroot=${toolchain}/sysroot
+  cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++
+  cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
+  ld=${toolchain_bin}/ld
+  ar=${toolchain_bin}/llvm-ar
+  ranlib=${toolchain_bin}/llvm-ranlib
+  nm=${toolchain_bin}/llvm-nm
+  strip=${toolchain_bin}/llvm-strip
+
+  ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
+  ffmpeg_config_options+=" --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
+  ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
+  ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
+
+  local build_dir="$ffmpeg_source_dir/build/$target_arch"
+  sudo mkdir -p "$build_dir"
+  pushd "$build_dir"
+
+  sudo $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$target_dir"
+
+  sudo make install -j4
+  popd
+}
+
+if  [ "$os" == "android-x86" ]; then
+  target_arch=x86
+  target_dir="/usr/local/android/ffmpeg-x86"
+
+  SetEnvVar "FFMPEG_DIR_ANDROID_X86" "$target_dir"
+elif  [ "$os" == "android-x86_64" ]; then
+  target_arch=x86_64
+  target_dir="/usr/local/android/ffmpeg-x86_64"
+
+  SetEnvVar "FFMPEG_DIR_ANDROID_X86_64" "$target_dir"
+elif  [ "$os" == "android-arm64" ]; then
+  target_arch=arm64
+  target_dir="/usr/local/android/ffmpeg-arm64"
+
+  SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir"
+fi
+
+build_ffmpeg_android "$target_arch" "$target_dir"
--- a/coin/provisioning/common/unix/install-ffmpeg.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg.sh
@@ -48,47 +48,58 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="n5.0"
-ffmpeg_name="FFmpeg-$version"
-
-url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
+version="n6.0"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="1a979876463fd81e481d53ceb3cc117f0fce8521"
+sha1="78435ec71cc2227017a99c030e858719b8c7c74d"
+url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
+ffmpeg_name="FFmpeg-$version"

 target_dir="$HOME"
 app_prefix=""
+ffmpeg_source_dir="$target_dir/$ffmpeg_name"

-InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
+if [ ! -d "$ffmpeg_source_dir" ];
+then
+   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
+fi

 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
-ffmpeg_source_dir="$target_dir/$ffmpeg_name"
+

 build_ffmpeg() {
  local arch="$1"
+  local prefix="$2"
  local build_dir="$ffmpeg_source_dir/build/$arch"
  mkdir -p "$build_dir"
  pushd "$build_dir"
+
+  if [ -z  "$prefix" ]
+  then prefix="/usr/local/$ffmpeg_name"
+  fi
+
  if [ -n "$arch" ]
-  then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name" --enable-cross-compile --arch=$arch --cc="clang -arch $arch"
-  else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name"
+  then cc="clang -arch $arch"
+  fi
+
+  if [ -n "$arch" ]
+  then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch=$arch --cc="$cc"
+  else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$prefix"
  fi
  make install DESTDIR=$build_dir/installed -j4
  popd
 }

 if [ "$os" == "linux" ]; then
-  if [ -f /etc/redhat-release ]
-  then sudo yum -y install yasm
-  else sudo apt install yasm
-  fi
  build_ffmpeg
  sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
+  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"

 elif [ "$os" == "macos" ]; then
  brew install yasm
  export MACOSX_DEPLOYMENT_TARGET=11
  build_ffmpeg
  sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
+  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"

 elif [ "$os" == "macos-universal" ]; then
  brew install yasm
@@ -97,6 +108,7 @@ elif [ "$os" == "macos-universal" ]; then
  build_ffmpeg "x86_64"

  sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build/arm64/installed" "$ffmpeg_source_dir/build/x86_64/installed"
+  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
+
 fi

-SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
--- a/coin/provisioning/common/unix/install-openssl.sh
+++ b/coin/provisioning/common/unix/install-openssl.sh
@@ -48,11 +48,11 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-version="1.1.1m"
+version="3.0.7"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="39d424c4411e45f1570073d7a71b1830b96007ca"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
@@ -62,13 +62,14 @@ cd "$opensslSource"
 pwd

 if [[ "$os" == "linux" ]]; then
-    ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
+    ./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
    make && make install_sw install_ssldirs
    SetEnvVar "OPENSSL_HOME" "$opensslHome"
+    SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
    if uname -a |grep -q "Ubuntu"; then
-        echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile
+        echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bash_profile
    else
-        echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
+        echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc
    fi

 elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
--- a/coin/provisioning/common/unix/install_grpc.sh
+++ b/coin/provisioning/common/unix/install_grpc.sh
@@ -67,7 +67,7 @@ installPrefix="$HOME/install-grpc-$version"
 targetDir="$HOME/grpc-$version"
 targetFile="$targetDir.zip"
 DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
-unzip "$targetFile" -d "$HOME"
+unzip -q "$targetFile" -d "$HOME"
 sudo rm "$targetFile"

 # devtoolset is needed when running configuration
@@ -77,10 +77,17 @@ fi

 if uname -a |grep -q Darwin; then
    extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
-    extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
    SetEnvVar PATH "\$PATH:$installPrefix/bin"
 fi

+# MacOS
+if [[ -n "$OPENSSL_DIR" ]]; then
+    extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
+# Linux
+elif [[ -n "$OPENSSL_HOME" ]]; then
+    extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_HOME
+fi
+
 echo "Configuring and building gRPC"

 buildDir="$HOME/build-grpc-$version"
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -53,6 +53,9 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

+PROVISIONING_DIR="$(dirname "$0")/../../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+
 libclang_version="15.0.0"

 if uname -a |grep -q Darwin; then
@@ -65,6 +68,11 @@ elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | g
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
    sha1="6ca035bb522022d34d61759e0460845832933b5c"
+elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
 else
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
--- a/coin/provisioning/common/unix/openssl_3_for_android.sh
+++ b/coin/provisioning/common/unix/openssl_3_for_android.sh
@@ -39,7 +39,7 @@
 ##
 #############################################################################

-# This script install prebuilt OpenSSL which was built against Android NDK 21.
+# This script install prebuilt OpenSSL which was built against Android NDK 25.
 # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories

 set -ex
@@ -48,9 +48,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="3.0.3"
-: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
-# Source built requires GCC and Perl to be in PATH.
+version="3.0.7"
+ndkVersionLatest="r25b"
+ndkVersionDefault=$ndkVersionLatest
+prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d"
+prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff"
+prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
+prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
+
+: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -63,10 +70,13 @@ else
    rm -rf "$exports_file"
 fi

+# ANDROID_NDK_ROOT is required during Configure
+export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b
+
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="1138de3f1a2f573ae69302ab52ecd9bbf5e063ca"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -81,18 +91,33 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 '

-if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-3.0.3-for-android-ndk-r23b-darwin.tar.gz"
-    sha="d204cb4011ba8672aec62ab36a00dd3e32a3a5e9"
-else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-3.0.3-for-android-ndk-r23b-linux.tar.gz"
-    sha="2d1b6f5d90b5e3ae6a7e2a376250c66e99371485"
-fi
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "${HOME}"
+function InstallPrebuiltOpenssl() {

-opensslHome="${HOME}/openssl/android/openssl-${version}"
-SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
+    ndkVersion=$1
+    nkdSha=$2
+    os=$3
+
+    if [[ ! -d ${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version} ]]; then
+        prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz"
+        targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz"
+
+        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile"
+        tar -xzf "$targetFile" -C "${HOME}"
+        opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}"
+        sudo rm -f $targetFile
+    fi
+}
+
+if uname -a |grep -q "Darwin"; then
+    InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDarwinDefault "darwin"
+    SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+    InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaDarwinLatest "darwin"
+    SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+else
+    InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaLinuxDefault "linux"
+    SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+    InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLinuxLatest "linux"
+    SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+fi

 echo "OpenSSL for Android = $version" >> ~/versions.txt
--- a/coin/provisioning/common/unix/openssl_for_android.sh
+++ b/coin/provisioning/common/unix/openssl_for_android.sh
@@ -48,16 +48,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="1.1.1m"
+version="3.0.7"
 ndkVersionLatest="r25b"
 ndkVersionDefault=$ndkVersionLatest
-prebuiltOpensslNdkShaDarwinLatest="1f4f994255c39839c8857d2ed1ff58a2101de714"
-prebuiltOpensslNdkShaLinuxLatest="15f7014781186a23f4973a719b55b766b1e69116"
+prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d"
+prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff"
 prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
 prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest

 : ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
-# Source built requires GCC and Perl to be in PATH.
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -70,10 +70,13 @@ else
    rm -rf "$exports_file"
 fi

+# ANDROID_NDK_ROOT is required during Configure
+export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b
+
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="39d424c4411e45f1570073d7a71b1830b96007ca"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -100,7 +103,6 @@ function InstallPrebuiltOpenssl() {

        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile"
        tar -xzf "$targetFile" -C "${HOME}"
-        mv "${HOME}/openssl" "${HOME}/openssl_android_ndk_${ndkVersion}"
        opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}"
        sudo rm -f $targetFile
    fi
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -51,12 +51,12 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html

-$openssl_version = "1.1.1m"
+$openssl_version = "3.0.7"
 $ndk_version_latest = "r25b"
 $ndk_version_default = "$ndk_version_latest"
-$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz")
-$openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
-$prebuilt_sha1_ndk_latest = "2897c84dccdb26e15b467e4a63de025fe7038899"
+$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
+$openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
+$prebuilt_sha1_ndk_latest = "d4348812054a88b5b672a8ceae62bf30c564869b"
 $prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
 $destination = "C:\Utils\openssl-android-master"

@@ -81,16 +81,16 @@ function Install($1, $2) {
    } else {
        Write-Host "Build OpenSSL for Android from sources"
        # openssl-${openssl_version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
-        Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}_fixes-ndk_root.tar.gz $openssl_compressed
+        Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}.tar.gz $openssl_compressed
        Verify-Checksum $openssl_compressed $openssl_sha1

        Extract-7Zip $openssl_compressed C:\Utils\tmp
-        Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}_fixes-ndk_root.tar C:\Utils\tmp
-        Move-Item C:\Utils\tmp\openssl-${openssl_version} $destination
+        Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}.tar C:\Utils\tmp
+        Move-Item C:\Utils\tmp\openssl-${openssl_version} ${destination}-${ndk_version}
        Remove "$openssl_compressed"

        Write-Host "Configuring OpenSSL $openssl_version for Android..."
-        Push-Location $destination
+        Push-Location ${destination}-${ndk_version}
        # $ must be escaped in powershell...

        function CheckExitCode {
@@ -105,6 +105,12 @@ function Install($1, $2) {
            }
        }

+        # ANDROID_NDK_ROOT needs to be in environment variables before running this script
+        # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r25b"
+
+        $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
+        CheckExitCode $make_install
+
        $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
        CheckExitCode $configure

@@ -115,7 +121,6 @@ function Install($1, $2) {
        Remove-item C:\Utils\tmp -Recurse -Confirm:$false
    }

-    Move-Item $destination "${destination}-${ndk_version}"
 }

 # Install NDK Default version
--- a/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -62,8 +62,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-31"
-$sdkBuildToolsVersion = "31.0.0"
+$sdkApiLevel = "android-33"
+$sdkBuildToolsVersion = "33.0.1"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
--- a/coin/provisioning/common/windows/conan.ps1
+++ b/coin/provisioning/common/windows/conan.ps1
@@ -39,7 +39,7 @@

 . "$PSScriptRoot\helpers.ps1"

-$scriptsPath = "C:\Python36\Scripts"
+$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine)
 $version = "1.39.0"
 Run-Executable "$scriptsPath\pip3.exe" "install conan==$version"
 Write-Output "Conan = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
@@ -41,7 +41,7 @@

 # This script will install emscripten needed by WebAssembly

-$version = "3.1.10"
+$version = "3.1.25"

 # Make sure python is in the path
 Prepend-Path "C:\Python27"
--- a/coin/provisioning/common/windows/grpc.ps1
+++ b/coin/provisioning/common/windows/grpc.ps1
@@ -144,31 +144,7 @@ $env:Path = $oldPath

 ### MSVC

-# Add cl to path if it is not already there
-if (!(Get-Command cl.exe -ErrorAction SilentlyContinue)) {
-    $vswhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
-    $vc_component = "Microsoft.VisualStudio.Component.VC.CoreIde"
-    # We pick the oldest build tools we can find and use that to be compatible with it and any newer version:
-    # If MSVC has an ABI break this will stop working, and yet another build must be added.
-    $vs_location = (& $vswhere -nologo -products * -requires $vc_component -sort -format value -property installationPath | Select-Object -Last 1)
-    $vcvars_location = Join-Path $vs_location "VC\Auxiliary\Build\"
-
-    Push-Location $vcvars_location
-
-    # This snippet was stolen from https://stackoverflow.com/a/2124759
-    # Grabs all the environment variables that the script has set and assigns it
-    # to environment variables in PowerShell (calling batch files creates a
-    # cmd.exe instance which does not propagate environment variables)
-    cmd /c "vcvarsall.bat $env:PROCESSOR_ARCHITECTURE & set" |
-    ForEach-Object {
-        if ($_ -match "=") {
-            $v = $_.Split("=");
-            Set-Item -Force -Path "ENV:\$($v[0])" -Value "$($v[1])"
-        }
-    }
-
-    Pop-Location
-}
+EnterVSDevShell

 build-install-grpc -CC "cl" -CXX "cl" -BuildType "Release" -Postfix "msvc"

--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -274,3 +274,35 @@ function DeleteSchedulerTask {
    Write-Host "Disabling $Task from Task Scheduler"
    SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F
 }
+
+function GetVSPath {
+    Param (
+        [string]$VSWhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe",
+        [string]$Component = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+    )
+
+    return (& $VSWhere -nologo -latest -products * -requires $Component -property installationPath)
+}
+
+function EnterVSDevShell {
+    # Add cl to path if it is not already there.
+    if (Get-Command cl.exe -ErrorAction SilentlyContinue) {
+        return $true
+    }
+
+    $vsWere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
+    $vcComponent = "Microsoft.VisualStudio.Component.VC.CoreIde"
+    # We pick the oldest build tools we can find and use that to be compatible with it and any newer version:
+    # If MSVC has an ABI break this will stop working, and yet another build must be added.
+    $VSPath = (& $vsWere -nologo -products * -requires $vcComponent -sort -format value -property installationPath | Select-Object -Last 1)
+
+    Write-Host "Enter VisualStudio developer shell"
+    try {
+        Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
+        Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-arch=x64 -no_logo"
+    } catch {
+        Write-Host "Failed to enter VisualStudio DevShell"
+        return $false
+    }
+    return $true
+}
--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -42,9 +42,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"

-$version = "n5.0"
+$version = "n6.0"
 $ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "3F7C6D5264A04BC27BA471D189B0483954820D65"
+$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7"

 $url_cached = "http://ci-files01-hki.intra.qt.io/input/ffmpeg/" + $version + ".zip"
 $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
@@ -107,15 +107,8 @@ function InstallMingwFfmpeg {


 function InstallMsvcFfmpeg {
-    $vsPath = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional"
-    #$vsPath = "C:\Program Files\Microsoft Visual Studio\2022\Professional"
-
-    Write-Host "Enter VisualStudio developer shell"
-    try {
-        Import-Module "$vsPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
-        Enter-VsDevShell -VsInstallPath $vsPath -DevCmdArguments "-arch=x64 -no_logo"
-    } catch {
-        Write-Host "Failed to enter VisualStudio DevShell"
+    $result = EnterVSDevShell
+    if (-Not $result) {
        return $false
    }

@@ -141,13 +134,44 @@ function InstallLlvmMingwFfmpeg {
    return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin"
 }

+function InstallAndroidArmv7 {
+
+    $target_toolchain_arch="armv7a-linux-androideabi"
+    $target_arch="armv7-a"
+    $target_cpu="armv7-a"
+    $api_version="24"
+
+    $ndkVersionLatest = "r25b"
+    $ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest"
+
+    $toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64"
+    $toolchain_bin="${toolchain}/bin"
+    $sysroot="${toolchain}/sysroot"
+    $cxx="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++"
+    $cc="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang"
+    $ld="${toolchain_bin}/ld.exe"
+    $ar="${toolchain_bin}/llvm-ar.exe"
+    $ranlib="${toolchain_bin}/llvm-ranlib.exe"
+    $nm="${toolchain_bin}/llvm-nm.exe"
+    $strip="${toolchain_bin}/llvm-strip.exe"
+
+    $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
+    $config += " --disable-vulkan --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
+    $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
+    $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
+
+    return InstallFfmpeg -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7"
+}
+
 $mingwRes = InstallMingwFfmpeg
 $msvcRes = InstallMsvcFfmpeg
 $llvmMingwRes = InstallLlvmMingwFfmpeg
+$androidArmV7Res = InstallAndroidArmv7

 Write-Host "Ffmpeg installation results:"
 Write-Host "  mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" })
 Write-Host "  msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" })
 Write-Host "  llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" })
+Write-Host "  android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" })

-exit $(if ($mingwRes -and $msvcRes -and $llvmMingwRes) { 0 } else { 1 })
+exit $(if ($mingwRes -and $msvcRes -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 })
--- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1
+++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1
@@ -40,12 +40,12 @@

 $version = "11_2_2"
 $package = "C:\Windows\temp\opengl32sw.7z"
-$mesaOpenglSha1_64 = "0ed35efbc8112282be5d0c87c37fde2d15e81998"
-$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed.7z"
-$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed.7z"
-$mesaOpenglSha1_32 = "96bd6ca0d7fd249fb61531dca888965ffd20f53c"
-$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed.7z"
-$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed.7z"
+$mesaOpenglSha1_64 = "58f948746696b17a594b2f542e87b0e831b28dc3"
+$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed_sha256.7z"
+$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed_sha256.7z"
+$mesaOpenglSha1_32 = "974f468acaa0018d46607e2100f1214fecd35bd4"
+$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed_sha256.7z"
+$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed_sha256.7z"

 function Extract-Mesa
 {
--- a/coin/provisioning/common/windows/mysql.ps1
+++ b/coin/provisioning/common/windows/mysql.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2023 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,48 +42,37 @@
 # This script installs MySQL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

-$version = "5.7.25"
-$baseNameX64 = "mysql-$version-winx64"
-$packagex64 = "C:\Windows\temp\$baseNameX64.zip"
-$baseNameX86 = "mysql-$version-win32"
-$packagex86 = "C:\Windows\temp\$baseNameX86.zip"
-$installFolder = "C:\Utils\my_sql"
+$version = "6.1.11"
+$installFolder = "C:\Utils"
+$officialUrl = "https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-c-${version}-winx64.zip"
+$officialUrlDebug = "https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-${version}-winx64-debug.zip"
+$cacheURl = "http://ci-files01-hki.ci.qt.io/input/windows/mysql-connector-c-${version}-winx64.zip"
+$cacheURlDebug = "http://ci-files01-hki.ci.qt.io/input/windows/mysql-connector-c-${version}-winx64-debug.zip"
+$sha = "93e22a1ba3944a6c8e01d3ea04c1bfb005b238f9"
+$shaDebug = "d54088a9182e2f03b4d6f44c327e341eeab16367"
+$zip = Get-DownloadLocation ("mysql-connector-c-" + $version + "-winx64.zip")
+$zipDebug = Get-DownloadLocation ("mysql-connector-c-" + $version + "-winx64-debug.zip")

-function DownloadAndInstall
-{
-    Param (
-        [string]$internalUrl,
-        [string]$package,
-        [string]$installPath
+function Install {
+    param(
+        [string]$officialUrl,
+        [string]$cacheUrl,
+        [string]$zip,
+        [string]$sha
    )

-    Write-Host "Fetching from URL ..."
-    Copy-Item $internalUrl $package
-
-    $zipDir = [io.path]::GetFileNameWithoutExtension($package)
-    Extract-7Zip $package $installPath "$zipDir\lib $zipDir\bin $zipDir\share $zipDir\include"
-
-    Remove "$package"
+    Download $officialUrl $cacheURl $zip
+    Verify-Checksum $zip $sha
+    Extract-7Zip $zip $installFolder
+    Remove $zip
 }

-if (Is64BitWinHost) {
-    # Install x64 bit version
-    $architecture = "x64"
-    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
+Install $officialUrl $cacheURl $zip $sha
+Install $officialUrlDebug $cacheURlDebug $zipDebug $shaDebug

-    DownloadAndInstall $internalUrl $packagex64 $installFolder
+# Can't set MySQL_ROOT & MySQL_LIBRARY_DIR variables. Those will enable mysql in every windows target.
+# Let's use ENV_MySQL_* and use it in platform_configs
+Set-EnvironmentVariable "ENV_MySQL_ROOT" "${installFolder}\mysql-connector-c-${version}-winx64"
+Set-EnvironmentVariable "ENV_MySQL_LIBRARY_DIR" "${installFolder}\mysql-connector-c-${version}-winx64\lib\vs14"

-    Set-EnvironmentVariable "MYSQL_INCLUDE_x64" "$installFolder\$baseNameX64\include"
-    Set-EnvironmentVariable "MYSQL_LIB_x64" "$installFolder\$baseNameX64\lib"
-}
-
-# Install x86 bit version
-$architecture = "x86"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
-DownloadAndInstall $internalUrl $packagex86 $installFolder
-
-Set-EnvironmentVariable "MYSQL_INCLUDE_x86" "$installFolder\$baseNameX86\include"
-Set-EnvironmentVariable "MYSQL_LIB_x86" "$installFolder\$baseNameX86\lib"
-
-# Store version information to ~/versions.txt, which is used to print version information to provision log.
 Write-Output "MySQL = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/openssl-arm64.ps1
+++ b/coin/provisioning/common/windows/openssl-arm64.ps1
@@ -46,7 +46,10 @@
 # From Visual studio 'C++ Universal Windows Platform support for v142 build tools (ARM64)' and 'Windows Universal C Runtime' were installed
 # cd C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build
 # call vcvarsamd64_arm64
-#
+# curl -o C:\Utils\openssl-3.0.7.zip http://ci-files01-hki.intra.qt.io/input/openssl/openssl-3.0.7.zip
+# cd C:\Utils
+# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.0.7.zip
+# cd C:\Utils\openssl-3.0.7
 # perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
 # nmake
 # nmake install
@@ -56,9 +59,9 @@
 # nmake install
 #################################################################################################################################################

-$version = "1_1_1_m"
+$version = "3_0_7"
 $url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
-$sha1 = "52963bba9b542eb885f19641f5cd78870246ea02"
+$sha1 = "19be15069d981b4a96f5715f039df7aaa7456d52"
 $installFolder = "C:\openssl_arm64"
 $zip_package = "C:\Windows\Temp\$version.zip"

--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/coin/provisioning/common/windows/openssl.ps1
@@ -42,7 +42,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

-$version = "1_1_1m"
+$version = "3_0_7"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"

@@ -53,7 +53,7 @@ if (Is64BitWinHost) {
    $installFolder = "C:\openssl"
    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134"
+    $sha1 = "2fb73f233bc565939312782b8157bebc26a5e17b"

    Write-Host "Fetching from URL ..."
    Download $externalUrl $internalUrl $packagex64
@@ -67,6 +67,7 @@ if (Is64BitWinHost) {
    Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg"
    Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
    Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
+    Prepend-Path "$installFolder\bin"
 }

 # Install x86 bit version
@@ -80,7 +81,7 @@ if (Is64BitWinHost) {

 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "1d7146e56b201404ce67f1e636eab360211c175a"
+$sha1 = "ddead693fa279ad6b1baf123b3af51a9ef289dc1"

 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86
--- a/coin/provisioning/common/windows/protobuf.ps1
+++ b/coin/provisioning/common/windows/protobuf.ps1
@@ -104,31 +104,7 @@ $env:Path = $oldPath

 ### MSVC

-# Add cl to path if it is not already there
-if (!(Get-Command cl.exe -ErrorAction SilentlyContinue)) {
-    $vswhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
-    $vc_component = "Microsoft.VisualStudio.Component.VC.CoreIde"
-    # We pick the oldest build tools we can find and use that to be compatible with it and any newer version:
-    # If MSVC has an ABI break this will stop working, and yet another build must be added.
-    $vs_location = (& $vswhere -nologo -products * -requires $vc_component -sort -format value -property installationPath | Select-Object -Last 1)
-    $vcvars_location = Join-Path $vs_location "VC\Auxiliary\Build\"
-
-    Push-Location $vcvars_location
-
-    # This snippet was stolen from https://stackoverflow.com/a/2124759
-    # Grabs all the environment variables that the script has set and assigns it
-    # to environment variables in PowerShell (calling batch files creates a
-    # cmd.exe instance which does not propagate environment variables)
-    cmd /c "vcvarsall.bat $env:PROCESSOR_ARCHITECTURE & set" |
-    ForEach-Object {
-        if ($_ -match "=") {
-            $v = $_.Split("=");
-            Set-Item -Force -Path "ENV:\$($v[0])" -Value "$($v[1])"
-        }
-    }
-
-    Pop-Location
-}
+EnterVSDevShell

 # We pass along an extra argument to stop protobuf linking with the static runtime
 build-install-protobuf -CC "cl" -CXX "cl" -BuildType "Release" -Postfix "msvc" -ExtraArguments @("-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
--- a/Show More
+++ b/Show More