Update submodules on '6.6 in qt/qt5'

Change-Id: If8c186c9cef7436b4434db82bed212ee98a641bc
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>

.gitmodules

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

CMakeLists.txt

@@ -1,6 +1,6 @@
 # The real minimum version will be checked by the qtbase project.
 # 3.16 is the absolute minimum though.
-cmake_minimum_required(VERSION 3.16...3.20)
+cmake_minimum_required(VERSION 3.16...3.21)
 
 
 # set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
@@ -34,7 +34,7 @@ if (NOT QT_BUILD_STANDALONE_TESTS)
     list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
 endif()
 
-include("QtTopLevelHelpers")
+include(QtTopLevelHelpers)
 include(ECMOptionalAddSubdirectory)
 
 # Also make sure the CMake config files do not recreate the already-existing targets
@@ -57,7 +57,7 @@ qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULE
 foreach(module IN LISTS QT_BUILD_SUBMODULES)
     # Check for unmet dependencies
     if(NOT DEFINED BUILD_${module} OR BUILD_${module})
-        message(NOTICE "Checking dependencies of submodule '${module}'")
+        message(STATUS "Checking dependencies of submodule '${module}'")
         get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
         get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
         foreach(dep IN LISTS dependencies)
@@ -84,7 +84,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
                         "but ${error_reason}.\n"
                         "Note: Use '-skip ${module}' to exclude it from the build.")
                 else()
-                    message(NOTICE "Skipping optional dependency '${dep}' of '${module}', "
+                    message(STATUS "Skipping optional dependency '${dep}' of '${module}', "
                         "because ${error_reason}.")
                 endif()
             endif()
@@ -92,8 +92,12 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
     endif()
 endforeach()
 
+if(NOT DEFINED CMAKE_MESSAGE_CONTEXT_SHOW)
+    set(CMAKE_MESSAGE_CONTEXT_SHOW TRUE)
+endif()
+
 foreach(module IN LISTS QT_BUILD_SUBMODULES)
-    message(NOTICE "Configuring submodule '${module}'")
+    message(STATUS "Configuring submodule '${module}'")
     ecm_optional_add_subdirectory("${module}")
 
     if(module STREQUAL "qtbase")

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
+These Qt support terms and conditions (“Support Terms”) set forth the legal
-framework, where under The Qt Company ("The Qt Company") provides support
+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
+“Customer Portal” shall mean The Qt Company’s web-based service and support
-first point of contact for all Designated Users' requests for 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
+Premium Support instead of Standard Support. Premium Support also covers what
-purchased for all Designated User(s) in the respective development team of the
+is included in Standard Support. Premium Support shall always be purchased for
-Licensee.
+all Designated User(s) in the respective development team of the Licensee.
 
-"Response Time" shall mean the period of time from when Licensee notifies
+“Qt Account” shall mean the Qt Account for a Designated User used for using Qt
-TheQt Company about an Error or requests Support until The Qt Company provides
+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
+“Standard Support” shall mean standard level of Support that The Qt Company
-provides pursuant to these Support Terms to Licensee.
+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
+“Security Issue” shall mean an Error that may cause a vulnerability in a system
-to assist eligible Designated Users in Licensed Software installation, usage
+or application that uses the Licensed Software.
-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” shall mean developer assistance that is provided by The Qt Company to
-|                       |ADP|ADE|DCP|DCE|DSP|DSE|Squish|Coco|Test Center|
+assist eligible Designated Users in Licensed Software installation, usage and
-+-----------------------------------------------------------------------+
+functionality problem resolution for Error(s) and Error workarounds pursuant to
-| Install Support       | X | X | X | X | X | X |  X   |  X |     X     |
+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
-| Standard Support      |   | X | X | X | X | X |  X   |  X |     X     |
+the license price, optional Add-on Support services are marked as ‘O’):
-+-----------------------------------------------------------------------+
-| Premium Support       |   | O | O | O | O | O |  O   |  O |     O     |
-+-----------------------------------------------------------------------+
-| Extended Support      |   | O | O | O | O | O |      |    |           |
-+-----------------------------------------------------------------------+
-| Tool Qualification Kit|   |   |   |   |   |   |  O   |  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
+Company will via its Customer Portal, provide Designated User(s) with Support
-User(s) with Support for the Platforms which Customer has licensed under the
+for the Licensed Software which Licensee has licensed under the Agreement. The
-Agreement.
+Qt Company will make commercially reasonable efforts to solve any Errors
-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
-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
+To report an Error, the Designated User shall register the Error on the
-Company's web-based support user interface located at:
+Customer Portal. If the Designated User considers the reported Error to be a
-https://account.qt.io/login or at another location designated by The Qt Company.
+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.
+Designated User has sought assistance. To ensure efficient handling of Errors,
-To ensure efficient handling of Errors, the Designated User must provide the
+the Designated User must provide the following information, where relevant:
-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
+in doc.qt.io or in documentation provided with the respective Licensed Software
-one (1) year from the release date of the version x.y.0 and Long Term Support
+product. If nothing is documented, a release of Licensed Software is supported
-(LTS) Releases are supported for a period of three (3) years from the release
+for one (1) year from the release date of the version x.y.0 and Long Term
-date of the LTS version x.y.0.
+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).
+The Qt Company shall only provide Support for Designated User(s) through
-
+Customer Portal.Support is made available for the entire development teams
-Support is made available for the entire development teams only: It is not
+only: It is not allowed to purchase Support only for some members of the
-allowed to purchase Support only for some members of the development team, and
+development team, and all Designated Users of the respective development team
-all Designated Users of the respective development team must be eligible for
+must be eligible for the same level of Support.
-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
+The Qt Company shall have no obligation to provide Support for 3rd party
-operating system specific  problems or problems arising from improper use,
+components, hardware or operating system specific problems or problems arising
-accident, neglect or modification of Qt.
+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
+Support limited to (i) Error(s) regarding installation and setting up of the Qt
-development environment on host Platforms.
+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
+rules and limitations, unless Extended Support is purchased together with
-Support in which case Premium Support rules and limitations will apply.
+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
+The Qt Company shall provide a set of documents and validation tests that
-that enable Licensee to qualify QA testing tool for the purpose of ISO 26262,
+enable the Licensee to qualify QA testing tool (subject to a separate fee) or
-EN 50128, DO-330, IEC 61508, IEC 62304 or IEC 13485 certification Licensee end
+Qt Safe Renderer for the purpose of safety certification of Licensee end-to-end
-to end solution.
+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.

README.git

@@ -1,17 +1,19 @@
-OBTAINING QT5 FROM GIT
+OBTAINING QT 6 FROM GIT
-======================
+=======================
 
  Synopsis
  ========
 
- For a more in-depth description on how to build Qt5 from git,
+ For a more in-depth description on how to build Qt 6 from git,
- please see: http://wiki.qt.io/Building_Qt_5_from_Git
+ please see: http://wiki.qt.io/Building_Qt_6_from_Git
 
+ Note that, although the git module is called qt5.git, the dev and 6.x branches
+ do contain Qt 6!
 
  Get The Submodules
  ==================
 
- Cloning Qt5 does not automatically clone all submodules.
+ Cloning qt5.git does not automatically clone all submodules.
  To get the submodules, it is recommended to use the `init-repository' script.
 
    ./init-repository
@@ -49,7 +51,7 @@ OBTAINING QT5 FROM GIT
 
 
  Developing and Contributing to Qt
- ================================
+ =================================
 
  For more information on how to develop and contribute to Qt, please see:
  http://wiki.qt.io/Category:Developing_Qt

README.md

@@ -1,23 +1,19 @@
-HOW TO BUILD Qt6
+HOW TO BUILD Qt 6
-================
+=================
 
 
 Synopsis
 ========
 
 System requirements
-------------------
+-------------------
 
-* CMake 3.18 or later
-* Perl 5.8 or later
-* Python 2.7 or later
 * C++ compiler supporting the C++17 standard
+* CMake 3.16 or newer
+* Ninja 1.8 or newer
+* Python 3
 
-It's recommended to have ninja 1.8 or later installed.
+For more details, see also https://doc.qt.io/qt-6/build-sources.html
-
-For other platform specific requirements,
-please see section "Setting up your machine" on:
-http://wiki.qt.io/Get_The_Source
 
 Linux, Mac:
 -----------
@@ -34,9 +30,7 @@ Windows:
 1. Open a command prompt.
 2. Ensure that the following tools can be found in the path:
  * Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 8.1 or later)
- * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
+ * Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
- * Python version 2.7 or later  [http://www.activestate.com/activepython/]
- * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
 
 ```
 cd <path>\<source_package>
@@ -46,13 +40,14 @@ cmake --build .
 
 More details follow.
 
+
 Build!
 ======
 
 Qt is built with CMake, and a typical
 `configure && cmake --build .` build process is used.
 
-If ninja is installed, it is automatically chosen as CMake generator.
+If Ninja is installed, it is automatically chosen as CMake generator.
 
 Some relevant configure options (see configure -help):
 
@@ -101,7 +96,8 @@ to your `PATH` environment variable to access them.
 
 
 Building Qt from git
-=====================
+====================
+
 See http://wiki.qt.io/Building_Qt_6_from_Git and README.git
 for more information.
 See http://wiki.qt.io/Qt_6 for the reference platforms.

_clang-format

@@ -11,7 +11,7 @@
 # Webkit style was loosely based on the Qt style
 BasedOnStyle: WebKit
 
-Standard: Cpp11
+Standard: c++17
 
 # Column width is limited to 100 in accordance with Qt Coding Style.
 # https://wiki.qt.io/Qt_Coding_Style
@@ -62,6 +62,8 @@ NamespaceIndentation: None
 
 # Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125
 IndentPPDirectives: AfterHash
+# We only indent with 2 spaces for preprocessor directives
+PPIndentWidth: 2
 
 # Horizontally align arguments after an open bracket.
 # The coding style does not specify the following, but this is what gives
@@ -85,6 +87,21 @@ ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCH
 # Break constructor initializers before the colon and after the commas.
 BreakConstructorInitializers: BeforeColon
 
+# Add "// namespace <namespace>" comments on closing brace for a namespace
+# Ignored for namespaces that qualify as a short namespace,
+# see 'ShortNamespaceLines'
+FixNamespaceComments: true
+
+# Definition of how short a short namespace is, default 1
+ShortNamespaceLines: 1
+
+# When escaping newlines in a macro attach the '\' as far left as possible, e.g.
+##define a     \
+#   something; \
+#   other;     \
+#   thelastlineislong;
+AlignEscapedNewlines: Left
+
 # Avoids the addition of a space between an identifier and the
 # initializer list in list-initialization.
 SpaceBeforeCpp11BracedList: false

cmake/QtSynchronizeRepo.cmake

@@ -1,7 +1,12 @@
 # This script is to be called (ideally from a git-sync-to alias script):
 #     cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" -P cmake/QtSynchronizeRepo.cmake
+# Or as follows (ideally from a git-qt-foreach alias script):
+#     cmake -DQT_FOREACH=TRUE "-DARGS=$*" -P cmake/QtSynchronizeRepo.cmake
 
 cmake_policy(VERSION 3.16)
 include(cmake/QtTopLevelHelpers.cmake)
-
+if(QT_FOREACH)
-qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})
+    qt_internal_foreach_repo_run(ARGS ${ARGS})
+else()
+    qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})
+endif()

cmake/QtTopLevelHelpers.cmake

@@ -421,3 +421,87 @@ function(qt_internal_sync_to module)
         endforeach()
     endwhile()
 endfunction()
+
+# Runs user specified command for all qt repositories in qt directory.
+# Similar to git submodule foreach, except without relying on .gitmodules existing.
+# Useful for worktree checkouts.
+function(qt_internal_foreach_repo_run)
+    cmake_parse_arguments(PARSE_ARGV 0 arg
+                          ""
+                          ""
+                          "ARGS"
+    )
+    if(NOT arg_ARGS)
+        message(FATAL_ERROR "No arguments specified to qt_internal_foreach_repo_run")
+    endif()
+    separate_arguments(args NATIVE_COMMAND "${arg_ARGS}")
+
+    # Find the qt repos
+    qt_internal_find_modules(modules)
+
+    # Hack to support color output on unix systems
+    # https://stackoverflow.com/questions/18968979/how-to-make-colorized-message-with-cmake
+    execute_process(COMMAND
+        /usr/bin/tty
+        OUTPUT_VARIABLE tty_name
+        RESULT_VARIABLE tty_exit_code
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    set(color_supported FALSE)
+    set(output_goes_where "")
+    if(NOT tty_exit_CODE AND tty_name)
+        set(color_supported TRUE)
+        set(output_goes_where "OUTPUT_FILE" "${tty_name}")
+    endif()
+
+    # Count successes and failures.
+    set(count_success "0")
+    set(count_failure "0")
+
+    # Show colored error markers.
+    set(color "--normal")
+    if(color_supported)
+        set(color "--red")
+    endif()
+
+    foreach(module IN LISTS modules)
+        message("Entering '${module}'")
+        execute_process(
+            COMMAND ${args}
+            WORKING_DIRECTORY "${module}"
+            ${output_goes_where}
+            RESULT_VARIABLE cmd_result
+        )
+        if(cmd_result)
+            math(EXPR count_failure "${count_failure}+1")
+            # cmake_echo_color is undocumented, but lets us output colors and control newlines.
+            execute_process(
+                COMMAND
+                ${CMAKE_COMMAND} -E env CLICOLOR_FORCE=1
+                ${CMAKE_COMMAND} -E cmake_echo_color "${color}"
+                "Process execution failed here ^^^^^^^^^^^^^^^^^^^^"
+            )
+        else()
+            math(EXPR count_success "${count_success}+1")
+        endif()
+    endforeach()
+
+    # Show summary with colors.
+    set(color "--normal")
+    if(count_failure AND color_supported)
+        set(color "--red")
+    endif()
+
+    message("\nSummary\n=======\n")
+    execute_process(
+        COMMAND
+            ${CMAKE_COMMAND} -E cmake_echo_color --normal --no-newline "Failures: "
+    )
+    execute_process(
+        COMMAND
+            ${CMAKE_COMMAND} -E env CLICOLOR_FORCE=1
+            ${CMAKE_COMMAND} -E cmake_echo_color "${color}" "${count_failure}"
+    )
+    message("Successes: ${count_success}")
+endfunction()

coin/instructions/coin_qt_build_template.yaml

@@ -2,3 +2,7 @@ type: Group
 instructions:
   - !include "{{qt/qt5}}/coin_qt_configure.yaml"
   - !include "{{qt/qt5}}/coin_qt_build_docs.yaml"
+disable_if:
+  condition: property
+  property: features
+  contains_value: "TargetBuildOnly"

coin/platform_configs/address_sanitizer_platforms.yaml

@@ -0,0 +1,14 @@
+Version: 2
+Configurations:
+-
+    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',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+    ]

coin/platform_configs/cmake_platforms.yaml

@@ -7,23 +7,37 @@ Include: [
     macos.yaml
     ]
 Configurations:
+# Build on Ubuntu 22.04 and test on both X11 and Wayland later
 -
-    Id: 'ubuntu-20.04-documentation'
+    Id: 'ubuntu-22.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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'
+    Id: 'ubuntu-22.04'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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: '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'
@@ -32,7 +46,9 @@ Configurations:
     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'
@@ -41,7 +57,8 @@ Configurations:
     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'
@@ -53,7 +70,10 @@ Configurations:
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
+    ]
 -
     Id: 'windows-11_22h2-msvc2019'
     Template: 'qtci-windows-11_22H2-x86_64-50'
@@ -63,7 +83,10 @@ Configurations:
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
+    ]
 -
     Id: 'windows-10_22h2-msvc2022'
     Template: 'qtci-windows-10_22H2-x86_64-50'
@@ -71,9 +94,11 @@ Configurations:
     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}}'
+        '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'
@@ -84,7 +109,9 @@ Configurations:
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-10_22h2-msvc2019-developer-build'
@@ -95,7 +122,9 @@ Configurations:
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
         'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-10_22h2-msvc2019-arm64'
@@ -111,17 +140,21 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
         'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
         'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     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}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-11_22h2-msvc2019-arm64'
@@ -134,22 +167,45 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
         'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'rhel-8.4'
+    Id: 'rhel-8.6'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.6-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',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
+-
+    Id: 'debian-11.6-arm64'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
+    ]
+
 -
     Id: 'ios-universal'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-106'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
@@ -172,7 +228,9 @@ Configurations:
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
     Id: 'windows-10_22h2-llvm'
@@ -184,7 +242,9 @@ Configurations:
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw'
+        'LLVM_INSTALL_DIR=C:\llvm-mingw',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
     Id: 'windows-11_22h2-llvm'
@@ -196,7 +256,9 @@ Configurations:
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw'
+        'LLVM_INSTALL_DIR=C:\llvm-mingw',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
     Id: 'windows-10_22h2-mingw11-developer-build'
@@ -208,7 +270,9 @@ Configurations:
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
     Id: 'windows-11_22h2-mingw11-developer-build'
@@ -220,5 +284,7 @@ Configurations:
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -2,15 +2,15 @@ Version: 2
 Configurations:
 -
     Id: 'qemu-armv7-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
@@ -19,15 +19,15 @@ Configurations:
     ]
 -
     Id: 'qemu-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'arm64'
     Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
@@ -36,15 +36,15 @@ Configurations:
     ]
 -
     Id: 'qemu-mips64-developer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'mips64'
     Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
+    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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -2,12 +2,12 @@ Version: 2
 Configurations:
 -
     Id: 'qnx-710-x86_64-developer-build-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -17,12 +17,12 @@ Configurations:
     ]
 -
     Id: 'qnx-710-arm64-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -30,12 +30,12 @@ Configurations:
     ]
 -
     Id: 'qnx-710-armv7-on-linux'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    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'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -17,11 +17,13 @@ Configurations:
     Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'macos-11-minimal-static'
-    Template: 'qtci-macos-11-x86_64-105'
+    Template: 'qtci-macos-11-x86_64-106'
     Compiler: 'Clang'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
     Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-106'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
@@ -14,6 +14,7 @@ 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-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 -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}}',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
@@ -31,40 +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}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}}',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'android-x86-on-linux'
+    Id: 'android-6-x86-on-linux'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
+    Platform dependency: 'rhel-8.6'
     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}}',
+        '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: 'android-x86_64-on-linux'
+    Id: 'android-13-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
+    Platform dependency: 'rhel-8.6'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    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}}',
+        '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'
     ]

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -1,26 +1,45 @@
 Version: 2
 Configurations:
 -
+    Id: 'webassembly-linux-thread-asyncify'
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Platform dependency: 'opensuse-15.4-developer-build'
+    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
+        -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
+    ]
+-
+    Id: 'webassembly-windows'
+    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Target os: 'WebAssembly'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'windows-10_22h2-mingw11'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
+        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
         'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
         'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang'
+        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang',
     ]
 -
-    Id: 'webassembly-thread-asyncify'
+    Id: 'webassembly-macos-thread'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Template: 'qtci-macos-12-x86_64-106'
     Target os: 'WebAssembly'
-    Compiler: 'GCC'
+    Compiler: 'Clang'
-    Platform dependency: 'opensuse-15.4-developer-build'
+    Target compiler: 'Clang'
-    Features: ['Sccache', 'DisableTests']
+    Platform dependency: 'macos-universal-on-x86_64'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"',
+        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local',
+        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
+    ]

coin/platform_configs/default.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'ubuntu-20.04-license-check'
+    Id: 'ubuntu-22.04-license-check'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/flashing-wizard.yaml

@@ -24,7 +24,7 @@ Configurations:
         Features: ['Packaging', 'UseLegacyInstructions']
         Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
     -
-        Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+        Template: 'qtci-linux-RHEL-8.6-x86_64-50'
         Compiler: 'GCC'
         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'
@@ -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']

coin/platform_configs/integrity.yaml

@@ -2,13 +2,13 @@ Version: 2
 Configurations:
     -
       Id: "integrity-arm64"
-      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+      Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
-      Platform dependency: 'ubuntu-20.04'
+      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',

coin/platform_configs/ios-tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: "ios-tests-on-macos"
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-106'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'

coin/platform_configs/linux_android_tests_developer.yaml

@@ -2,12 +2,12 @@ Version: 2
 Configurations:
 -
     Id: 'android-x86-developer-build-testrun-on-linux'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
+    Platform dependency: 'rhel-8.6'
     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',

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -0,0 +1,26 @@
+Version: 2
+Configurations:
+-
+    Id: 'rhel_8.4_android_multi'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: [
+        'rhel-8.6',
+        'android-6-x86-on-linux',
+        'android-13-x86_64-on-linux'
+    ]
+    Features: [
+        'Sccache',
+        'AndroidTestRun',
+        'MinimalAndroidMultiABITests',
+        'InstallDepsPerPlatformSubdir'
+    ]
+    Environment variables: [
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6',
+        '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"'
+    ]

coin/platform_configs/macos.yaml

@@ -9,7 +9,7 @@ Configurations:
 
     -
         Id: 'macos-universal-on-x86_64'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
         Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -17,6 +17,7 @@ Configurations:
         Environment variables: [
             'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
             'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
         ]
 
@@ -28,26 +29,16 @@ Configurations:
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
         Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
+            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
+            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
         ]
 
     # Test on all supported macOS versions (deployment targets)
 
-    -
-        Id: 'macos-10.14-x86_64-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-10.15-x86_64-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
@@ -71,7 +62,7 @@ Configurations:
         Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
@@ -83,7 +74,7 @@ Configurations:
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-12-arm-on-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
@@ -96,13 +87,14 @@ Configurations:
 
     -
         Id: 'macos-12-x86_64-developer-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
         ]
     -
         Id: 'macos-12-arm64-developer-build'
@@ -110,26 +102,18 @@ Configurations:
         Compiler: 'Clang'
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
+        Environment variables: [
+            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
+            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
+        ]
         # Note: We do not include OpenSSL or PostgreSQL in this build,
         # as the M1 CI machines are not provisioned for that yet.
 
     # Test on all supported macOS versions (deployment targets)
 
-    -
-        Id: 'macos-10.14-x86_64-developer-build-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-12-x86_64-developer-build'
-    -
-        Id: 'macos-10.15-x86_64-developer-build-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-12-x86_64-developer-build'
     -
         Id: 'macos-11-x86_64-developer-build-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-12-x86_64-developer-build'
@@ -141,7 +125,7 @@ Configurations:
         Platform dependency: 'macos-12-arm64-developer-build'
     -
         Id: 'macos-12-x86_64-developer-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-12-x86_64-developer-build'

coin/platform_configs/meta-boot2qt-renesas.yaml

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

coin/platform_configs/meta-boot2qt-st.yaml

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

coin/platform_configs/meta-boot2qt-ti.yaml

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

coin/platform_configs/meta-boot2qt-toradex.yaml

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

coin/platform_configs/meta-boot2qt.yaml

@@ -1,43 +1,4 @@
 Version: 2
 Module only: True
-Configurations:
+Include: [yocto.yaml]
-    -
+Configurations: []
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET1'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET2'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET3'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET4'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET5'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET6'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET7'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET8'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET9'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET10'

coin/platform_configs/meta-qt5.yaml

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

coin/platform_configs/meta-qt6.yaml

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

coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml

@@ -1,71 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        Windows10_22H2-Mingw11-x64-host,
-        rhel-8.4
-    ]
-]
-Configurations:
--
-    Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-12-x86_64-105'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    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_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
-    ]
--
-    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'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
-    ]
--
-    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'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        '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_LATEST}}'
-    ]
--
-    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'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        '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_LATEST}}'
-    ]

coin/platform_configs/nightly_macos13.yaml

@@ -0,0 +1,14 @@
+Version: 2
+Module only: True
+Include: [
+    macos.yaml: [
+        "macos-12-x86_64-developer-build"
+    ]
+]
+Configurations:
+-
+    Id: 'macos-13-x86_64-developer-build-tests'
+    Template: 'qtci-macos-13-x86_64-103'
+    Compiler: 'Clang'
+    Features: ['TestOnly']
+    Platform dependency: 'macos-12-x86_64-developer-build'

coin/platform_configs/nightly_qt5_axivion.yaml

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

coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml

@@ -0,0 +1,13 @@
+Version: 2
+Configurations:
+# QTQAINFRA-5404
+-
+    Id: 'ubuntu-20.04-c++17'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure']
+    Configure arguments: '-nomake examples -release -c++std c++17 -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}}'
+    ]

coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml

@@ -0,0 +1,22 @@
+Version: 2
+Configurations:
+-
+    # cmake_platforms.yaml
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+-
+    Id: 'Ubuntu-22.04-xwayland-host'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
+    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'
+    ]
+-
+    # default.yaml
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/precheck.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Include: [
   cmake_platforms.yaml: [
-    "ubuntu-20.04",
+    "ubuntu-22.04",
     "windows-10_22h2-msvc2019-developer-build",
     "ios-universal"
   ],

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']
 

coin/platform_configs/qmake2cmake.yaml

@@ -2,14 +2,18 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Compiler: 'MSVC2019'
+    Features: ['DisableTests']
+-
+    Template: 'qtci-macos-12-x86_64-106'
     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']

coin/platform_configs/qt-creator.yaml

@@ -16,24 +16,24 @@ Configurations:
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
 -
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     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.14-x86_64'
+    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']

coin/platform_configs/qt3d.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qt5.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+]
 Configurations: []

coin/platform_configs/qt5compat.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtactiveqt.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtbase.yaml

@@ -3,6 +3,8 @@ Include: [
     cmake_platforms.yaml,
     cmake_platforms_static_tests.yaml,
     integrity.yaml,
-    ios-tests.yaml
+    ios-tests.yaml,
+    address_sanitizer_platforms.yaml,
+    linux_android_tests_multi_abi.yaml
 ]
 Configurations: []

coin/platform_configs/qtcharts.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtconnectivity.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtdatavis3d.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtdeclarative.yaml

@@ -2,6 +2,7 @@ Version: 2
 Include: [
     cmake_platforms.yaml,
     integrity.yaml,
+    ios-tests.yaml,
     cmake_platforms_static_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtdoc.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtgraphs.yaml

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

coin/platform_configs/qtgrpc.yaml

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

coin/platform_configs/qthttpserver.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtlottie.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtmqtt.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtmultimedia.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtnetworkauth.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtopcua.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtpositioning.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtqa.yaml

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

coin/platform_configs/qtquick3dphysics.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtquickeffectmaker.yaml

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

coin/platform_configs/qtquicktimeline.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -0,0 +1,51 @@
+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:
+-
+    Id: 'Axivion-QEMU_build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'QEMU'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR']
+    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: [
+        '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 -qtlibinfix TestInfix',
+        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
+        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'QT_QUICK_BACKEND=software',
+    ]
+
+

coin/platform_configs/qtsaferenderer.yaml

@@ -1,24 +1,56 @@
 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'
+    Id: 'macos-latest-xcode-universal-static-build'
-    Compiler: 'Mingw'
+    Template: 'qtci-macos-12-x86_64-106'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
+    Compiler: 'Clang'
-    Configure arguments: '-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++'
+    Target arch: 'x86_64-arm64'
-    Features: ['UseLegacyInstructions']
+    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"'
+    ]
 -
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Id: 'Linux-RHEL_8_6_Static'
-    Compiler: 'Mingw'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-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++'
--
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-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'
+    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-20.04-x86_64-50'
+    Id: 'Windows-MSVC2019_Static'
-    Compiler: 'GCC'
+    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+    Compiler: 'MSVC2019'
-    Configure arguments: '-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: '-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}}']

coin/platform_configs/qtscxml.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtsensors.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtserialbus.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtserialport.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtspeech.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qttools.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qttranslations.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtvirtualkeyboard.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtwayland.yaml

@@ -1,3 +1,18 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
-Configurations: []
+    cmake_platforms.yaml
+    ]
+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'

coin/platform_configs/qtwebchannel.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtwebengine.yaml

@@ -1,5 +1,5 @@
 Version: 2
 Include: [
     cmake_platforms.yaml
-]
+    ]
 Configurations: []

coin/platform_configs/qtwebsockets.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/qtwebview.yaml

@@ -1,3 +1,5 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml
+    ]
 Configurations: []

coin/platform_configs/tqtc-android-automotive.yaml

@@ -1,54 +1,29 @@
 Version: 2
-Include: [ cmake_platforms_target_android.yaml ]
+Include: [
+    cmake_platforms.yaml: [
+        'rhel-8.6',
+        'windows-10_22h2-mingw11',
+        'ubuntu-22.04-documentation'
+    ],
+    macos.yaml: [
+        'macos-universal-on-x86_64'
+    ],
+    cmake_platforms_target_android.yaml: [
+        'android-arm64-on-macos',
+        'android-armv7-on-windows',
+        'android-x86-on-linux',
+        'android-x86_64-on-linux'
+    ]
+]
 Configurations:
--
-    Id: 'automotive-ubuntu-20.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    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'
--
-    Id: 'windows-10_22h2-mingw11'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
--
-    Id: 'macos-universal-on-x86_64'
-    Template: 'qtci-macos-12-x86_64-105'
-    Compiler: 'Clang'
-    Target arch: 'x86_64-arm64'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
-    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
-        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
-    ]
--
-    Id: 'rhel-8.4'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', '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/linux-x86_64-gcc'
-    ]
 -
     Id: "automotive-android-x86-on-linux"
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.6-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
+    Platform dependency: 'rhel-8.6'
     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',

coin/platform_configs/tqtc-meta-qt6-prereleases.yaml

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

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']
 

coin/platform_configs/yocto.yaml

@@ -0,0 +1,43 @@
+Version: 2
+Module only: True
+Configurations:
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET1'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET2'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET3'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET4'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET5'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET6'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET7'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET8'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET9'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'Yocto'
+        Target arch: 'TARGET10'

coin/pre-provisioning/qtci-linux-RHEL-8.6-x86_64/README_MANUAL_INSTALLATIONS

@@ -0,0 +1,63 @@
+### RED HAT ENTERPRISE LINUX 8.6 ###
+
+Language: English (United States)
+Time & Date: Etc/Coordinated Universal Time
+Software Selection: Server with GUI
+Installation Destination: Automatic partitioning selected
+Root Passowrd: Set
+Network & Host..: Connect
+User Creation
+Beging Installation
+
+Reboot
+
+Licensing: Accept
+Finish Configuration
+
+gnome-initial-setup:
+Language: English (US)
+Typing:English (US)
+Privacy: Location Services: OFF
+Connect Your Online Accounts: Skip
+Start Using Red Hat Enterprise Linux
+
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+
+# Configure Settings
+ Notifications:
+    * Notification Popups: OFF
+    * Lock Screen Notifications: OFF
+ Privacy:
+    * Screen Lock: OFF
+ Power:
+    * Blank screen: Never
+ Details:
+    * Time & Date: Time Zone: UTC
+       * run "sudo timedatectl set-timezone Etc/UTC"
+    * Users: Automatic login on
+
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+sudo grub2-mkconfig -o /etc/grub2.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+
+# Add support for virtio driver
+su
+echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+# Do these from Opennebula UI!
+
+# Enable network connection from right upper corner
+
+ Devices:
+    * Displays: Resolution 1280 x 800
+    
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+# run as qt user
+su
+chmod 755 coin-setup
+run './coin-setup'
+
+Reboot

coin/pre-provisioning/qtci-linux-RHEL-9.0-x86_64/01-disable-automounting.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+set -ex
+
+sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF"
+[org/gnome/desktop/media-handling]
+automount=false
+automount-open=false
+EOF
+
+sudo dconf update
+

coin/pre-provisioning/qtci-linux-RHEL-9.0-x86_64/README_MANUAL_INSTALLATIONS

@@ -0,0 +1,58 @@
+### RHEL 9.0 ###
+Hard Disk: 500G
+Network: CI
+Video Card: Total Video Memory: 64MB
+Boot options/Firmware: BIOS
+
+Language: English (United States)
+Time & Date: Etc/Coordinated Universal Time
+Software Selection: Server with GUI
+Installation Destination: Automatic partitioning selected
+Root Passowrd: Set
+Network & Host..: Connect
+Beging Installation
+
+Reboot
+
+# Configure Settings
+ Notifications:
+    * Lock Screen Notifications: OFF
+    * Applications: Set notificantion off
+ Applications:
+    * Disable notifications from all applications
+ Privacy:
+    * Blank Screen Delay: Never
+    * Screen Lock: OFF
+ Power:
+    * Blank screen: Never
+ Displays:
+    * Resolution: 1280 x 800
+ Users:
+    * Automatic login on
+
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+sudo grub2-mkconfig -o /etc/grub2.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+
+# Add support for virtio driver
+su
+echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+# Enable network connection from right upper corner
+
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+# run as qt user
+run './coin-setup'
+
+# Switch to use GNOME Classic user interface
+# GNOME Classic was selected because there's an issue with Starndard (wayland display server). Autotest start failing because terminal session remains in Activities Overview.
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3854
+First execute script ./01-disable-automounting.sh (dconf update crash in GNOME Classic)
+logout -> Select user (without it the drop down menu won't appear) -> switch to 'GNOME Classic' from drop down menu in login screen
+
+Reboot

coin/provisioning/common/linux/android_linux.sh

@@ -62,16 +62,16 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r25b"
-ndkVersionDefault="r23b"
+ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="33.0.1"
-sdkApiLevel="android-31"
+sdkApiLevel="android-33"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
-ndkSha1Default="f47ec4c4badd11e9f593a8450180884a927c330d"
+ndkSha1Default=$ndkSha1Latest
 # Android automotive
-sdkApiLevelAutomovie="android-30"
+sdkApiLevelAutomotive="android-30"
-androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
+androidAutomotive11Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
 androidAutomotive="android-automotive"
 android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"
 
@@ -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"  \
+echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
-    | 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,12 +166,15 @@ 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 "Install $sdkApiLevelAutomovie $androidAutomotive"
+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 $sdkApiLevelAutomotive $androidAutomotive"
 DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \
-    "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz"
+    "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"
-sudo tar -xzf "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz" -C $sdkTargetFolder/system-images
+sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C $sdkTargetFolder/system-images
 echo "no" | ./avdmanager create avd -n automotive_emulator_x86_api_30 -c 2048M -f \
-    -k "system-images;${sdkApiLevelAutomovie};${androidAutomotive};x86"
+    -k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86"
 
 # Purely informative, show the list of avd devices
 ./avdmanager list avd

coin/provisioning/common/linux/axivion-bauhaus-suite.sh

@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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.
+##
+## $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 installs Axivion Bauhaus Suite tool.
+
+set -ex
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+# source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+DownloadAndExtract () {
+    url=$1
+    sha=$2
+    file=$3
+
+    DownloadURL "$url" "$url" "$sha" "$file"
+    tar -xzvf $file
+
+    rm -rf $file
+}
+
+
+# Axivion Bauhaus Suite
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite-7_6_0-wavefront-2023-03-16-x86_64-gnu_linux.tar.gz"
+sha1="20bfa8872b90ff11394098a833d536229425535e"
+cd $HOME
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
+
+mkdir $HOME/.bauhaus
+cd "$HOME/.bauhaus"
+wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_20231231.key
+cd $HOME
+
+#Axivion configuration
+configurationFile="http://ci-files01-hki.ci.qt.io/input/axivion/axivion_config.tar.gz"
+configurationTargetFile="axivion_config.tar.gz"
+configSha1="f3aa53f253fa00c7f3fa64e9fe55aa7f93bc5377"
+DownloadAndExtract "$configurationFile" "$configSha1" "$configurationTargetFile" "$HOME"
+
+echo "Axivion Bauhaus Suite = 7.6.0_wavefront-2022-03-16" >> ~/versions.txt

coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake

@@ -69,7 +69,7 @@ set(CMAKE_C_FLAGS  "-bsp $ENV{INTEGRITY_BSP} -os_dir $ENV{INTEGRITY_DIR} -non_sh
 
 set(CMAKE_C_FLAGS_DEBUG "-g -Omaxdebug")
 set(CMAKE_C_FLAGS_RELEASE "-Ospeed -Olink -Omax -no_uvfd")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 -std=c11 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148,1721,1424,193,940,620,111,128,185,826,186,68,830,177,554,550,175,1441,546 -std=c11 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -frigor=accurate --signed_fields --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor --commons -I $ENV{QC_MULTIMEDIA_INC_DIR}")
 set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})

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)

coin/provisioning/common/linux/gcc.sh

@@ -69,7 +69,7 @@ function InstallGCC() {
     buildFolder="$HOME/gcc_build"
 
     echo "Fetching prebuilt GCC."
-    curl --fail -L --retry 5 --retry-delay 5 -o "$prebuiltTarget" "$prebuiltGCC" || (
+    DownloadURL "$prebuiltGCC" "" "$prebuiltSHA1" "$prebuiltTarget" || (
         echo "Fetching prebuilt GCC failed. Building from sources."
         DownloadURL "$cachedUrl" "$officialUrl" "$sourcesSHA1" "$targetFile"
     )

coin/provisioning/common/linux/install-cpdb.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2023 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://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 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install cpdb from sources.
+# Requires GCC and Perl to be in PATH.
+# The following dependencies should be pre-installed:
+#  make, autoconf, autopoint, libglib2.0-dev, libdbus-1-dev, libtool
+set -ex
+
+repName="cpdb-libs"
+gitUrl="https://github.com/openprinting/$repName.git"
+tmpdir="/tmp"
+repDir="$tmpdir/$repName"
+prefix="/usr"
+rm -rf $repDir
+cd $tmpdir
+git clone $gitUrl >/dev/null
+cd $repDir
+# cpdb-libs v2.0b4 with build bug fixed
+git checkout ce848f1571a82ec03881fce127ff28bec8da239e > /dev/null
+./autogen.sh > /dev/null
+./configure --prefix=$prefix > /dev/null
+make -j$(nproc) > /dev/null && sudo make install > /dev/null
+sudo ldconfig
+rm -rf $repDir

coin/provisioning/common/linux/mimersql.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-############################################################################
+#############################################################################
 ##
 ## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
@@ -39,39 +39,39 @@
 ##
 #############################################################################
 
-# This script will build and install FFmpeg static libs
+set -e
-set -ex
 
-# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+SSL_VER=$1
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+PACK_TYPE=$2
-# shellcheck source=../unix/SetEnvVar.sh
+PROVISIONING_DIR="$(dirname "$0")/../../"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
 
-ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
 
-if [ -f /etc/redhat-release ]
+localRepo=http://ci-files01-hki.intra.qt.io/input/docker
-then
+upstreamRepo=http://install.mimer.com/qt
-  sudo sudo yum -y install yasm
+if [ "$SSL_VER" = "openssl-3" ]; then
+    if [ "$PACK_TYPE" = "rpm" ]; then
+        packageFile=mimersqlsrv-11.0.x86_64-openssl3.rpm
+        sha=5f21d440a12cddcc786ddff3a136bef821f1bf64
+    else
+        packageFile=mimersqlsrv_11.0_amd64-openssl3.deb
+        sha=3239b593724c564862d3bbfb70fed16909a93959
+    fi
 else
-  sudo apt install yasm
+    if [ "$PACK_TYPE" = "rpm" ]; then
+        packageFile=mimersqlsrv-11.0.x86_64-openssl1.rpm
+        sha=34533347424ba540b36d0a6ae2f416b901d8bafb
+    else
+        packageFile=mimersqlsrv_11.0_amd64-openssl1.deb
+        sha=f4ac939a190ef048150b06cecc7a392386b6e132
+    fi
 fi
+DownloadURL  $localRepo/$packageFile $upstreamRepo/$packageFile $sha /tmp/$packageFile
 
-version="n5.0"
+if [ "$PACK_TYPE" = "rpm" ]; then
-ffmpeg_name="FFmpeg-$version"
+    sudo rpm -U  /tmp/$packageFile
-
+else
-url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
+    sudo apt-get -y install /tmp/$packageFile
-url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+fi
-sha1="1a979876463fd81e481d53ceb3cc117f0fce8521"
+rm -f /tmp/$packageFile
-
-target_folder="$HOME"
-app_prefix=""
-
-InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_folder" "$app_prefix"
-
-mkdir -p "$target_folder/$ffmpeg_name/build"
-pushd "$target_folder/$ffmpeg_name/build"
-../configure $ffmpeg_config_options --prefix=installed
-make install -j
-popd
-
-SetEnvVar "FFMPEG_DIR" "$target_folder/$ffmpeg_name/build/installed"

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[@]}"

coin/provisioning/common/macos/android.sh

@@ -58,10 +58,10 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersionLatest="r25b"
-ndkVersionDefault="r23b"
+ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="33.0.1"
 # this is compile sdk version
-sdkApiLevel="android-31"
+sdkApiLevel="android-33"
 
 toolsSourceFile="$basePath/$toolsFile"
 

coin/provisioning/common/macos/docker.sh

@@ -61,3 +61,14 @@ 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

coin/provisioning/common/macos/libusb.sh

@@ -47,3 +47,25 @@ brew install libusb
 read -r -a arr <<< $(brew list --versions libusb)
 version=${arr[1]}
 echo "libusb = $version" >> ~/versions.txt
+
+mkdir /tmp/arm64/
+mkdir /tmp/amd64/
+
+case $(sw_vers -productVersion) in
+    11*) codename=big_sur;;
+    12*) codename=monterey;;
+    13*) codename=ventura;;
+esac
+
+brew fetch --bottle-tag=arm64_${codename} libusb
+brew fetch --bottle-tag=${codename} libusb
+tar xf $(brew --cache --bottle-tag=arm64_${codename} libusb) -C /tmp/arm64/
+tar xf $(brew --cache --bottle-tag=${codename} libusb) -C /tmp/amd64
+for f in /tmp/arm64/libusb/$version/lib/* ; do
+    if lipo -info $f >/dev/null 2>&1; then
+        file=$(basename $f)
+        lipo -create -output $(brew --cellar)/libusb/$version/lib/$file \
+            /tmp/arm64/libusb/$version/lib/$file \
+            /tmp/amd64/libusb/$version/lib/$file
+    fi
+done

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

coin/provisioning/common/unix/SetEnvVar.sh

@@ -50,7 +50,12 @@ function SetEnvVar {
     echo "Setting environment variable $name to $path."
 
     if uname -a |grep -q "Ubuntu"; then
-        echo "export $name=$path" >> ~/.profile
+        if lsb_release -a |grep "Ubuntu 22.04"; then
+            echo "export $name=$path" >> ~/.bashrc
+            echo "export $name=$path" >> ~/.bash_profile
+        else
+            echo "export $name=$path" >> ~/.profile
+        fi
     else
         echo "export $name=$path" >> ~/.bashrc
         echo "export $name=$path" >> ~/.zshrc

coin/provisioning/common/unix/emsdk.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #############################################################################
 ##
-## Copyright (C) 2021 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.
@@ -41,15 +41,38 @@
 # shellcheck source=./SetEnvVar.sh
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 
-version="3.1.14"
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
+version="3.1.25"
 versionNode="v14.18.2"
+tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
+if uname -a |grep -q Darwin; then
+    tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
+    sha="33a3d1227e1409cfcb42d40c3e50108469bd5930"
+else
+    tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
+    sha="7280f68da2cb232d8b5dca843706cb10e49ab901"
+fi
+cacheUrl="https://ci-files01-hki.intra.qt.io/input/emsdk/${tarBallPackage}"
+target="/tmp/${tarBallPackage}"
 
 mkdir -p /opt
 cd /opt
-sudo git clone https://github.com/emscripten-core/emsdk.git
+echo "URL: $cacheUrl"
-cd emsdk
+DownloadURL "$cacheUrl" "" "$sha" "$target" || (
-sudo ./emsdk install $version
+    echo "Emsdk isn't cached. Cloning it"
-sudo ./emsdk activate $version
+    sudo git clone https://github.com/emscripten-core/emsdk.git
+)
+
+if [ -f "$target" ]; then
+    sudo tar -xzf "$target" -C /opt/
+    sudo rm -f "$target"
+else
+    cd emsdk
+    sudo ./emsdk install "$version"
+    sudo ./emsdk activate "$version"
+fi
 
 # platform-specific toolchain and node binaries. urls obtained from "emsdk install"
 if uname -a |grep -q Darwin; then

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"

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

@@ -48,31 +48,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-function SourceEnvVar {
+version="n6.0"
-    echo "Source environment variables file"
-    if [ uname -a | grep -q "Ubuntu" ];
-    then
-        if [ lsb_release -a | grep "Ubuntu 22.04" ];
-        then source ~/.bashrc
-        else source ~/.profile
-        fi
-    else
-        source ~/.bashrc
-        source ~/.zshrc
-    fi
-}
-
-if [ "$os" == "android" ];
-then
-version="f0d2ed135c3602670b56a95e0346487730317407"
-url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
-sha1="a429060d07b6d84c849a68741f816a7e91447d12"
-else
-version="n5.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="1d4283c5ff9e02378893168f55b8672bb30b9176"
+sha1="78435ec71cc2227017a99c030e858719b8c7c74d"
-fi
-
 url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -99,8 +77,7 @@ build_ffmpeg() {
   then prefix="/usr/local/$ffmpeg_name"
   fi
 
-  # android configures its own toolchain, it does not use the system clang
+  if [ -n "$arch" ]
-  if [ -n "$arch" ] && [ "$os" != "android" ]
   then cc="clang -arch $arch"
   fi
 
@@ -112,94 +89,26 @@ build_ffmpeg() {
   popd
 }
 
-build_ffmpeg_android() {
-  SourceEnvVar
-  target_arch=$1
-  target_dir=$2
-
-  if [ "$target_arch" == "x86_64" ];
-  then
-    #emulador on CI is x86_64
-    target_toolchain_arch="x86_64-linux-android"
-    target_arch=x86_64
-    target_cpu=x86_64
-  else
-    #emulador on CI is x86
-    target_toolchain_arch="i686-linux-android"
-    target_arch=x86
-    target_cpu=i686
-  fi
-
-  api_version=24
-
-  toolchain=${ANDROID_NDK_ROOT_DEFAULT}/toolchains/llvm/prebuilt/${ANDROID_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
-
-  ffmpeg_config_options+=" --disable-vulkan --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --cpu=${target_cpu} --disable-indev=android_camera --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/ --cc=${cc} --cxx=${cxx}"
-  build_ffmpeg ${target_arch} ${target_dir}
-}
-
 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=10.14
+  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
-  export MACOSX_DEPLOYMENT_TARGET=10.14
+  export MACOSX_DEPLOYMENT_TARGET=11
   build_ffmpeg "arm64"
   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"
 
-elif  [ "$os" == "android" ]; then
-
-  SourceEnvVar
-
-  url_cached=""
-  url_public=""
-  sha1=""
-
-  #get emulator target arch
-  if [ "$ANDROID_EMULATOR" == *"x86_64"* ];
-  then
-    target_arch=x86_64
-    sha1="0241fd483c16f4ce53206b911214b06854cdef9d"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip"
-    target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86_64"
-  else
-    target_arch=x86
-    url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip"
-    sha1="8b254e31411a350edb581bb30e31401866abbe7d"
-    target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86"
-  fi
-
-  app_prefix=""
-
-  #try install a pre-build
-  InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
-
-  #if could not install pre-build, build it
-  if [ ! -d "$target_dir" ];
-  then build_ffmpeg_android "$target_arch" "$target_dir"
-  fi
-
-  #set the var to use in yaml
-  SetEnvVar "FFMPEG_DIR_ANDROID" "$target_dir"
 fi