Update submodules on '6.8.0 in qt/qt5'

Change-Id: Id5147c9f3ed485a435a1a36cc70a503745c20407
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

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

.gitreview

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

README.md

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

cmake/3rdparty/cmake/Copyright.txt

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

cmake/3rdparty/cmake/QtIRRunCMake.cmake

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

cmake/3rdparty/cmake/QtIRTestHelpers.cmake

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

cmake/3rdparty/cmake/qt_attribution.json

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

cmake/QtIRGitHelpers.cmake

@@ -93,15 +93,9 @@ function(qt_ir_run_git_submodule_init submodules working_directory)
     qt_ir_setup_commit_template("${working_directory}" "${working_directory}")
 endfunction()
 
-# Add gerrit remotes to the repository located in the working_directory.
-# repo_relative_url is the relative URL of the repository.
-# Examples:
-# - qt5
-# - qttools.git
-# - ../playground/qlitehtml.git
-# - ../qt/qttools-litehtml.git
-function(qt_ir_add_git_remotes repo_relative_url working_directory)
-    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
+# Add gerrit remotes to the repository.
+function(qt_ir_add_git_remotes repo_name working_directory)
+    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/")
     set(gerrit_repo_url "${gerrit_ssh_base}")
 
     qt_ir_get_option_value(codereview-username username)
@@ -116,10 +110,7 @@ function(qt_ir_add_git_remotes repo_relative_url working_directory)
         string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
     endif()
 
-    set(namespace "qt")
-    set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}")
-    qt_ir_normalize_git_url("${repo_relative_url_with_namespace}" normalized_url)
-    string(APPEND gerrit_repo_url "${normalized_url}")
+    string(APPEND gerrit_repo_url "${repo_name}")
 
     qt_ir_execute_process_and_log_and_handle_error(
         COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}"
@@ -202,21 +193,15 @@ function(qt_ir_clone_one_submodule submodule_name)
     set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}")
 
     set(submodule_url "${submodule_base_git_path}")
-    qt_ir_parse_git_url(
-        URL "${submodule_url}"
-        OUT_VAR_HAS_URL_SCHEME has_url_scheme
-    )
-
+    qt_ir_has_url_scheme("${submodule_url}" has_url_scheme)
     if(NOT has_url_scheme AND arg_BASE_URL)
         set(submodule_url "${arg_BASE_URL}${submodule_url}")
-        qt_ir_normalize_git_url("${submodule_url}" submodule_url)
     endif()
 
     qt_ir_get_mirror(mirror_url)
     set(mirror "")
     if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH))
         set(mirror "${mirror_url}${submodule_base_git_path}")
-        qt_ir_normalize_git_url("${mirror}" mirror)
     endif()
 
     set(mirror_or_original_url "${submodule_url}")

cmake/QtIRHelpers.cmake

@@ -8,6 +8,7 @@ macro(qt_ir_include_all_helpers)
     include(QtIROptionsHelpers)
     include(QtIRParsingHelpers)
     include(QtIRProcessHelpers)
+    include(QtIRTestHelpers)
     include(QtTopLevelHelpers)
 endmacro()
 
@@ -116,7 +117,7 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
     if(submodules)
         qt_ir_get_top_level_submodules(include_submodules exclude_submodules)
         if(NOT include_submodules AND arg_ALREADY_INITIALIZED)
-            string(REPLACE "," ";" include_submodules "${submodules}")
+            set(include_submodules "${submodules}")
         endif()
 
         # qtrepotools is always implicitly cloned, but it doesn't actually

cmake/QtIRParsingHelpers.cmake

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

cmake/QtIRScript.cmake

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

cmake/QtSynchronizeRepo.cmake

@@ -3,62 +3,13 @@
 
 # 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
-#
-# The script can take additional options.
-#
-# SYNC_REF_SPEC - an alias for SYNC_TO_BRANCH, can be a tag, branch or commit sha1.
-#
-# REMOTE_NAME - remote name to use for fetching, default is origin.
-#
-# GIT_DEPTH - corresponds to git's --depth option, will be passed to git clone and git submodule
-# update --init operations.
-#
-# SHOW_PROGRESS - passes --progress to git submodule update operations
-#
-# VERBOSE - enables more verbose output
-#
-# The script also takes the following environment variables:
-#
-# QT_TL_SUBMODULE_UPDATE_FLAGS - additional flags to pass to git submodule update calls.
-#
-# To run the script in full debug mode use:
-# cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" -DSHOW_PROGRESS=1 -DVERBOSE=1
-#       -P cmake/QtSynchronizeRepo.cmake --log-level=DEBUG --trace-redirect=log.txt --trace-expand
 
 cmake_policy(VERSION 3.16)
-include("${CMAKE_CURRENT_LIST_DIR}/QtTopLevelHelpers.cmake")
+include(cmake/QtTopLevelHelpers.cmake)
 if(QT_FOREACH)
     qt_internal_foreach_repo_run(ARGS ${ARGS})
 else()
-    set(args "")
-
-    if(SYNC_REF_SPEC)
-        set(ref_spec "${SYNC_REF_SPEC}")
-    elseif(SYNC_TO_BRANCH)
-        set(ref_spec "${SYNC_TO_BRANCH}")
-    endif()
-
-    if(REMOTE_NAME)
-        list(APPEND args REMOTE_NAME "${REMOTE_NAME}")
-    endif()
-
-    if(GIT_DEPTH)
-        list(APPEND args GIT_DEPTH "${GIT_DEPTH}")
-    endif()
-
-    if(SHOW_PROGRESS)
-        list(APPEND args SHOW_PROGRESS)
-    endif()
-
-    if(VERBOSE)
-        list(APPEND args VERBOSE)
-    endif()
-
-    qt_internal_sync_to(${SYNC_TO_MODULE}
-        SYNC_REF ${ref_spec}
-        ${args}
-    )
+    qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})
 endif()

cmake/QtTopLevelConfigureScript.cmake

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

coin/instructions/coin_qt_configure.yaml

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

coin/platform_configs/cmake_platforms.yaml

@@ -12,7 +12,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests', 'DocsGenerationV2']
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
@@ -30,7 +30,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation-x11-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'TestOnly', 'DocsGenerationV2']
+    Features: ['Sccache', 'TestDocs', 'TestOnly']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-x11-tests'
@@ -105,7 +105,7 @@ Configurations:
     Id: 'ubuntu-24.04-x64-x11-tests'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x64'
 -
     Id: 'opensuse-15.5-developer-build'
@@ -120,7 +120,7 @@ Configurations:
     ]
 -
     Id: 'sles-15_sp5-static'
-    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -130,7 +130,7 @@ Configurations:
     ]
 -
     Id: 'windows-10_22h2-msvc2022'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -154,13 +154,13 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-arm64-msvc2022'
-    Template: 'qtci-windows-11_22H2-aarch64-54'
+    Template: 'qtci-windows-11_22H2-aarch64-53'
     Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
@@ -180,20 +180,8 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'windows-11_23H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
-    ]
--
-    Id: 'rhel-8.10'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Id: 'rhel-8.8'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
@@ -202,8 +190,8 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
 -
-    Id: 'rhel-9.4'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Id: 'rhel-9.2'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
@@ -211,9 +199,19 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
+# Build on Debian-11.6 and split test on Wayland and offscreen later
+-
+    Id: 'debian-11.6-arm64'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+    ]
 -
     Id: 'ios-universal'
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
@@ -226,7 +224,7 @@ Configurations:
     ]
 -
     Id: 'windows-10_22h2-mingw13'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -255,7 +253,7 @@ Configurations:
     Template: 'qtci-windows-11_23H2-x86_64-53'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
+    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
     Environment variables: [
         'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
         'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
@@ -289,16 +287,3 @@ Configurations:
         'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
--
-    Id: 'bookworm-gles-arm64-debian-pkg-packaging'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
-    Environment variables: [
-        'DEBIAN_RULES_REF=6.8_gles',
-        'COIN_TARGET_DIST=tqtc-bookworm',
-        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
-        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
-        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
-    ]

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -9,10 +9,10 @@ Configurations:
     Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -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_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_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
         'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
@@ -26,10 +26,10 @@ Configurations:
     Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
+        'TARGET_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_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.27.7/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',
@@ -43,10 +43,10 @@ Configurations:
     Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
+        'TARGET_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_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
         'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -12,7 +12,7 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
+        'QT_CMAKE_DIR=/opt/cmake-3.27.7/bin',
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
         'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
     ]

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -1,72 +0,0 @@
-Version: 2
-Configurations:
-
--
-    Id: 'windows-11_23H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests']
-    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
-    Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_22H2-aarch64-55'
-    Compiler: 'MSVC2022'
-    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
-    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
-    Id: 'rhel-8.10-minimal-static-test'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests']
-    Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
-    ]
--
-    Id: 'ubuntu-24.04-arm64'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
-    Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release'
-    ]
-
--
-    Id: 'macos-universal-on-x86_64-minimal-static-test'
-    Template: 'qtci-macos-14-x86_64-105'
-    Compiler: 'Clang'
-    Target arch: 'x86_64-arm64'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql'
-    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
-        'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
-    ]
-
--
-    Id: 'macos-14-minimal-static-tests-x86_64'
-    Template: 'qtci-macos-14-x86_64-105'
-    Compiler: 'Clang'
-    Features: ['TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
--
-    Id: 'macos-14-minimal-static-tests-arm64'
-    Template: 'qtci-macos-14-arm-106'
-    Compiler: 'Clang'
-    Features: ['TestOnly', 'Packaging']
-    Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'sles-15_sp5-minimal-static'
-    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
     Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -23,7 +23,7 @@ Configurations:
     ]
 -
     Id: 'macos-minimal-static'
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-13-x86_64-103'
     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

@@ -17,7 +17,7 @@ Configurations:
     ]
 -
     Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'
@@ -33,12 +33,12 @@ Configurations:
     ]
 -
     Id: 'android-9-x86-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
+    Platform dependency: 'rhel-8.8'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -48,19 +48,18 @@ Configurations:
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
 -
-    Id: 'android-15-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Id: 'android-14-x86_64-on-linux'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
+    Platform dependency: 'rhel-8.8'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
+        'ANDROID_EMULATOR=emulator_x86_64_api_34'
     ]
-

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -14,7 +14,7 @@ Configurations:
     ]
 -
     Id: 'webassembly-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'WebAssembly'
     Compiler: 'Mingw'
     Target compiler: 'Clang'

coin/platform_configs/default.yaml

@@ -4,9 +4,9 @@ Configurations:
     Id: 'ubuntu-22.04-license-check'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheckV2']
+    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
 -
     Id: 'ubuntu-24.04-x64-license-check'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheckV2']
+    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/flashing-wizard.yaml

@@ -1,4 +1,39 @@
 Version: 2
 Module only: True
-Include: [cmake_platforms_static_release.yaml]
-Configurations: []
+Configurations:
+    -
+        Template: 'qtci-windows-10-x86_64-52'
+        Compiler: 'MSVC2019'
+        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 -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-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% -static -no-icu'
+    -
+        Template: 'qtci-windows-10_22H2-x86_64-52'
+        Compiler: 'MSVC2019'
+        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 -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-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% -static -no-icu'
+    -
+        Template: 'qtci-windows-10-x86_64-52'
+        Compiler: 'MSVC2019'
+        Target arch: 'x86'
+        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-windows-10_22H2-x86_64-52'
+        Compiler: 'MSVC2019'
+        Target arch: 'x86'
+        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.8-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'
+    -
+        Template: 'qtci-linux-Ubuntu-18.04-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'
+    -
+        Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+        Compiler: 'GCC'
+        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/ios-tests.yaml

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

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.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
+    Platform dependency: 'rhel-8.8'
     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

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

coin/platform_configs/macos.yaml

@@ -15,8 +15,8 @@ Configurations:
         Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
         Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
         Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
+            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
         ]
 
@@ -39,7 +39,7 @@ Configurations:
 
     -
         Id: 'macos-12-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-107'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
@@ -87,7 +87,7 @@ Configurations:
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-12-arm-on-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-107'
+        Template: 'qtci-macos-12-x86_64-106'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-universal-on-arm64'
@@ -115,7 +115,7 @@ Configurations:
         Template: 'qtci-macos-14-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
+        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}} -DQT_DEPLOY_FFMPEG=TRUE',
@@ -126,7 +126,7 @@ Configurations:
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -nomake examples -debug -framework'
+        Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -7,7 +7,7 @@ Include: [
 Configurations:
 -
     Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'MSVC2019'

coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml

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

coin/platform_configs/precheck.yaml

@@ -5,12 +5,11 @@ Include: [
     "ubuntu-22.04",
     "ubuntu-22.04-documentation",
     "ubuntu-22.04-documentation-x11-tests",
-    "windows-11_23H2-msvc2022-developer-build",
+    "windows-11_23H2-msvc2022",
     "ios-universal"
   ],
   macos.yaml: [
-    "macos-14-arm64-developer-build",
-    "macos-14-arm64-developer-build-tests",
+    "macos-14-x86_64-tests",
   ],
   cmake_platforms_target_android.yaml: [
     "android-arm64-on-macos"

coin/platform_configs/qdb.yaml

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

coin/platform_configs/qmake2cmake.yaml

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

coin/platform_configs/qt-creator.yaml

@@ -2,59 +2,31 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease']
+    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
     Environment variables: []
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
 -
     Template: 'qtci-macos-14-arm-106'
     Compiler: 'Clang'
-    Features: ['Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
-# without tests
--
-    Template: 'qtci-windows-11_23H2-x86_64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
-    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
-# oldest Qt version
--
-    Template: 'qtci-windows-11_23H2-x86_64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
-    Configure arguments: ''
-    Environment variables: []
-    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
--
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
-    Configure arguments: ''
-    Environment variables: []
--
-    Template: 'qtci-macos-14-arm-106'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
-    Configure arguments: ''
-    Environment variables: []
-# license check
 -
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'

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

@@ -1,9 +1,9 @@
 Version: 2
 Configurations:
-# Test gcc-12 on RHEL 9.4
+# Test gcc-12 on RHEL 9.2
 -
-    Id: 'rhel-9.4-gcc12'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Id: 'rhel-9.2-gcc12'
+    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -8,16 +8,16 @@ Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
     "ubuntu-22.04-documentation",
-    "ubuntu-24.04-arm64",
     "opensuse-15.5-developer-build",
     "sles-15_sp5-static",
+    "windows-10_22h2-msvc2019",
     "windows-10_22h2-msvc2022",
-    "rhel-8.10",
+    "windows-10_22h2-msvc2019-developer-build",
+    "rhel-8.8",
     "windows-10_22h2-mingw13",
-    "windows-11_23H2-mingw13-developer-build",
-    "windows-11_23H2-llvm",
-    "windows-11_23H2-msvc2022",
-    "windows-11_22h2-arm64-msvc2022"
+    "windows-10_22h2-mingw13-developer-build",
+    "windows-10_22h2-llvm",
+    "windows-11_23H2-msvc2019"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
@@ -46,7 +46,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.27.7/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

@@ -2,21 +2,20 @@ Version: 2
 Include: [
   macos.yaml: [
      "macos-universal-on-x86_64",
-     "macos-14-x86_64-tests",
-     "macos-14-arm64-tests"
+     "macos-12-x86_64-tests",
+     "macos-12-arm-on-arm64-tests"
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
     "ubuntu-22.04-documentation",
-    "ubuntu-24.04-arm64",
     "opensuse-15.5-developer-build",
     "sles-15_sp5-static",
+    "windows-10_22h2-msvc2019",
     "windows-10_22h2-msvc2022",
-    "rhel-8.10",
+    "rhel-8.8",
     "windows-10_22h2-mingw13",
-    "windows-11_23H2-llvm",
-    "windows-11_23H2-msvc2022",
-    "windows-11_22h2-arm64-msvc2022"
+    "windows-10_22h2-llvm",
+    "windows-11_23H2-msvc2019"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
     "qnx-710-x86_64-developer-build-on-linux",
@@ -27,8 +26,8 @@ Include: [
 # Static build configurations for tools
 Configurations:
 -
-    Id: 'macos-latest-x code-universal-static-build'
-    Template: 'qtci-macos-14-arm-106'
+    Id: 'macos-latest-xcode-universal-static-build'
+    Template: 'qtci-macos-12-x86_64-106'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -37,8 +36,8 @@ Configurations:
         'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
     ]
 -
-    Id: 'Linux-RHEL_8_10_Static'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Id: 'Linux-RHEL_8_8_Static'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
@@ -47,33 +46,11 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
     ]
 -
-    Id: 'Ubuntu-24.04-arm64_Static'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
-    Compiler: 'GCC'
+    Id: 'Windows-MSVC2019_Static'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Compiler: 'MSVC2019'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
-    ]
--
-    Id: 'Windows-MSVC2022-arm64_Static'
-    Template: 'qtci-windows-11_22H2-aarch64-54'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
-    Id: 'Windows-MSVC2022_Static'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'
+    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/qtwebkit.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
     Features: ['Packaging', UseLegacyInstructions']

coin/platform_configs/tqtc-android-automotive.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
-        "rhel-8.10",
+        'rhel-8.8',
         'windows-10_22h2-mingw13',
         'ubuntu-22.04-documentation',
         'ubuntu-22.04-documentation-x11-tests'
@@ -13,18 +13,18 @@ Include: [
         'android-arm64-on-macos',
         'android-armv7-on-windows',
         'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
+        'android-14-x86_64-on-linux'
     ]
 ]
 Configurations:
 -
     Id: "automotive-android-14-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
+    Platform dependency: 'rhel-8.8'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', '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',
@@ -35,12 +35,12 @@ Configurations:
     ]
 -
     Id: "automotive-android-10-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
+    Platform dependency: 'rhel-8.8'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', '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',

coin/platform_configs/tqtc-qtpip.yaml

@@ -3,7 +3,7 @@ Module only: true
 Include: [
   cmake_platforms.yaml: [
     "windows-10_22h2-msvc2019",
-    "rhel-8.10"
+    "rhel-8.8"
   ],
   macos.yaml: [
     "macos-universal-on-x86_64"

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

@@ -1,62 +0,0 @@
-### RED HAT ENTERPRISE LINUX 8.10 ###
-
-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
-chmod 755 coin-setup
-run './coin-setup'
-
-Reboot

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

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -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.4-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,54 +0,0 @@
-### RHEL 9.4 ###
-Hard Disk: 500G
-Network: CI
-Video Card: Total Video Memory: 64MB
-Boot options/Firmware: BIOS
-Language: English (United States)
-Keyboard: English (US), Norwegian (Windows), Finnish (Windows)
-Time & Date: Etc/Coordinated Universal Time
-Software Selection: Server with GUI
-Installation Destination: Automatic partitioning selected
-Root Passowrd: Set
-Network & Host..: Connected
-KDUMP enabled: Memory Reservation: automatic
-Begin Installation
-Reboot
-# Configure Settings
- Notifications:
-    * Lock Screen Notifications: OFF
-    * Applications: Set notification off
-    * Do Not Disturb: on
- 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
-# Do these from Opennebula UI!
-
-# Enable network connection from right upper corner
-This is done when the VM is launched as persistent in OpenNebula.
-# 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/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt

@@ -56,10 +56,6 @@ Windows 10 SDK (10.0.22000.0)
 Windows 10 SDK (10.0.22621.0)
 Windows Universal C Runtime
 
-Windows SDK (10.0.26100.1742) was later downloaded and installed from:
-https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
-# COIN-1206
-
 # NOTE! Work loads were added during installation!
 
 ############################################################

coin/pre-provisioning/qtci-windows-11_22H2-aarch64/README_MANUAL_INSTALLATIONS

@@ -54,16 +54,10 @@
    - After reboot disable windows updates:
       - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows updates' - stop & disable
 * Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
-* Disable Windows Restore Points: Search 'Create a restore point' -> 'System Protection' tab -> Configure C: drive -> Disable & Delete restore points.
-* Disable widgets: Right click the task bar -> 'Taskbar settings' -> toggle off anything related to widgets.
 * (Restart Windows)
 * Google Chrome installed for RTA
 * Virus & threat protection settings:
    * Check that there's no active antivirus providers
-* Run .NET runtime optimization service: open terminal and run:
-   Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
-   - It may be needed to rerun after installing Visual Studio. Just run it until it prints:
-      "All compilation targets are up to date."
 * Activate Windows
 
 # Next

coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt

@@ -1,7 +1,6 @@
 ### Visual Studio Professional 2022 Official release ###
 Visual Studio Professional 2022 version 17.3.5 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
 Visual Studio Professional 2022 was updated to 17.8.2 vith Visual Studio Installer
-Visual Studio Professional 2022 was updated to 17.11.2 with Visual Studio Installer
 
 Installed MSVC-2022 Components:
 

coin/provisioning/common/linux/android/gradle_project/app/build.gradle

@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace 'com.example.gradle_project'
-    compileSdk 35
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.gradle_project"
         minSdk 28
-        targetSdk 35
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }

coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.0"
+agp = "8.4.0"
 core = "1.13.1"
 appcompat = "1.6.1"
 material = "1.11.0"

coin/provisioning/common/linux/android_emulator_launcher.sh

@@ -7,8 +7,8 @@
 
 set -e
 
-EMULATOR_MAX_RETRIES=3
-ADB_MAX_TIMEOUT=180
+EMULATOR_MAX_RETRIES=5
+ADB_MAX_TIMEOUT=300
 EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator"
 ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb"
 LOGCAT_PATH="$COIN_CTEST_RESULTSDIR/emulator_logcat_%iter.txt"
@@ -85,11 +85,7 @@ do
 
     echo "Waiting a few minutes for the emulator to fully boot..."
     emulator_status=down
-
-    time_start=${SECONDS}
-    duration=0
-
-    while [ $duration -lt ${ADB_MAX_TIMEOUT} ]
+    for _ in $(seq ${ADB_MAX_TIMEOUT})
     do
         sleep 1
 
@@ -98,7 +94,6 @@ do
             emulator_status=up
             break
         fi
-        duration=$(( SECONDS - time_start ))
     done
 
     # If emulator status is still offline after timeout period,

coin/provisioning/common/linux/android_linux.sh

@@ -24,15 +24,20 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersionLatest="r27c"
+ndkVersionLatest="r26b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="35.0.1"
-sdkApiLevel="android-35"
+sdkBuildToolsVersion="34.0.0"
+sdkApiLevel="android-34"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e"
+ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
 ndkSha1Default=$ndkSha1Latest
 
+# Android 14 avd zip
+android14SystemZipName="android14system_UE1A_230829_036.tar.gz"
+android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
+android14SystemPath="$basePath/$android14SystemZipName"
+
 # Android Automotive max SDK level image
 sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
@@ -131,46 +136,24 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
 ./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
     | eval "$sdkmanager_no_progress_bar_cmd"
 
-echo "Download and unzip Android Emulator version 35.2.10"
-emulatorFileName="emulator-linux_x64-12414864.zip"
+echo "Download and unzip Android Emulator version 34.1.19"
+emulatorFileName="emulator-linux_x64-11525734.zip"
 emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
 emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
 emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
-emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10"
+emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7"
 DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
 echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
 sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
 rm "$emulatorTargetFile"
 
-echo "Download and unzip Android 9 System Image"
-minVersionFileName="x86-28_r08.zip"
-minVersionDestination="$sdkTargetFolder/system-images/android-28/google_apis/"
-minVersionFilePath="$minVersionDestination/$minVersionFileName"
-minVersionCiUrl="$basePath/system-images/google_apis/$minVersionFileName"
-minVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$minVersionFileName"
-minVersionSha1="41e3b854d7987a3d8b7500631dae1f1d32d3db4e"
+echo "y" | ./sdkmanager --install "system-images;android-28;google_apis;x86" \
+    | eval "$sdkmanager_no_progress_bar_cmd"
 
-mkdir -p "$minVersionDestination"
-DownloadURL "$minVersionCiUrl" "$minVersionUrl" "$minVersionSha1" "$minVersionFilePath"
-
-echo "Unzipping the Android 9 to $minVersionDestination"
-sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
-rm "$minVersionFilePath"
-
-echo "Download and unzip Android 15 System Image"
-maxVersionFileName="x86_64-35_r08.zip"
-maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
-maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
-maxVersionCiUrl="$basePath/system-images/google_apis/$maxVersionFileName"
-maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
-maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
-
-mkdir -p "$maxVersionDestination"
-DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
-
-echo "Unzipping the Android 15 to $maxVersionDestination"
-sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
-rm "$maxVersionFilePath"
+echo "Extract stored Android 14 Beta $android14SystemZipName"
+DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
+    "/tmp/$android14SystemZipName"
+sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
 
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
@@ -178,8 +161,8 @@ ls -l "$sdkTargetFolder"
 echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
     -k "system-images;android-28;google_apis;x86"
 
-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
-    -k "system-images;android-35;google_apis;x86_64"
+echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
+    -k "system-images;android-34;google_apis;x86_64"
 
 echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
 DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
@@ -210,7 +193,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
 cd /tmp/gradle_project
 # Get Gradle files from qtbase
 qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle"
-commit_sha="8436455e2740000a817e0b8154e13f47e6abb68c"
+commit_sha="f22e9795d9a32fc4e9f4d6f2a70c2f831028342b"
 curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties
 curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew
 curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat

coin/provisioning/common/linux/axivion/axivion_config.json

@@ -1,10 +0,0 @@
-{
-    "_Layers": [
-        "post_processing.py",
-        "ci_config.json",
-        "ci_config_common.json",
-        "compiler_config.json",
-        "rule_config.json",
-        "code_annotations.json"
-    ]
-}

coin/provisioning/common/linux/axivion/ci_config_common.json

@@ -1,33 +0,0 @@
-{
-    "Project": {
-        "Git": {
-            "_active": true,
-            "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git",
-            "sourceserver_remote_url": "ssh://codereview.qt-project.org:29418/qt/$(env:TESTED_MODULE_COIN)"
-        },
-        "Project-GlobalOptions": {
-            "ci_mode": {
-                "clean_before": false
-            },
-            "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
-            "ir": "$(env:IRNAME)",
-            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_dev_$(env:TARGET_OS_COIN)"
-        }
-    },
-    "Results": {
-        "Dashboard": {
-            "ci_mode": {
-                "directory": "/data/axivion/databases"
-            },
-            "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/"
-        }
-    },
-    "_Format": "1.0",
-    "_Version": "7.6.2",
-    "_VersionNum": [
-        7,
-        6,
-        2,
-        12725
-    ]
-}

coin/provisioning/common/linux/axivion/code_annotations.json

@@ -1,32 +0,0 @@
-{
-    "Analysis": {
-        "CatchMalformedComments": {
-            "_active": true
-        },
-        "EnableDisable": {
-            "_active": true
-        },
-        "NextLine": {
-            "_active": true
-        },
-        "ReportUnclosedRestOfFileComments": {
-            "_active": true
-        },
-        "ReportUnusedComments": {
-            "_active": true
-        }
-    },
-    "Results": {
-        "Dashboard": {
-            "import_suppressed_issues": true
-        }
-    },
-    "_Format": "1.0",
-    "_Version": "trunk-d23a11ca62e",
-    "_VersionNum": [
-        7,
-        8,
-        0,
-        14394
-    ]
-}

coin/provisioning/common/linux/axivion/compiler_config.json

@@ -1,786 +0,0 @@
-{
-    "Project": {
-        "GNUToolchain": {
-            "_active": true,
-            "advanced": {
-                "no_macro_invocations_for_system_headers": false
-            },
-            "archiver": {
-                "native_archiver": "/usr/bin/ar"
-            },
-            "language_c": {
-                "emulated_compiler": "GNU",
-                "emulated_compiler_version": 90300,
-                "language_version": "C18",
-                "native_compiler": "/usr/bin/gcc",
-                "preprocessing": {
-                    "predefined_macros": {
-                        "_LP64": "1",
-                        "_STDC_PREDEF_H": "1",
-                        "__ATOMIC_ACQUIRE": "2",
-                        "__ATOMIC_ACQ_REL": "4",
-                        "__ATOMIC_CONSUME": "1",
-                        "__ATOMIC_HLE_ACQUIRE": "65536",
-                        "__ATOMIC_HLE_RELEASE": "131072",
-                        "__ATOMIC_RELAXED": "0",
-                        "__ATOMIC_RELEASE": "3",
-                        "__ATOMIC_SEQ_CST": "5",
-                        "__BIGGEST_ALIGNMENT__": "16",
-                        "__BYTE_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__CHAR_BIT__": "8",
-                        "__DBL_DECIMAL_DIG__": "17",
-                        "__DBL_DENORM_MIN__": "((double)4.94065645841246544176568792868221372e-324L)",
-                        "__DBL_DIG__": "15",
-                        "__DBL_EPSILON__": "((double)2.22044604925031308084726333618164062e-16L)",
-                        "__DBL_HAS_DENORM__": "1",
-                        "__DBL_HAS_INFINITY__": "1",
-                        "__DBL_HAS_QUIET_NAN__": "1",
-                        "__DBL_MANT_DIG__": "53",
-                        "__DBL_MAX_10_EXP__": "308",
-                        "__DBL_MAX_EXP__": "1024",
-                        "__DBL_MAX__": "((double)1.79769313486231570814527423731704357e+308L)",
-                        "__DBL_MIN_10_EXP__": "(-307)",
-                        "__DBL_MIN_EXP__": "(-1021)",
-                        "__DBL_MIN__": "((double)2.22507385850720138309023271733240406e-308L)",
-                        "__DEC128_EPSILON__": "1E-33DL",
-                        "__DEC128_MANT_DIG__": "34",
-                        "__DEC128_MAX_EXP__": "6145",
-                        "__DEC128_MAX__": "9.999999999999999999999999999999999E6144DL",
-                        "__DEC128_MIN_EXP__": "(-6142)",
-                        "__DEC128_MIN__": "1E-6143DL",
-                        "__DEC128_SUBNORMAL_MIN__": "0.000000000000000000000000000000001E-6143DL",
-                        "__DEC32_EPSILON__": "1E-6DF",
-                        "__DEC32_MANT_DIG__": "7",
-                        "__DEC32_MAX_EXP__": "97",
-                        "__DEC32_MAX__": "9.999999E96DF",
-                        "__DEC32_MIN_EXP__": "(-94)",
-                        "__DEC32_MIN__": "1E-95DF",
-                        "__DEC32_SUBNORMAL_MIN__": "0.000001E-95DF",
-                        "__DEC64_EPSILON__": "1E-15DD",
-                        "__DEC64_MANT_DIG__": "16",
-                        "__DEC64_MAX_EXP__": "385",
-                        "__DEC64_MAX__": "9.999999999999999E384DD",
-                        "__DEC64_MIN_EXP__": "(-382)",
-                        "__DEC64_MIN__": "1E-383DD",
-                        "__DEC64_SUBNORMAL_MIN__": "0.000000000000001E-383DD",
-                        "__DECIMAL_BID_FORMAT__": "1",
-                        "__DECIMAL_DIG__": "21",
-                        "__DEC_EVAL_METHOD__": "2",
-                        "__ELF__": "1",
-                        "__FINITE_MATH_ONLY__": "0",
-                        "__FLOAT_WORD_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__FLT128_DECIMAL_DIG__": "36",
-                        "__FLT128_DENORM_MIN__": "6.47517511943802511092443895822764655e-4966F128",
-                        "__FLT128_DIG__": "33",
-                        "__FLT128_EPSILON__": "1.92592994438723585305597794258492732e-34F128",
-                        "__FLT128_HAS_DENORM__": "1",
-                        "__FLT128_HAS_INFINITY__": "1",
-                        "__FLT128_HAS_QUIET_NAN__": "1",
-                        "__FLT128_MANT_DIG__": "113",
-                        "__FLT128_MAX_10_EXP__": "4932",
-                        "__FLT128_MAX_EXP__": "16384",
-                        "__FLT128_MAX__": "1.18973149535723176508575932662800702e+4932F128",
-                        "__FLT128_MIN_10_EXP__": "(-4931)",
-                        "__FLT128_MIN_EXP__": "(-16381)",
-                        "__FLT128_MIN__": "3.36210314311209350626267781732175260e-4932F128",
-                        "__FLT32X_DECIMAL_DIG__": "17",
-                        "__FLT32X_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F32x",
-                        "__FLT32X_DIG__": "15",
-                        "__FLT32X_EPSILON__": "2.22044604925031308084726333618164062e-16F32x",
-                        "__FLT32X_HAS_DENORM__": "1",
-                        "__FLT32X_HAS_INFINITY__": "1",
-                        "__FLT32X_HAS_QUIET_NAN__": "1",
-                        "__FLT32X_MANT_DIG__": "53",
-                        "__FLT32X_MAX_10_EXP__": "308",
-                        "__FLT32X_MAX_EXP__": "1024",
-                        "__FLT32X_MAX__": "1.79769313486231570814527423731704357e+308F32x",
-                        "__FLT32X_MIN_10_EXP__": "(-307)",
-                        "__FLT32X_MIN_EXP__": "(-1021)",
-                        "__FLT32X_MIN__": "2.22507385850720138309023271733240406e-308F32x",
-                        "__FLT32_DECIMAL_DIG__": "9",
-                        "__FLT32_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F32",
-                        "__FLT32_DIG__": "6",
-                        "__FLT32_EPSILON__": "1.19209289550781250000000000000000000e-7F32",
-                        "__FLT32_HAS_DENORM__": "1",
-                        "__FLT32_HAS_INFINITY__": "1",
-                        "__FLT32_HAS_QUIET_NAN__": "1",
-                        "__FLT32_MANT_DIG__": "24",
-                        "__FLT32_MAX_10_EXP__": "38",
-                        "__FLT32_MAX_EXP__": "128",
-                        "__FLT32_MAX__": "3.40282346638528859811704183484516925e+38F32",
-                        "__FLT32_MIN_10_EXP__": "(-37)",
-                        "__FLT32_MIN_EXP__": "(-125)",
-                        "__FLT32_MIN__": "1.17549435082228750796873653722224568e-38F32",
-                        "__FLT64X_DECIMAL_DIG__": "21",
-                        "__FLT64X_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951F64x",
-                        "__FLT64X_DIG__": "18",
-                        "__FLT64X_EPSILON__": "1.08420217248550443400745280086994171e-19F64x",
-                        "__FLT64X_HAS_DENORM__": "1",
-                        "__FLT64X_HAS_INFINITY__": "1",
-                        "__FLT64X_HAS_QUIET_NAN__": "1",
-                        "__FLT64X_MANT_DIG__": "64",
-                        "__FLT64X_MAX_10_EXP__": "4932",
-                        "__FLT64X_MAX_EXP__": "16384",
-                        "__FLT64X_MAX__": "1.18973149535723176502126385303097021e+4932F64x",
-                        "__FLT64X_MIN_10_EXP__": "(-4931)",
-                        "__FLT64X_MIN_EXP__": "(-16381)",
-                        "__FLT64X_MIN__": "3.36210314311209350626267781732175260e-4932F64x",
-                        "__FLT64_DECIMAL_DIG__": "17",
-                        "__FLT64_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F64",
-                        "__FLT64_DIG__": "15",
-                        "__FLT64_EPSILON__": "2.22044604925031308084726333618164062e-16F64",
-                        "__FLT64_HAS_DENORM__": "1",
-                        "__FLT64_HAS_INFINITY__": "1",
-                        "__FLT64_HAS_QUIET_NAN__": "1",
-                        "__FLT64_MANT_DIG__": "53",
-                        "__FLT64_MAX_10_EXP__": "308",
-                        "__FLT64_MAX_EXP__": "1024",
-                        "__FLT64_MAX__": "1.79769313486231570814527423731704357e+308F64",
-                        "__FLT64_MIN_10_EXP__": "(-307)",
-                        "__FLT64_MIN_EXP__": "(-1021)",
-                        "__FLT64_MIN__": "2.22507385850720138309023271733240406e-308F64",
-                        "__FLT_DECIMAL_DIG__": "9",
-                        "__FLT_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F",
-                        "__FLT_DIG__": "6",
-                        "__FLT_EPSILON__": "1.19209289550781250000000000000000000e-7F",
-                        "__FLT_EVAL_METHOD_TS_18661_3__": "0",
-                        "__FLT_EVAL_METHOD__": "0",
-                        "__FLT_HAS_DENORM__": "1",
-                        "__FLT_HAS_INFINITY__": "1",
-                        "__FLT_HAS_QUIET_NAN__": "1",
-                        "__FLT_MANT_DIG__": "24",
-                        "__FLT_MAX_10_EXP__": "38",
-                        "__FLT_MAX_EXP__": "128",
-                        "__FLT_MAX__": "3.40282346638528859811704183484516925e+38F",
-                        "__FLT_MIN_10_EXP__": "(-37)",
-                        "__FLT_MIN_EXP__": "(-125)",
-                        "__FLT_MIN__": "1.17549435082228750796873653722224568e-38F",
-                        "__FLT_RADIX__": "2",
-                        "__FXSR__": "1",
-                        "__GCC_ASM_FLAG_OUTPUTS__": "1",
-                        "__GCC_ATOMIC_BOOL_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR16_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR32_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_INT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LLONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_POINTER_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_SHORT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL": "1",
-                        "__GCC_ATOMIC_WCHAR_T_LOCK_FREE": "2",
-                        "__GCC_HAVE_DWARF2_CFI_ASM": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8": "1",
-                        "__GCC_IEC_559": "2",
-                        "__GCC_IEC_559_COMPLEX": "2",
-                        "__GXX_ABI_VERSION": "1013",
-                        "__HAVE_SPECULATION_SAFE_VALUE": "1",
-                        "__INT16_C(c)": "c",
-                        "__INT16_MAX__": "0x7fff",
-                        "__INT16_TYPE__": "short int",
-                        "__INT32_C(c)": "c",
-                        "__INT32_MAX__": "0x7fffffff",
-                        "__INT32_TYPE__": "int",
-                        "__INT64_C(c)": "c ## L",
-                        "__INT64_MAX__": "0x7fffffffffffffffL",
-                        "__INT64_TYPE__": "long int",
-                        "__INT8_C(c)": "c",
-                        "__INT8_MAX__": "0x7f",
-                        "__INT8_TYPE__": "signed char",
-                        "__INTMAX_C(c)": "c ## L",
-                        "__INTMAX_MAX__": "0x7fffffffffffffffL",
-                        "__INTMAX_TYPE__": "long int",
-                        "__INTMAX_WIDTH__": "64",
-                        "__INTPTR_MAX__": "0x7fffffffffffffffL",
-                        "__INTPTR_TYPE__": "long int",
-                        "__INTPTR_WIDTH__": "64",
-                        "__INT_FAST16_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST16_TYPE__": "long int",
-                        "__INT_FAST16_WIDTH__": "64",
-                        "__INT_FAST32_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST32_TYPE__": "long int",
-                        "__INT_FAST32_WIDTH__": "64",
-                        "__INT_FAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST64_TYPE__": "long int",
-                        "__INT_FAST64_WIDTH__": "64",
-                        "__INT_FAST8_MAX__": "0x7f",
-                        "__INT_FAST8_TYPE__": "signed char",
-                        "__INT_FAST8_WIDTH__": "8",
-                        "__INT_LEAST16_MAX__": "0x7fff",
-                        "__INT_LEAST16_TYPE__": "short int",
-                        "__INT_LEAST16_WIDTH__": "16",
-                        "__INT_LEAST32_MAX__": "0x7fffffff",
-                        "__INT_LEAST32_TYPE__": "int",
-                        "__INT_LEAST32_WIDTH__": "32",
-                        "__INT_LEAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_LEAST64_TYPE__": "long int",
-                        "__INT_LEAST64_WIDTH__": "64",
-                        "__INT_LEAST8_MAX__": "0x7f",
-                        "__INT_LEAST8_TYPE__": "signed char",
-                        "__INT_LEAST8_WIDTH__": "8",
-                        "__INT_MAX__": "0x7fffffff",
-                        "__INT_WIDTH__": "32",
-                        "__LDBL_DECIMAL_DIG__": "21",
-                        "__LDBL_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951L",
-                        "__LDBL_DIG__": "18",
-                        "__LDBL_EPSILON__": "1.08420217248550443400745280086994171e-19L",
-                        "__LDBL_HAS_DENORM__": "1",
-                        "__LDBL_HAS_INFINITY__": "1",
-                        "__LDBL_HAS_QUIET_NAN__": "1",
-                        "__LDBL_MANT_DIG__": "64",
-                        "__LDBL_MAX_10_EXP__": "4932",
-                        "__LDBL_MAX_EXP__": "16384",
-                        "__LDBL_MAX__": "1.18973149535723176502126385303097021e+4932L",
-                        "__LDBL_MIN_10_EXP__": "(-4931)",
-                        "__LDBL_MIN_EXP__": "(-16381)",
-                        "__LDBL_MIN__": "3.36210314311209350626267781732175260e-4932L",
-                        "__LONG_LONG_MAX__": "0x7fffffffffffffffLL",
-                        "__LONG_LONG_WIDTH__": "64",
-                        "__LONG_MAX__": "0x7fffffffffffffffL",
-                        "__LONG_WIDTH__": "64",
-                        "__LP64__": "1",
-                        "__MMX__": "1",
-                        "__NO_INLINE__": "1",
-                        "__ORDER_BIG_ENDIAN__": "4321",
-                        "__ORDER_LITTLE_ENDIAN__": "1234",
-                        "__ORDER_PDP_ENDIAN__": "3412",
-                        "__PRAGMA_REDEFINE_EXTNAME": "1",
-                        "__PTRDIFF_MAX__": "0x7fffffffffffffffL",
-                        "__PTRDIFF_TYPE__": "long int",
-                        "__PTRDIFF_WIDTH__": "64",
-                        "__REGISTER_PREFIX__": "",
-                        "__SCHAR_MAX__": "0x7f",
-                        "__SCHAR_WIDTH__": "8",
-                        "__SEG_FS": "1",
-                        "__SEG_GS": "1",
-                        "__SHRT_MAX__": "0x7fff",
-                        "__SHRT_WIDTH__": "16",
-                        "__SIG_ATOMIC_MAX__": "0x7fffffff",
-                        "__SIG_ATOMIC_MIN__": "(-__SIG_ATOMIC_MAX__ - 1)",
-                        "__SIG_ATOMIC_TYPE__": "int",
-                        "__SIG_ATOMIC_WIDTH__": "32",
-                        "__SIZEOF_DOUBLE__": "8",
-                        "__SIZEOF_FLOAT128__": "16",
-                        "__SIZEOF_FLOAT80__": "16",
-                        "__SIZEOF_FLOAT__": "4",
-                        "__SIZEOF_INT128__": "16",
-                        "__SIZEOF_INT__": "4",
-                        "__SIZEOF_LONG_DOUBLE__": "16",
-                        "__SIZEOF_LONG_LONG__": "8",
-                        "__SIZEOF_LONG__": "8",
-                        "__SIZEOF_POINTER__": "8",
-                        "__SIZEOF_PTRDIFF_T__": "8",
-                        "__SIZEOF_SHORT__": "2",
-                        "__SIZEOF_SIZE_T__": "8",
-                        "__SIZEOF_WCHAR_T__": "4",
-                        "__SIZEOF_WINT_T__": "4",
-                        "__SIZE_MAX__": "0xffffffffffffffffUL",
-                        "__SIZE_TYPE__": "long unsigned int",
-                        "__SIZE_WIDTH__": "64",
-                        "__SSE2_MATH__": "1",
-                        "__SSE2__": "1",
-                        "__SSE_MATH__": "1",
-                        "__SSE__": "1",
-                        "__STDC_HOSTED__": "1",
-                        "__STDC_IEC_559_COMPLEX__": "1",
-                        "__STDC_IEC_559__": "1",
-                        "__STDC_ISO_10646__": "201706L",
-                        "__STDC_UTF_16__": "1",
-                        "__STDC_UTF_32__": "1",
-                        "__UINT16_C(c)": "c",
-                        "__UINT16_MAX__": "0xffff",
-                        "__UINT16_TYPE__": "short unsigned int",
-                        "__UINT32_C(c)": "c ## U",
-                        "__UINT32_MAX__": "0xffffffffU",
-                        "__UINT32_TYPE__": "unsigned int",
-                        "__UINT64_C(c)": "c ## UL",
-                        "__UINT64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT64_TYPE__": "long unsigned int",
-                        "__UINT8_C(c)": "c",
-                        "__UINT8_MAX__": "0xff",
-                        "__UINT8_TYPE__": "unsigned char",
-                        "__UINTMAX_C(c)": "c ## UL",
-                        "__UINTMAX_MAX__": "0xffffffffffffffffUL",
-                        "__UINTMAX_TYPE__": "long unsigned int",
-                        "__UINTPTR_MAX__": "0xffffffffffffffffUL",
-                        "__UINTPTR_TYPE__": "long unsigned int",
-                        "__UINT_FAST16_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST16_TYPE__": "long unsigned int",
-                        "__UINT_FAST32_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST32_TYPE__": "long unsigned int",
-                        "__UINT_FAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST64_TYPE__": "long unsigned int",
-                        "__UINT_FAST8_MAX__": "0xff",
-                        "__UINT_FAST8_TYPE__": "unsigned char",
-                        "__UINT_LEAST16_MAX__": "0xffff",
-                        "__UINT_LEAST16_TYPE__": "short unsigned int",
-                        "__UINT_LEAST32_MAX__": "0xffffffffU",
-                        "__UINT_LEAST32_TYPE__": "unsigned int",
-                        "__UINT_LEAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_LEAST64_TYPE__": "long unsigned int",
-                        "__UINT_LEAST8_MAX__": "0xff",
-                        "__UINT_LEAST8_TYPE__": "unsigned char",
-                        "__USER_LABEL_PREFIX__": "",
-                        "__WCHAR_MAX__": "0x7fffffff",
-                        "__WCHAR_MIN__": "(-__WCHAR_MAX__ - 1)",
-                        "__WCHAR_TYPE__": "int",
-                        "__WCHAR_WIDTH__": "32",
-                        "__WINT_MAX__": "0xffffffffU",
-                        "__WINT_MIN__": "0U",
-                        "__WINT_TYPE__": "unsigned int",
-                        "__WINT_WIDTH__": "32",
-                        "__amd64": "1",
-                        "__amd64__": "1",
-                        "__code_model_small__": "1",
-                        "__gnu_linux__": "1",
-                        "__k8": "1",
-                        "__k8__": "1",
-                        "__linux": "1",
-                        "__linux__": "1",
-                        "__unix": "1",
-                        "__unix__": "1",
-                        "__x86_64": "1",
-                        "__x86_64__": "1",
-                        "linux": "1",
-                        "unix": "1"
-                    },
-                    "sys_include_envvar": null,
-                    "sys_include_path": [
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include",
-                        "/usr/local/include",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed",
-                        "/usr/include/x86_64-linux-gnu",
-                        "/usr/include"
-                    ]
-                }
-            },
-            "language_c.command.#": "/usr/bin/gcc",
-            "language_c.info.#": "Using built-in specs.\nCOLLECT_GCC=/usr/bin/gcc\nCOLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/x86_64-pc-linux-gnu/9.3.0/lto-wrapper\nTarget: x86_64-pc-linux-gnu\nConfigured with: /tmp/gcc-9.3.0/configure --disable-bootstrap --enable-languages=c,c++,lto --prefix=/usr/local --program-suffix=-9.3\nThread model: posix\ngcc version 9.3.0 (GCC) \n",
-            "language_cxx": {
-                "emulated_compiler": "GNU",
-                "emulated_compiler_version": 90300,
-                "language_version": "Cpp14",
-                "native_compiler": "/usr/bin/g++",
-                "preprocessing": {
-                    "predefined_macros": {
-                        "_GNU_SOURCE": "1",
-                        "_LP64": "1",
-                        "_STDC_PREDEF_H": "1",
-                        "__ATOMIC_ACQUIRE": "2",
-                        "__ATOMIC_ACQ_REL": "4",
-                        "__ATOMIC_CONSUME": "1",
-                        "__ATOMIC_HLE_ACQUIRE": "65536",
-                        "__ATOMIC_HLE_RELEASE": "131072",
-                        "__ATOMIC_RELAXED": "0",
-                        "__ATOMIC_RELEASE": "3",
-                        "__ATOMIC_SEQ_CST": "5",
-                        "__BIGGEST_ALIGNMENT__": "16",
-                        "__BYTE_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__CHAR_BIT__": "8",
-                        "__DBL_DECIMAL_DIG__": "17",
-                        "__DBL_DENORM_MIN__": "double(4.94065645841246544176568792868221372e-324L)",
-                        "__DBL_DIG__": "15",
-                        "__DBL_EPSILON__": "double(2.22044604925031308084726333618164062e-16L)",
-                        "__DBL_HAS_DENORM__": "1",
-                        "__DBL_HAS_INFINITY__": "1",
-                        "__DBL_HAS_QUIET_NAN__": "1",
-                        "__DBL_MANT_DIG__": "53",
-                        "__DBL_MAX_10_EXP__": "308",
-                        "__DBL_MAX_EXP__": "1024",
-                        "__DBL_MAX__": "double(1.79769313486231570814527423731704357e+308L)",
-                        "__DBL_MIN_10_EXP__": "(-307)",
-                        "__DBL_MIN_EXP__": "(-1021)",
-                        "__DBL_MIN__": "double(2.22507385850720138309023271733240406e-308L)",
-                        "__DEC128_EPSILON__": "1E-33DL",
-                        "__DEC128_MANT_DIG__": "34",
-                        "__DEC128_MAX_EXP__": "6145",
-                        "__DEC128_MAX__": "9.999999999999999999999999999999999E6144DL",
-                        "__DEC128_MIN_EXP__": "(-6142)",
-                        "__DEC128_MIN__": "1E-6143DL",
-                        "__DEC128_SUBNORMAL_MIN__": "0.000000000000000000000000000000001E-6143DL",
-                        "__DEC32_EPSILON__": "1E-6DF",
-                        "__DEC32_MANT_DIG__": "7",
-                        "__DEC32_MAX_EXP__": "97",
-                        "__DEC32_MAX__": "9.999999E96DF",
-                        "__DEC32_MIN_EXP__": "(-94)",
-                        "__DEC32_MIN__": "1E-95DF",
-                        "__DEC32_SUBNORMAL_MIN__": "0.000001E-95DF",
-                        "__DEC64_EPSILON__": "1E-15DD",
-                        "__DEC64_MANT_DIG__": "16",
-                        "__DEC64_MAX_EXP__": "385",
-                        "__DEC64_MAX__": "9.999999999999999E384DD",
-                        "__DEC64_MIN_EXP__": "(-382)",
-                        "__DEC64_MIN__": "1E-383DD",
-                        "__DEC64_SUBNORMAL_MIN__": "0.000000000000001E-383DD",
-                        "__DECIMAL_BID_FORMAT__": "1",
-                        "__DECIMAL_DIG__": "21",
-                        "__DEC_EVAL_METHOD__": "2",
-                        "__DEPRECATED": "1",
-                        "__ELF__": "1",
-                        "__FINITE_MATH_ONLY__": "0",
-                        "__FLOAT_WORD_ORDER__": "__ORDER_LITTLE_ENDIAN__",
-                        "__FLT128_DECIMAL_DIG__": "36",
-                        "__FLT128_DENORM_MIN__": "6.47517511943802511092443895822764655e-4966F128",
-                        "__FLT128_DIG__": "33",
-                        "__FLT128_EPSILON__": "1.92592994438723585305597794258492732e-34F128",
-                        "__FLT128_HAS_DENORM__": "1",
-                        "__FLT128_HAS_INFINITY__": "1",
-                        "__FLT128_HAS_QUIET_NAN__": "1",
-                        "__FLT128_MANT_DIG__": "113",
-                        "__FLT128_MAX_10_EXP__": "4932",
-                        "__FLT128_MAX_EXP__": "16384",
-                        "__FLT128_MAX__": "1.18973149535723176508575932662800702e+4932F128",
-                        "__FLT128_MIN_10_EXP__": "(-4931)",
-                        "__FLT128_MIN_EXP__": "(-16381)",
-                        "__FLT128_MIN__": "3.36210314311209350626267781732175260e-4932F128",
-                        "__FLT32X_DECIMAL_DIG__": "17",
-                        "__FLT32X_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F32x",
-                        "__FLT32X_DIG__": "15",
-                        "__FLT32X_EPSILON__": "2.22044604925031308084726333618164062e-16F32x",
-                        "__FLT32X_HAS_DENORM__": "1",
-                        "__FLT32X_HAS_INFINITY__": "1",
-                        "__FLT32X_HAS_QUIET_NAN__": "1",
-                        "__FLT32X_MANT_DIG__": "53",
-                        "__FLT32X_MAX_10_EXP__": "308",
-                        "__FLT32X_MAX_EXP__": "1024",
-                        "__FLT32X_MAX__": "1.79769313486231570814527423731704357e+308F32x",
-                        "__FLT32X_MIN_10_EXP__": "(-307)",
-                        "__FLT32X_MIN_EXP__": "(-1021)",
-                        "__FLT32X_MIN__": "2.22507385850720138309023271733240406e-308F32x",
-                        "__FLT32_DECIMAL_DIG__": "9",
-                        "__FLT32_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F32",
-                        "__FLT32_DIG__": "6",
-                        "__FLT32_EPSILON__": "1.19209289550781250000000000000000000e-7F32",
-                        "__FLT32_HAS_DENORM__": "1",
-                        "__FLT32_HAS_INFINITY__": "1",
-                        "__FLT32_HAS_QUIET_NAN__": "1",
-                        "__FLT32_MANT_DIG__": "24",
-                        "__FLT32_MAX_10_EXP__": "38",
-                        "__FLT32_MAX_EXP__": "128",
-                        "__FLT32_MAX__": "3.40282346638528859811704183484516925e+38F32",
-                        "__FLT32_MIN_10_EXP__": "(-37)",
-                        "__FLT32_MIN_EXP__": "(-125)",
-                        "__FLT32_MIN__": "1.17549435082228750796873653722224568e-38F32",
-                        "__FLT64X_DECIMAL_DIG__": "21",
-                        "__FLT64X_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951F64x",
-                        "__FLT64X_DIG__": "18",
-                        "__FLT64X_EPSILON__": "1.08420217248550443400745280086994171e-19F64x",
-                        "__FLT64X_HAS_DENORM__": "1",
-                        "__FLT64X_HAS_INFINITY__": "1",
-                        "__FLT64X_HAS_QUIET_NAN__": "1",
-                        "__FLT64X_MANT_DIG__": "64",
-                        "__FLT64X_MAX_10_EXP__": "4932",
-                        "__FLT64X_MAX_EXP__": "16384",
-                        "__FLT64X_MAX__": "1.18973149535723176502126385303097021e+4932F64x",
-                        "__FLT64X_MIN_10_EXP__": "(-4931)",
-                        "__FLT64X_MIN_EXP__": "(-16381)",
-                        "__FLT64X_MIN__": "3.36210314311209350626267781732175260e-4932F64x",
-                        "__FLT64_DECIMAL_DIG__": "17",
-                        "__FLT64_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F64",
-                        "__FLT64_DIG__": "15",
-                        "__FLT64_EPSILON__": "2.22044604925031308084726333618164062e-16F64",
-                        "__FLT64_HAS_DENORM__": "1",
-                        "__FLT64_HAS_INFINITY__": "1",
-                        "__FLT64_HAS_QUIET_NAN__": "1",
-                        "__FLT64_MANT_DIG__": "53",
-                        "__FLT64_MAX_10_EXP__": "308",
-                        "__FLT64_MAX_EXP__": "1024",
-                        "__FLT64_MAX__": "1.79769313486231570814527423731704357e+308F64",
-                        "__FLT64_MIN_10_EXP__": "(-307)",
-                        "__FLT64_MIN_EXP__": "(-1021)",
-                        "__FLT64_MIN__": "2.22507385850720138309023271733240406e-308F64",
-                        "__FLT_DECIMAL_DIG__": "9",
-                        "__FLT_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F",
-                        "__FLT_DIG__": "6",
-                        "__FLT_EPSILON__": "1.19209289550781250000000000000000000e-7F",
-                        "__FLT_EVAL_METHOD_TS_18661_3__": "0",
-                        "__FLT_EVAL_METHOD__": "0",
-                        "__FLT_HAS_DENORM__": "1",
-                        "__FLT_HAS_INFINITY__": "1",
-                        "__FLT_HAS_QUIET_NAN__": "1",
-                        "__FLT_MANT_DIG__": "24",
-                        "__FLT_MAX_10_EXP__": "38",
-                        "__FLT_MAX_EXP__": "128",
-                        "__FLT_MAX__": "3.40282346638528859811704183484516925e+38F",
-                        "__FLT_MIN_10_EXP__": "(-37)",
-                        "__FLT_MIN_EXP__": "(-125)",
-                        "__FLT_MIN__": "1.17549435082228750796873653722224568e-38F",
-                        "__FLT_RADIX__": "2",
-                        "__FXSR__": "1",
-                        "__GCC_ASM_FLAG_OUTPUTS__": "1",
-                        "__GCC_ATOMIC_BOOL_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR16_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR32_T_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_CHAR_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_INT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LLONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_LONG_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_POINTER_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_SHORT_LOCK_FREE": "2",
-                        "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL": "1",
-                        "__GCC_ATOMIC_WCHAR_T_LOCK_FREE": "2",
-                        "__GCC_HAVE_DWARF2_CFI_ASM": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4": "1",
-                        "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8": "1",
-                        "__GCC_IEC_559": "2",
-                        "__GCC_IEC_559_COMPLEX": "2",
-                        "__GLIBCXX_BITSIZE_INT_N_0": "128",
-                        "__GLIBCXX_TYPE_INT_N_0": "__int128",
-                        "__GXX_ABI_VERSION": "1013",
-                        "__GXX_WEAK__": "1",
-                        "__HAVE_SPECULATION_SAFE_VALUE": "1",
-                        "__INT16_C(c)": "c",
-                        "__INT16_MAX__": "0x7fff",
-                        "__INT16_TYPE__": "short int",
-                        "__INT32_C(c)": "c",
-                        "__INT32_MAX__": "0x7fffffff",
-                        "__INT32_TYPE__": "int",
-                        "__INT64_C(c)": "c ## L",
-                        "__INT64_MAX__": "0x7fffffffffffffffL",
-                        "__INT64_TYPE__": "long int",
-                        "__INT8_C(c)": "c",
-                        "__INT8_MAX__": "0x7f",
-                        "__INT8_TYPE__": "signed char",
-                        "__INTMAX_C(c)": "c ## L",
-                        "__INTMAX_MAX__": "0x7fffffffffffffffL",
-                        "__INTMAX_TYPE__": "long int",
-                        "__INTMAX_WIDTH__": "64",
-                        "__INTPTR_MAX__": "0x7fffffffffffffffL",
-                        "__INTPTR_TYPE__": "long int",
-                        "__INTPTR_WIDTH__": "64",
-                        "__INT_FAST16_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST16_TYPE__": "long int",
-                        "__INT_FAST16_WIDTH__": "64",
-                        "__INT_FAST32_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST32_TYPE__": "long int",
-                        "__INT_FAST32_WIDTH__": "64",
-                        "__INT_FAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_FAST64_TYPE__": "long int",
-                        "__INT_FAST64_WIDTH__": "64",
-                        "__INT_FAST8_MAX__": "0x7f",
-                        "__INT_FAST8_TYPE__": "signed char",
-                        "__INT_FAST8_WIDTH__": "8",
-                        "__INT_LEAST16_MAX__": "0x7fff",
-                        "__INT_LEAST16_TYPE__": "short int",
-                        "__INT_LEAST16_WIDTH__": "16",
-                        "__INT_LEAST32_MAX__": "0x7fffffff",
-                        "__INT_LEAST32_TYPE__": "int",
-                        "__INT_LEAST32_WIDTH__": "32",
-                        "__INT_LEAST64_MAX__": "0x7fffffffffffffffL",
-                        "__INT_LEAST64_TYPE__": "long int",
-                        "__INT_LEAST64_WIDTH__": "64",
-                        "__INT_LEAST8_MAX__": "0x7f",
-                        "__INT_LEAST8_TYPE__": "signed char",
-                        "__INT_LEAST8_WIDTH__": "8",
-                        "__INT_MAX__": "0x7fffffff",
-                        "__INT_WIDTH__": "32",
-                        "__LDBL_DECIMAL_DIG__": "21",
-                        "__LDBL_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951L",
-                        "__LDBL_DIG__": "18",
-                        "__LDBL_EPSILON__": "1.08420217248550443400745280086994171e-19L",
-                        "__LDBL_HAS_DENORM__": "1",
-                        "__LDBL_HAS_INFINITY__": "1",
-                        "__LDBL_HAS_QUIET_NAN__": "1",
-                        "__LDBL_MANT_DIG__": "64",
-                        "__LDBL_MAX_10_EXP__": "4932",
-                        "__LDBL_MAX_EXP__": "16384",
-                        "__LDBL_MAX__": "1.18973149535723176502126385303097021e+4932L",
-                        "__LDBL_MIN_10_EXP__": "(-4931)",
-                        "__LDBL_MIN_EXP__": "(-16381)",
-                        "__LDBL_MIN__": "3.36210314311209350626267781732175260e-4932L",
-                        "__LONG_LONG_MAX__": "0x7fffffffffffffffLL",
-                        "__LONG_LONG_WIDTH__": "64",
-                        "__LONG_MAX__": "0x7fffffffffffffffL",
-                        "__LONG_WIDTH__": "64",
-                        "__LP64__": "1",
-                        "__MMX__": "1",
-                        "__NO_INLINE__": "1",
-                        "__ORDER_BIG_ENDIAN__": "4321",
-                        "__ORDER_LITTLE_ENDIAN__": "1234",
-                        "__ORDER_PDP_ENDIAN__": "3412",
-                        "__PRAGMA_REDEFINE_EXTNAME": "1",
-                        "__PTRDIFF_MAX__": "0x7fffffffffffffffL",
-                        "__PTRDIFF_TYPE__": "long int",
-                        "__PTRDIFF_WIDTH__": "64",
-                        "__REGISTER_PREFIX__": "",
-                        "__SCHAR_MAX__": "0x7f",
-                        "__SCHAR_WIDTH__": "8",
-                        "__SEG_FS": "1",
-                        "__SEG_GS": "1",
-                        "__SHRT_MAX__": "0x7fff",
-                        "__SHRT_WIDTH__": "16",
-                        "__SIG_ATOMIC_MAX__": "0x7fffffff",
-                        "__SIG_ATOMIC_MIN__": "(-__SIG_ATOMIC_MAX__ - 1)",
-                        "__SIG_ATOMIC_TYPE__": "int",
-                        "__SIG_ATOMIC_WIDTH__": "32",
-                        "__SIZEOF_DOUBLE__": "8",
-                        "__SIZEOF_FLOAT128__": "16",
-                        "__SIZEOF_FLOAT80__": "16",
-                        "__SIZEOF_FLOAT__": "4",
-                        "__SIZEOF_INT128__": "16",
-                        "__SIZEOF_INT__": "4",
-                        "__SIZEOF_LONG_DOUBLE__": "16",
-                        "__SIZEOF_LONG_LONG__": "8",
-                        "__SIZEOF_LONG__": "8",
-                        "__SIZEOF_POINTER__": "8",
-                        "__SIZEOF_PTRDIFF_T__": "8",
-                        "__SIZEOF_SHORT__": "2",
-                        "__SIZEOF_SIZE_T__": "8",
-                        "__SIZEOF_WCHAR_T__": "4",
-                        "__SIZEOF_WINT_T__": "4",
-                        "__SIZE_MAX__": "0xffffffffffffffffUL",
-                        "__SIZE_TYPE__": "long unsigned int",
-                        "__SIZE_WIDTH__": "64",
-                        "__SSE2_MATH__": "1",
-                        "__SSE2__": "1",
-                        "__SSE_MATH__": "1",
-                        "__SSE__": "1",
-                        "__STDC_HOSTED__": "1",
-                        "__STDC_IEC_559_COMPLEX__": "1",
-                        "__STDC_IEC_559__": "1",
-                        "__STDC_ISO_10646__": "201706L",
-                        "__STDC_UTF_16__": "1",
-                        "__STDC_UTF_32__": "1",
-                        "__UINT16_C(c)": "c",
-                        "__UINT16_MAX__": "0xffff",
-                        "__UINT16_TYPE__": "short unsigned int",
-                        "__UINT32_C(c)": "c ## U",
-                        "__UINT32_MAX__": "0xffffffffU",
-                        "__UINT32_TYPE__": "unsigned int",
-                        "__UINT64_C(c)": "c ## UL",
-                        "__UINT64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT64_TYPE__": "long unsigned int",
-                        "__UINT8_C(c)": "c",
-                        "__UINT8_MAX__": "0xff",
-                        "__UINT8_TYPE__": "unsigned char",
-                        "__UINTMAX_C(c)": "c ## UL",
-                        "__UINTMAX_MAX__": "0xffffffffffffffffUL",
-                        "__UINTMAX_TYPE__": "long unsigned int",
-                        "__UINTPTR_MAX__": "0xffffffffffffffffUL",
-                        "__UINTPTR_TYPE__": "long unsigned int",
-                        "__UINT_FAST16_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST16_TYPE__": "long unsigned int",
-                        "__UINT_FAST32_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST32_TYPE__": "long unsigned int",
-                        "__UINT_FAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_FAST64_TYPE__": "long unsigned int",
-                        "__UINT_FAST8_MAX__": "0xff",
-                        "__UINT_FAST8_TYPE__": "unsigned char",
-                        "__UINT_LEAST16_MAX__": "0xffff",
-                        "__UINT_LEAST16_TYPE__": "short unsigned int",
-                        "__UINT_LEAST32_MAX__": "0xffffffffU",
-                        "__UINT_LEAST32_TYPE__": "unsigned int",
-                        "__UINT_LEAST64_MAX__": "0xffffffffffffffffUL",
-                        "__UINT_LEAST64_TYPE__": "long unsigned int",
-                        "__UINT_LEAST8_MAX__": "0xff",
-                        "__UINT_LEAST8_TYPE__": "unsigned char",
-                        "__USER_LABEL_PREFIX__": "",
-                        "__WCHAR_MAX__": "0x7fffffff",
-                        "__WCHAR_MIN__": "(-__WCHAR_MAX__ - 1)",
-                        "__WCHAR_TYPE__": "int",
-                        "__WCHAR_WIDTH__": "32",
-                        "__WINT_MAX__": "0xffffffffU",
-                        "__WINT_MIN__": "0U",
-                        "__WINT_TYPE__": "unsigned int",
-                        "__WINT_WIDTH__": "32",
-                        "__amd64": "1",
-                        "__amd64__": "1",
-                        "__code_model_small__": "1",
-                        "__gnu_linux__": "1",
-                        "__k8": "1",
-                        "__k8__": "1",
-                        "__linux": "1",
-                        "__linux__": "1",
-                        "__unix": "1",
-                        "__unix__": "1",
-                        "__x86_64": "1",
-                        "__x86_64__": "1",
-                        "linux": "1",
-                        "unix": "1"
-                    },
-                    "sys_include_envvar": null,
-                    "sys_include_path": [
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0/x86_64-pc-linux-gnu",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0/backward",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include",
-                        "/usr/local/include",
-                        "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed",
-                        "/usr/include/x86_64-linux-gnu",
-                        "/usr/include"
-                    ]
-                }
-            },
-            "language_cxx.command.#": "/usr/bin/g++",
-            "language_cxx.info.#": "Using built-in specs.\nCOLLECT_GCC=/usr/bin/g++\nCOLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/x86_64-pc-linux-gnu/9.3.0/lto-wrapper\nTarget: x86_64-pc-linux-gnu\nConfigured with: /tmp/gcc-9.3.0/configure --disable-bootstrap --enable-languages=c,c++,lto --prefix=/usr/local --program-suffix=-9.3\nThread model: posix\ngcc version 9.3.0 (GCC) \n",
-            "linker": {
-                "library_path": [
-                    "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/",
-                    "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../lib64/",
-                    "/lib/x86_64-linux-gnu/",
-                    "/lib/../lib64/",
-                    "/usr/lib/x86_64-linux-gnu/",
-                    "/usr/lib/../lib64/",
-                    "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../",
-                    "/lib/",
-                    "/usr/lib/"
-                ]
-            },
-            "types": {
-                "char16_t_type": "unsigned short",
-                "char32_t_type": "unsigned int",
-                "char_bits": 8,
-                "double_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "float_type": {
-                    "alignof": 4,
-                    "sizeof": 4
-                },
-                "int_type": {
-                    "alignof": 4,
-                    "sizeof": 4
-                },
-                "long_double_type": {
-                    "alignof": 16,
-                    "sizeof": 16
-                },
-                "long_long_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "long_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "pointer_type": {
-                    "alignof": 8,
-                    "sizeof": 8
-                },
-                "ptrdiff_t_type": "signed long",
-                "short_type": {
-                    "alignof": 2,
-                    "sizeof": 2
-                },
-                "size_t_type": "unsigned long",
-                "wchar_t_type": "signed int",
-                "wint_t_type": "unsigned int"
-            }
-        }
-    },
-    "_Format": "1.0",
-    "_Version": "7.5.0",
-    "_VersionNum": [
-        7,
-        5,
-        0,
-        11376
-    ]
-}
-

coin/provisioning/common/linux/axivion/post_processing.py

@@ -1,34 +0,0 @@
-#Copyright (C) 2024 The Qt Company Ltd
-#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-import re
-
-import axivion.config
-from axivion.analysis.post_processing import FilterAction
-from bauhaus import ir
-
-analysis = axivion.config.get_analysis()
-
-qt_inline_pattern = re.compile(r"QT_.*_INLINE(_IMPL)?_SINCE\(\d+,\d+\)")
-def exclude_inlined_by_qt_inline_macro(sv, ir_graph):
-    node = ir_graph.get_node(ir.Physical, sv.primary_sloc.pir_node_number)
-
-    # we have to check on the token stream as the macro might expand to nothing
-    # -> only the invocation is in the IR, but not in the AST of the routine decl / def
-    preceeding_string = ""
-
-    token = node.Token
-    while True:
-        try:
-            token_value = re.sub('^#\\s+', '#', token.Value)
-            if token_value in {';', '{', '}', '#define'}:
-                break
-            preceeding_string = token.Value + preceeding_string
-            token = token.prev()
-        except StopIteration:
-            break
-    if re.match(qt_inline_pattern, preceeding_string):
-        return FilterAction.exclude
-    return FilterAction.normal
-
-analysis['Qt-Generic-NoFunctionDefinitionInHeader'].post_processing.add_filter(exclude_inlined_by_qt_inline_macro, inputs=[ir.Graph])

coin/provisioning/common/linux/axivion/rule_config.json

@@ -1,210 +0,0 @@
-{
-    "Analysis": {
-        "CloneDetection": {
-            "_active": true,
-            "excludes": [
-                "$(splitpath:EXCLUDE_FILES)"
-            ]
-        },
-        "Frameworks-QtSupport": {
-            "_active": true,
-            "exclude_qt_generated_files": true,
-            "qtdir": "/home/qt/work/install"
-        },
-        "Qt-AutoUnexpectedQStringbuilder": {
-            "_active": true
-        },
-        "Qt-BaseClassEvent": {
-            "_active": true
-        },
-        "Qt-ChildEventQObjectCast": {
-            "_active": true
-        },
-        "Qt-Connect3argLambda": {
-            "_active": true
-        },
-        "Qt-ConnectByName": {
-            "_active": true
-        },
-        "Qt-ConnectNonSignal": {
-            "_active": true
-        },
-        "Qt-ConstSignalOrSlot": {
-            "_active": true
-        },
-        "Qt-CtorMissingParentArgument": {
-            "_active": true
-        },
-        "Qt-DetachingTemporary": {
-            "_active": true
-        },
-        "Qt-FullyQualifiedMocTypes": {
-            "_active": true
-        },
-        "Qt-FunctionArgsByValueRef": {
-            "_active": true
-        },
-        "Qt-Generic-DuplicateIncludeGuard": {
-            "_active": true
-        },
-        "Qt-Generic-FormatSpecifier": {
-            "_active": true
-        },
-        "Qt-Generic-InitializeAllFieldsInConstructor": {
-            "_active": true
-        },
-        "Qt-Generic-MissingBaseCopy": {
-            "_active": true
-        },
-        "Qt-Generic-MissingIncludeGuard": {
-            "_active": true
-        },
-        "Qt-Generic-NoAbsoluteInclude": {
-            "_active": true
-        },
-        "Qt-Generic-NoFunctionDefinitionInHeader": {
-            "_active": true
-        },
-        "Qt-Generic-NoIrregularInclude": {
-            "_active": true
-        },
-        "Qt-Generic-NoMixOfClassStruct": {
-            "_active": true
-        },
-        "Qt-Generic-NoOverloadedOperators": {
-            "_active": true
-        },
-        "Qt-Generic-NoReferenceToLocalVariable": {
-            "_active": true
-        },
-        "Qt-Generic-QNetworkReplyDeleteLater": {
-            "_active": true
-        },
-        "Qt-Generic-ThrowByValueCatchByReference": {
-            "_active": true
-        },
-        "Qt-Generic-TypedefCheck": {
-            "_active": true
-        },
-        "Qt-Generic-WrongIncludeCasing": {
-            "_active": true
-        },
-        "Qt-GlobalConstCharPointer": {
-            "_active": true
-        },
-        "Qt-IncorrectEmit": {
-            "_active": true
-        },
-        "Qt-InstallEventFilter": {
-            "_active": true
-        },
-        "Qt-LambdaInConnect": {
-            "_active": true
-        },
-        "Qt-LambdaUniqueConnection": {
-            "_active": true
-        },
-        "Qt-LowercaseQmlTypeName": {
-            "_active": true
-        },
-        "Qt-MissingQObjectMacro": {
-            "_active": true
-        },
-        "Qt-MutableContainerKey": {
-            "_active": true
-        },
-        "Qt-NonPodGlobalStatic": {
-            "_active": true
-        },
-        "Qt-OldStyleConnect": {
-            "_active": true
-        },
-        "Qt-OverloadedSignal": {
-            "_active": true
-        },
-        "Qt-OverriddenSignal": {
-            "_active": true
-        },
-        "Qt-PostEvent": {
-            "_active": true
-        },
-        "Qt-QDateTimeUTC": {
-            "_active": true
-        },
-        "Qt-QEnums": {
-            "_active": true
-        },
-        "Qt-QLatin1StringNonAscii": {
-            "_active": true
-        },
-        "Qt-QMapWithPointerKey": {
-            "_active": true
-        },
-        "Qt-QPropertyWithoutNotify": {
-            "_active": true
-        },
-        "Qt-QStringArg": {
-            "_active": true
-        },
-        "Qt-QStringComparisonToImplicitChar": {
-            "_active": true
-        },
-        "Qt-QhashNamespace": {
-            "_active": true
-        },
-        "Qt-QtMacros": {
-            "_active": true
-        },
-        "Qt-RangeLoopDetach": {
-            "_active": false
-        },
-        "Qt-RangeLoopReference": {
-            "_active": true
-        },
-        "Qt-ReturningDataFromTemporary": {
-            "_active": true
-        },
-        "Qt-RuleOfThree": {
-            "_active": true
-        },
-        "Qt-RuleOfTwoSoft": {
-            "_active": true
-        },
-        "Qt-SkippedBaseMethod": {
-            "_active": true
-        },
-        "Qt-StrictIterators": {
-            "_active": true
-        },
-        "Qt-TemporaryIterator": {
-            "_active": true
-        },
-        "Qt-UnusedNonTrivialVariable": {
-            "_active": true
-        },
-        "Qt-VirtualSignal": {
-            "_active": true
-        },
-        "Qt-WritingToTemporary": {
-            "_active": true
-        },
-        "Qt-WrongQEventCast": {
-            "_active": true
-        },
-        "Qt-WrongQGlobalStatic": {
-            "_active": true
-        },
-        "Stylechecks": {
-            "excludes": [
-                "$(splitpath:EXCLUDE_FILES)"
-            ]
-        }
-    },
-    "_Format": "1.0",
-    "_VersionNum": [
-        7,
-        8,
-        0,
-        15004
-    ]
-}

coin/provisioning/common/linux/axivion/start_analysis.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-#Copyright (C) 2024 The Qt Company Ltd
-#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-$HOME/bauhaus-suite/setup.sh --non-interactive
-export PATH=/home/qt/bauhaus-suite/bin:$PATH
-export BAUHAUS_CONFIG=$(cd $(dirname $(readlink -f $0)) && pwd)
-export AXIVION_VERSION_NAME=$(git rev-parse HEAD)
-export EXCLUDE_FILES="build/*:src/3rdparty/*"
-export MODULE=$TESTED_MODULE_COIN
-export PACKAGE="Add-ons"
-export IRNAME=build/$TESTED_MODULE_COIN.ir
-axivion_ci "$@"

coin/provisioning/common/linux/cmake_linux.sh

@@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.30"
-version="3.30.5"
+majorminorversion="3.27"
+version="3.27.7"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
-SHA1="61b339cac5f110d5ed2934f66a26c2e991945e01"
+SHA1="83ab00c8432a71cfc81e933ee7b3c3e14d50ad6f"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-linux-x86_64"
 

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

@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-# This script will install go 1.22.4
-version="1.22.4"
-
-uname_m="$(uname -m)"
-case "$uname_m" in
-    x86_64|amd64)
-        sha256="ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d"
-        pkgname="go$version.linux-amd64.tar.gz"
-        dirname="go$version.linux-amd64"
-        ;;
-    arm64|aarch64)
-        sha256="a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771"
-        pkgname="go$version.linux-arm64.tar.gz"
-        dirname="go$version.linux-arm64"
-        ;;
-    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
-esac
-
-internalUrl="http://ci-files01-hki.ci.qt.io/input/go/linux/$pkgname"
-externalUrl="https://go.dev/dl/$pkgname"
-
-targetFile="$HOME/$pkgname"
-DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile"
-echo "Installing Go"
-tar -xzf "$targetFile" -C "$HOME"
-rm "$targetFile"
-
-installPrefix="/opt/$dirname"
-sudo mv "$HOME/go" "$installPrefix"
-
-SetEnvVar "PATH" "$installPrefix/bin:\$PATH"
-
-echo "Go = $version" >> ~/versions.txt

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

@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-# This script will install ninja
-version="1.12.1"
-
-uname_m="$(uname -m)"
-case "$uname_m" in
-    x86_64|amd64)
-        sha256="6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255"
-        pkgname="ninja-$version-linux-x64.zip"
-        dirname="ninja-$version-linux-x64"
-        ;;
-    arm64|aarch64)
-        sha256="5c25c6570b0155e95fce5918cb95f1ad9870df5768653afe128db822301a05a1"
-        pkgname="ninja-$version-linux-arm64.zip"
-        dirname="ninja-$version-linux-arm64"
-        ;;
-    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
-esac
-
-internalUrl="http://ci-files01-hki.ci.qt.io/input/ninja/$pkgname"
-externalUrl="https://github.com/ninja-build/ninja/releases/download/v$version/$pkgname"
-
-targetFile="$HOME/$pkgname"
-DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile"
-echo "Installing ninja ${version}"
-sudo unzip -o -q ${targetFile} -d "${HOME}/${dirname}"
-rm "$targetFile"
-
-installPrefix="/opt/$dirname"
-sudo mv "$HOME/$dirname" "$installPrefix"
-
-SetEnvVar "PATH" "$installPrefix:\$PATH"
-
-echo "ninja = $version" >> ~/versions.txt

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

@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-# This script will install UPX 4.2.4
-version="4.2.4"
-
-uname_m="$(uname -m)"
-case "$uname_m" in
-    x86_64|amd64)
-        sha256="75cab4e57ab72fb4585ee45ff36388d280c7afd72aa03e8d4b9c3cbddb474193"
-        pkgname="upx-$version-amd64_linux.tar.xz"
-        dirname="upx-$version-amd64_linux"
-        ;;
-    arm64|aarch64)
-        sha256="6bfeae6714e34a82e63245289888719c41fd6af29f749a44ae3d3d166ba6a1c9"
-        pkgname="upx-$version-arm64_linux.tar.xz"
-        dirname="upx-$version-arm64_linux"
-        ;;
-    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
-esac
-
-internalUrl="http://ci-files01-hki.ci.qt.io/input/upx/linux/$pkgname"
-externalUrl="https://github.com/upx/upx/releases/download/v$version/$pkgname"
-
-targetFile="$HOME/$pkgname"
-DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile"
-echo "Installing UPX"
-tar -xJf "$targetFile" -C "$HOME"
-rm "$targetFile"
-
-installPrefix="/opt/$dirname"
-sudo mv "$HOME/$dirname" "$installPrefix"
-
-SetEnvVar "PATH" "$installPrefix:\$PATH"
-
-echo "UPX = $version" >> ~/versions.txt

coin/provisioning/common/linux/install-vivid-camera.sh

@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -ex
-
-systemd_folder=/etc/systemd/system
-systemd_file=vivid.service
-script_folder=/home/qt/bin
-script_file=vivid.sh
-
-# Ensure that script folder exists
-if [ ! -d ${script_folder} ]; then
-    sudo mkdir ${script_folder}
-    sudo chmod 750 ${script_folder}
-fi
-
-# Create script to install virtual video test driver module
-sudo tee "${script_folder}/${script_file}" <<"EOF"
-# load vivid
-sudo modprobe vivid n_devs=2 # create two video devices
-
-# Check result
-if lsmod | grep -q vivid
-then
-    echo "(**) Virtual video test driver vivid installed.";
-else
-    echo "(EE) Failed to load vivid driver.";
-    exit 1;
-fi
-EOF
-
-# set permissions
-sudo chmod 750 "${script_folder}/${script_file}"
-
-# Create service file
-sudo tee "${systemd_folder}/${systemd_file}" <<"EOF"
-# /etc/systemd/system/vivid.service
-#
-
-[Unit]
-Description=Install virtual video test driver (vivid)
-
-[Service]
-Type=oneshot
-ExecStart=/bin/sh -c "/home/qt/bin/vivid.sh"
-
-[Install]
-WantedBy=multi-user.target
-EOF
-
-# Start service and output result, just for logging
-sudo systemctl start vivid.service
-
-# enable service
-sudo systemctl enable vivid.service

coin/provisioning/common/macos/android.sh

@@ -20,11 +20,11 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersionLatest="r27c"
+ndkVersionLatest="r26b"
 ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 

coin/provisioning/common/macos/cmake.sh

@@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.30.5"
-version="3.30.5"
+majorminorversion="3.27.7"
+version="3.27.7"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
-SHA1="c81c2f7482a901c4a32a81034920c23c22233a0f"
+SHA1="75153b6c7a418bc7120c6217d4698c7d245d00e0"
 appPrefix="cmake-$version-macos-universal"
 
 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

coin/provisioning/common/macos/enable_vnc.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-
-# This script enables remote management vnc
-set -ex
-
-sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes

coin/provisioning/common/macos/install-simulator-runtime.sh

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-set -ex
-
-function InstallSimulatorRuntime {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    packageName=$4
-    version=$5
-
-    DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
-    echo "Installing"
-    # macOS 14 / Xcode 15 has a different install command
-    if [[ $OSTYPE == "darwin23" ]]; then
-        xcrun simctl runtime add "/tmp/$packageName"
-    else
-        xcodebuild -importPlatform "/tmp/$packageName"
-    fi
-
-    echo "Simulator Runtime = $version" >> ~/versions.txt
-}

coin/provisioning/common/macos/java.sh

@@ -1,20 +1,17 @@
 #!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
+# Copyright (C) 2021 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # This script installs JDK
 
 set -ex
 
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
 echo "Installing Java Development Kit"
-version=17.0.12
-targetFile=jdk-${version}_macos-x64_bin.dmg
-expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb"
+version=11.0.12
+targetFile=jdk-${version}_osx-x64_bin.dmg
 
 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac
+# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -22,8 +19,6 @@ sudo mount -o locallocks "$url" /Volumes/files
 
 sudo cp "/Volumes/files/$targetFile" /tmp
 sudo umount /Volumes/files
-cd /tmp
-VerifyHash "$targetFile" "$expectedHash"
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK

coin/provisioning/common/macos/java_arm.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
+# Copyright (C) 2021 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # This script installs JDK
@@ -8,10 +8,10 @@ set -ex
 
 echo "Installing Java Development Kit"
 
-targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
 
 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK
-cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
+cd /Volumes/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target /
 
 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
+sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force
 
 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
 
-echo "JDK Version = 17.0.13" >> ~/versions.txt
+echo "JDK Version = 15.0.2" >> ~/versions.txt

coin/provisioning/common/macos/libiodbc.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2018 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # Install libiodbc
@@ -11,9 +11,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
 
+# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
+
 read -r -a arr <<< "$(brew list --versions libiodbc)"
 version=${arr[1]}
 
-SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)"
+SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
+SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
 
 echo "libiodbc = $version" >> ~/versions.txt

coin/provisioning/common/macos/postgresql.sh

@@ -37,5 +37,5 @@ umount "$mountpoint"
 echo "Removing $packageName"
 rm "/tmp/$packageName"
 
-SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/$psqlVersion"
+SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin"
 echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt

coin/provisioning/common/macos/python3.sh

@@ -30,7 +30,6 @@ echo "Configure pip"
 
 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
 
 # Install Python certificates. Required at least for emsdk installation
 open /Applications/Python\ 3.9/Install\ Certificates.command

coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake

@@ -24,6 +24,5 @@ set(CMAKE_CXX_COMPILER q++)
 set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
 
 set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoaarch64-strip)
-set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntoaarch64-ar)
 
 set(CMAKE_SYSROOT $ENV{QNX_TARGET})

coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake

@@ -24,6 +24,5 @@ set(CMAKE_CXX_COMPILER q++)
 set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
 
 set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoarmv7-strip)
-set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntoarmv7-ar)
 
 set(CMAKE_SYSROOT $ENV{QNX_TARGET})

coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake

@@ -24,6 +24,5 @@ set(CMAKE_CXX_COMPILER q++)
 set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
 
 set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntox86_64-strip)
-set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntox86_64-ar)
 
 set(CMAKE_SYSROOT $ENV{QNX_TARGET})

coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh

@@ -8,10 +8,10 @@ lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"
 
-if [ "$(uname -s)" = "Darwin" ]; then
-    # Under Homebrew, binutils package is not symlinked into PATH.
-    # This lets us use readelf provided by Homebrew.
-    readelf() { "$(brew --prefix binutils)/bin/readelf" "$@"; }
+if uname -a |grep -q "Darwin"; then
+    readelf() {
+        /usr/local/opt/binutils/bin/readelf "$@"
+    }
 fi
 
 ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")

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

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.1"
+version="n7.0.2"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -57,8 +57,8 @@ build_ffmpeg_android() {
     libs_prefix="_arm64-v8a"
   fi
 
-  ln -Ffs "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so"
-  ln -Ffs "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so"
+  ln -s "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so"
+  ln -s "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so"
 
   api_version=24
 
@@ -95,8 +95,6 @@ build_ffmpeg_android() {
 
   sudo make install -j4
 
-  popd
-
   rm -f "${openssl_libs}/libcrypto.so"
   rm -f "${openssl_libs}/libssl.so"
 
@@ -104,6 +102,8 @@ build_ffmpeg_android() {
       fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
       sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no"
   fi
+
+  popd
 }
 
 if  [ "$os" == "android-x86" ]; then

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

@@ -10,9 +10,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.1"
+version="n7.0.2"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -28,48 +28,48 @@ fi
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
 
 build_ffmpeg_ios() {
-    local target_platform=$1
-    local target_cpu_arch=""
-    if [ "$target_platform" == "arm64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_cpu_arch="arm64"
-        minos="-mios-simulator-version-min=16.0"
-    elif [ "$target_platform" == "x86_64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_cpu_arch="x86_64"
-        minos="-mios-simulator-version-min=16.0"
-    elif [ "$target_platform" == "arm64-iphoneos" ]; then
-        target_sdk="iphoneos"
-        target_cpu_arch="arm64"
-        minos="-miphoneos-version-min=16.0"
-    else
-        echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'"
-        exit 1
-    fi
+  local target_arch=$1
 
-    local build_dir="$ffmpeg_source_dir/build_ios/$target_platform"
-    sudo mkdir -p "$build_dir"
-    pushd "$build_dir"
+  if [ "$target_arch" == "x86_64" ]; then
+     target_sdk="iphonesimulator"
+     target_arch="x86_64"
+     minos="-mios-simulator-version-min=13.0"
+  else
+     target_sdk="iphoneos"
+     target_arch="arm64"
+     minos="-miphoneos-version-min=13.0"
+  fi
 
-    # shellcheck disable=SC2086
-    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
+  local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
+  sudo mkdir -p "$build_dir"
+  pushd "$build_dir"
+
+  # shellcheck disable=SC2086
+  sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
     --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-    --enable-cross-compile \
-    --enable-optimizations \
-    --prefix=$prefix \
-    --arch=$target_cpu_arch \
-    --cc="xcrun --sdk ${target_sdk} clang -arch $target_cpu_arch" \
-    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_cpu_arch" \
-    --target-os=darwin \
-    --extra-ldflags="$minos" \
-    --enable-cross-compile \
-    --enable-shared \
-    --disable-static \
-    --install-name-dir='@rpath' \
-    --disable-audiotoolbox
+  --enable-cross-compile \
+  --enable-optimizations \
+  --prefix=$prefix \
+  --arch=$target_arch \
+  --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
+  --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
+  --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
+  --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
+  --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
+  --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
+  --target-os=darwin \
+  --extra-cflags="$minos" \
+  --extra-cxxflags="$minos" \
+  --enable-cross-compile \
+  --enable-shared \
+  --disable-static \
+  --install-name-dir='@rpath/Frameworks' \
+  --enable-swscale \
+  --enable-pthreads \
+  --disable-audiotoolbox
 
-    sudo make install DESTDIR="$build_dir/installed" -j4
-    popd
+  sudo make install DESTDIR="$build_dir/installed" -j
+  popd
 }
 
 install_ffmpeg() {
@@ -98,110 +98,11 @@ install_ffmpeg() {
         popd >/dev/null
     done
     sudo cp -r $1$prefix/include $prefix
+    echo "LS done."
 }
 
-build_info_plist() {
-    local file_path="$1"
-    local framework_name="$2"
-    local framework_id="$3"
-
-    local minimum_version_key="MinimumOSVersion"
-    local minimum_os_version="16.0"
-    local supported_platforms="iPhoneOS"
-
-    # TODO: This should be filled out with the actual version of FFmpeg that we are
-    # deploying.
-    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>CFBundleExecutable</key>
-    <string>${framework_name}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${framework_id}</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>${framework_name}</string>
-    <key>CFBundlePackageType</key>
-    <string>FMWK</string>
-    <key>CFBundleShortVersionString</key>
-    <string>7.0.2</string>
-    <key>CFBundleVersion</key>
-    <string>7.0.2</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>${minimum_version_key}</key>
-    <string>${minimum_os_version}</string>
-    <key>CFBundleSupportedPlatforms</key>
-    <array>
-        <string>${supported_platforms}</string>
-    </array>
-    <key>NSPrincipalClass</key>
-    <string></string>
-</dict>
-</plist>"
-    echo $info_plist | sudo tee ${file_path} 1>/dev/null
-}
-
-create_framework() {
-    # Create a 'traditional' framework from the corresponding dylib.
-    local framework_name="$1"
-    local platform="$2" # For now it's either arm64 or arm64-simulator, see below.
-    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed/usr/local/ios/ffmpeg"
-    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
-    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
-    sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
-
-    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
-
-    # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
-    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
-        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
-        if [ "$found_name" != "$framework_name" ]
-        then
-            sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
-        fi
-    done
-    #sudo mkdir -p "$prefix/framework/"
-    #sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
-}
-
-create_xcframework() {
-    # Create 'traditional' framework from the corresponding dylib,
-    # also creating
-    local framework_name="$1"
-    local target_platform_a="$2"
-    local target_platform_b="$3"
-
-    local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
-    local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
-
-    sudo mkdir -p "$prefix/framework/"
-    sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/framework/${framework_name}.xcframework"
-}
-
-build_ffmpeg_ios "x86_64-simulator"
-build_ffmpeg_ios "arm64-iphoneos"
-
-ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
-
-for name in $ffmpeg_libs; do
-    create_framework $name "arm64-iphoneos"
-    create_framework $name "x86_64-simulator"
-done
-
-# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
-for name in $ffmpeg_libs; do
-    create_xcframework $name "arm64-iphoneos" "x86_64-simulator"
-done
-
-install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed"
+build_ffmpeg_ios "x86_64"
+build_ffmpeg_ios "arm64"
 
+install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
 SetEnvVar "FFMPEG_DIR_IOS" $prefix

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

@@ -5,21 +5,15 @@
 # This script will build and install FFmpeg static libs
 set -ex
 os="$1"
-build_type="$2"
-
-if [ ! -n "$build_type" ] && [ "$build_type" != "static" ] && [ "$build_type" != "shared" ]; then
-  >&2 echo "Invalid build_type: $build_type. The shared build type will be used."
-  build_type="shared"
-fi
 
 # shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.1"
+version="n7.0.2"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -33,9 +27,6 @@ then
 fi
 
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
-if [ "$build_type" != "static" ]; then
-  ffmpeg_config_options+=" --enable-shared --disable-static"
-fi
 
 install_ff_nvcodec_headers() {
   nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
@@ -55,35 +46,6 @@ install_ff_nvcodec_headers() {
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
 }
 
-fix_openssl3_pc_files() {
-  # On RHEL 8, openssl3 pc files are libopenssl3.pc, libssl3.pc, libcrypto3.pc,
-  # and FFmpeg cannot find them. Instead, it finds FFmpeg 1.x.x if it's installed.
-  # The function fixes the files with copying them to a custom directory
-
-  local openssl3_pcfiledir=$(pkg-config --variable=pcfiledir openssl3)
-  if [ ! -n  "$openssl3_pcfiledir" ]; then
-    return
-  fi
-
-  local pcfiles=("libssl" "libcrypto" "openssl")
-
-  for pcfile in ${pcfiles[@]}; do
-    if [ ! -f "$openssl3_pcfiledir/${pcfile}3.pc" ]; then
-      echo "pkgconfig has found openssl3 but the file $openssl3_pcfiledir/${pcfile}3.pc does't exist"
-      return
-    fi
-  done
-
-  local new_pkgconfig_dir="$ffmpeg_source_dir/openssl3_pkgconfig"
-  mkdir -p $new_pkgconfig_dir
-
-  for pcfile in ${pcfiles[@]}; do
-    sed -E '/^Requires(\.private)?:/s/ (libssl|libcrypto)3/ \1/g;' "$openssl3_pcfiledir/${pcfile}3.pc" > "$new_pkgconfig_dir/${pcfile}.pc"
-  done
-
-  export PKG_CONFIG_PATH="$new_pkgconfig_dir:$PKG_CONFIG_PATH"
-}
-
 build_ffmpeg() {
   local arch="$1"
   local prefix="$2"
@@ -109,11 +71,15 @@ build_ffmpeg() {
 }
 
 if [ "$os" == "linux" ]; then
+  build_type="$2"
+
   install_ff_nvcodec_headers
 
   ffmpeg_config_options+=" --enable-openssl"
-  fix_openssl3_pc_files
-  echo "pkg-config openssl version: $(pkg-config --modversion openssl)"
+
+  if [ "$build_type" != "static" ]; then
+    ffmpeg_config_options+=" --enable-shared --disable-static"
+  fi
 
   build_ffmpeg
 
@@ -128,6 +94,8 @@ if [ "$os" == "linux" ]; then
   SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
 
 elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
+  ffmpeg_config_options+=" --enable-shared --disable-static"
+
   brew install yasm
   export MACOSX_DEPLOYMENT_TARGET=12
   fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"

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

@@ -6,7 +6,7 @@
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 patchelf_version="0.17.2"
 
-url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz"
+url_cached="https://ci-files01-hki.intra.qt.io/input/android/patchelf/$patchelf_version.tar.gz"
 url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz"
 sha1="ddd46a2e2a16a308245c008721d877455b23bba8"
 

coin/provisioning/common/unix/openssl_3_for_android.sh

@@ -12,12 +12,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="3.0.7"
-ndkVersionLatest="r27c"
+ndkVersionLatest="r26b"
 ndkVersionDefault=$ndkVersionLatest
-prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e"
+prebuiltOpensslNdkShaLatest="ea925d5a5b696916fb3650403a2eb3189c52b5ce"
 prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest
 
-: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c
+: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
 # Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
@@ -32,7 +32,7 @@ else
 fi
 
 # ANDROID_NDK_ROOT is required during Configure
-export ANDROID_NDK_ROOT=/opt/android/android-ndk-r27c
+export ANDROID_NDK_ROOT=/opt/android/android-ndk-r26b
 
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version.tar.gz"

coin/provisioning/common/unix/openssl_for_android.sh

@@ -12,12 +12,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="3.0.7"
-ndkVersionLatest="r27c"
+ndkVersionLatest="r26b"
 ndkVersionDefault=$ndkVersionLatest
-prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e"
+prebuiltOpensslNdkShaLatest="ea925d5a5b696916fb3650403a2eb3189c52b5ce"
 prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest
 
-: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c
+: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r26b
 # Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.

coin/provisioning/common/windows/android-openssl.ps1

@@ -16,11 +16,11 @@ if (Is64BitWinHost) {
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
 $openssl_version = "3.0.7"
-$ndk_version_latest = "r27c"
+$ndk_version_latest = "r26b"
 $ndk_version_default = "$ndk_version_latest"
 $openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
 $openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
-$prebuilt_sha1_ndk_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
+$prebuilt_sha1_ndk_latest = "ea925d5a5b696916fb3650403a2eb3189c52b5ce"
 $prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
 $destination_prefix = "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk"
 
@@ -70,7 +70,7 @@ function Install($1, $2) {
         }
 
         # ANDROID_NDK_ROOT needs to be in environment variables before running this script
-        # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r27c"
+        # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r26b"
 
         $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
         CheckExitCode $make_install

coin/provisioning/common/windows/android.ps1

@@ -10,9 +10,9 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkVersionLatest = "r27c"
+$ndkVersionLatest = "r26b"
 $ndkVersionDefault = $ndkVersionLatest
-$ndkChecksumLatest = "ac5f7762764b1f15341094e148ad4f847d050c38"
+$ndkChecksumLatest = "17453c61a59e848cffb8634f2c7b322417f1732e"
 $ndkChecksumDefault = $ndkChecksumLatest
 $ndkCachedUrlLatest = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip"
 $ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip"
@@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-35"
-$sdkBuildToolsVersion = "35.0.1"
+$sdkApiLevel = "android-34"
+$sdkBuildToolsVersion = "34.0.0"
 $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

coin/provisioning/common/windows/cmake.ps1

@@ -3,22 +3,22 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$majorminorversion = "3.30"
-$version = "3.30.5"
+$majorminorversion = "3.27"
+$version = "3.27.7"
 
 $cpu_arch = Get-CpuArchitecture
 Write-Host "Installing CMake for architecture $cpu_arch"
 switch ($cpu_arch) {
     arm64 {
         $arch = "arm64"
-        $sha1 = "408977a174476407bd660604f110a26ba41a6efd"
-        $majorminorversion = "3.30"
-        $version = "3.30.5"
+        $sha1 = "52ee08671dcb478c5ec6e862f41717f65047c598"
+        $majorminorversion = "3.29"
+        $version = "3.29.2"
         Break
     }
     x64 {
         $arch = "i386"
-        $sha1 = "d0636735c2d13a4443662605cd80c708f265eacc"
+        $sha1 = "b6147215a5f9cd1138b012265229fbf2224d02c6"
     }
     default {
         throw "Unknown architecture $cpu_arch"

coin/provisioning/common/windows/install-azure-tool.ps1

@@ -5,6 +5,6 @@
 # This script will install Azure singtool using Dotnet SDK
 $dotnet = "C:\Program Files\dotnet\dotnet.exe"
 
-$version = "5.0.0"
+$version = "2.0.17"
 Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version"
 

coin/provisioning/common/windows/install-dotnet.ps1

@@ -4,30 +4,15 @@
 
 # This script will install Dotnet SDK which is required for Azure installation
 
-$version = "8.0.300"
-$cpu_arch = Get-CpuArchitecture
-switch ($cpu_arch) {
-    arm64 {
-        $sha1 = "3e68f606b205beeb0a557dad5b01e31d4d833459"
-        $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-$version-win-arm64.exe"
-        $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/e195e4f5-00ee-4df3-8736-199aacf00b2a/1663c4f5dc168d390aa4507f09200423/dotnet-sdk-$version-win-arm64.exe"
-        Break
-    }
-    x64 {
-        $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-$version-win-x64.exe"
-        $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/90486d8a-fb5a-41be-bfe4-ad292c06153f/6673965085e00f5b305bbaa0b931cc96/dotnet-sdk-$version-win-x64.exe"
-        $sha1 = "527321c1eeea964a7c50f6a24473f37400514cd1"
-        Break
-    }
-    x86 {
-        $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-$version-win-x86.exe"
-        $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/9736c2dc-c21d-4df6-8cb7-9365ed5461a9/4c360dc61c7cb6d26b48d2718341c68e/dotnet-sdk-$version-win-x86.exe"
-        $sha1 = "f8857b5e06de5c33aee2fb2242f7781f1a65c4ef"
-        Break
-    }
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
+$version = "2.1"
+if (Is64BitWinHost) {
+    $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe"
+    $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe"
+    $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8"
+} else {
+    $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe"
+    $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe"
+    $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161"
 }
 $installer = "C:\Windows\Temp\dotnet-sdk-$version.exe"
 

coin/provisioning/common/windows/install-ffmpeg.ps1

@@ -6,9 +6,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
 
-$version="n7.1"
+$version="n7.0.2"
 $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="f008a93710a7577e3f85a90f4b632cc615164712"
+$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
 $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 $ffmpeg_name="FFmpeg-$version"
 
@@ -144,7 +144,7 @@ function InstallAndroidArmv7 {
     $target_cpu="armv7-a"
     $api_version="24"
 
-    $ndkVersionLatest = "r27c"
+    $ndkVersionLatest = "r26b"
     $ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest"
 
     $toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64"
@@ -188,7 +188,7 @@ function InstallAndroidArmv7 {
     Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"")
 
     $patchelf_sha1 = "DDD46A2E2A16A308245C008721D877455B23BBA8"
-    $patchelf_sources = "https://ci-files01-hki.ci.qt.io/input/android/patchelf/0.17.2.tar.gz"
+    $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.17.2.tar.gz"
     $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz"
 
     Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location

coin/provisioning/common/windows/install-golang.ps1

@@ -1,39 +0,0 @@
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-. "$PSScriptRoot\helpers.ps1"
-
-$version = "1.22.4"
-
-$cpu_arch = Get-CpuArchitecture
-switch ($cpu_arch) {
-    x64 {
-        $arch = "amd64"
-        $sha256 = "3c21105d7b584759b6e266383b777caf6e87142d304a10b539dbc66ab482bb5f"
-        break
-    }
-    x86 {
-        $arch = "386"
-        $sha256 = "5c6446e2ea80bc6a971d2b34446f16e6517e638b0ff8d3ea229228d1931790b0"
-        break
-    }
-    arm64 {
-        $arch = "arm64"
-        $sha256 = "553cc6c460f4e3eb4fad5b897c0bb22cd8bbeb20929f0e3eeb939420320292ce"
-        break
-    }
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
-}
-
-$goPackage = "C:\Windows\Temp\Go-" + $version + $arch + ".msi"
-$url_cache = "https://ci-files01-hki.ci.qt.io/input/go/windows/go" + $version + ".windows-" + $arch + ".msi"
-$url_official = "https://go.dev/dl/go" + $version + ".windows-" + $arch + ".msi"
-
-Write-Host "Fetching Go $version..."
-Download $url_official $url_cache $goPackage
-Verify-Checksum $goPackage $sha256 sha256
-Write-Host "Installing Go $version..."
-Run-Executable "msiexec" "/quiet /i $goPackage"
-Write-Output "Go = $version" >> ~\versions.txt

coin/provisioning/common/windows/install-sevenzip.ps1

@@ -5,24 +5,24 @@
 
 # This script installs 7-Zip
 
-$version = "24.09"
-$nonDottedVersion = "2409"
+$version = "23.01"
+$nonDottedVersion = "2301"
 
 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
     arm64 {
         $arch = "-arm64"
-        $sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429"
+        $sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7"
         Break
     }
     x64 {
         $arch = "-x64"
-        $sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0"
+        $sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB"
         Break
     }
     x86 {
         $arch = ""
-        $sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497"
+        $sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C"
         Break
     }
     default {

coin/provisioning/common/windows/install-upx.ps1

@@ -1,41 +0,0 @@
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-. "$PSScriptRoot\helpers.ps1"
-
-$majorminorversion = "4.2"
-$version = "4.2.4"
-
-$cpu_arch = Get-CpuArchitecture
-Write-Host "Installing UPX for architecture $cpu_arch"
-switch ($cpu_arch) {
-    x64 {
-        $arch = "win64"
-        $sha1 = "204ae110a84d0046b242222f97b19cf3f5594f4b"
-    }
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
-}
-
-$filename = "upx-" + $version + "-" + $arch
-$filename_zip = $filename + ".zip"
-
-$zip = Get-DownloadLocation ($filename_zip)
-$officialurl = "https://github.com/upx/upx/releases/download/v" + $version + "/" + $filename_zip
-$cachedurl = "https://ci-files01-hki.ci.qt.io/input/upx/windows/" + $filename_zip
-
-Write-Host "Removing old UPX"
-Remove "C:\UPX"
-
-Download $officialurl $cachedurl $zip
-Verify-Checksum $zip $sha1
-
-Extract-7Zip $zip C:
-$defaultinstallfolder = "C:\" + $filename
-Rename-Item $defaultinstallfolder C:\UPX
-
-Add-Path "C:\UPX"
-
-Write-Output "UPX = $version" >> ~\versions.txt
-

coin/provisioning/common/windows/libclang.ps1

@@ -1,5 +1,5 @@
 param(
-    [string]$archVer="32",
+    [Int32]$archVer=32,
     [string]$toolchain="vs2019",
     [bool]$setDefault=$true
 )
@@ -36,21 +36,8 @@ function install() {
 
 $toolchainSuffix = ""
 
-if ( $toolchain -eq "vs2022" ) {
-    if ( $archVer -eq "64" ) {
-        $sha1 = "7e51f0eabdfe8eea17aaf1dce7b2ffe1ea064f66"
-    }
-    elseif ( $archVer -eq "arm64" ) {
-        $sha1 = "986d4d0f253de505ef499345238c101dac1ca3a6"
-    }
-    else {
-        $sha1 = ""
-    }
-    $toolchainSuffix = "msvc"
-}
-
 if ( $toolchain -eq "vs2019" ) {
-    if ( $archVer -eq "64" ) {
+    if ( $archVer -eq 64 ) {
         $sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f"
     }
     else {
@@ -60,7 +47,7 @@ if ( $toolchain -eq "vs2019" ) {
 }
 
 if ( $toolchain -eq "mingw" ) {
-    if ( $archVer -eq "64" ) {
+    if ( $archVer -eq 64 ) {
         $sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3"
     }
     else {
@@ -71,7 +58,7 @@ if ( $toolchain -eq "mingw" ) {
 
 
 if ( $toolchain -eq "llvm-mingw" ) {
-    if ( $archVer -eq "64" ) {
+    if ( $archVer -eq 64 ) {
         $sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58"
     }
     else {

coin/provisioning/common/windows/python3.ps1

@@ -78,17 +78,10 @@ Run-Executable "$install_path\python.exe" "-m pip config --user set global.index
 Run-Executable "$install_path\python.exe" "-m pip config --user set global.extra-index-url https://pypi.org/simple/"
 Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel html5lib"
 
-# Check if python version is higher than 3.10.
+# Check if python version is higher than 3.8.
 # ntia-conformance-checker requires at least 3.8
-# reuse requires at least 3.9, to avoid conflict with installed conan jinja package,
-# at least until we use virtual envs.
-# The lowest version available on all windows platforms that we currently run on that satisfies
-# these requirements is 3.10.
-if ([version]::Parse($version) -gt [version]::Parse("3.10")) {
+if ([version]::Parse($version) -gt [version]::Parse("3.8")) {
     Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install -r $PSScriptRoot\..\shared\sbom_requirements.txt"
-    # Set the environment variable for the build system to know which python path to use for SBOM
-    # processing.
-    Set-EnvironmentVariable "SBOM_PYTHON_APPS_PATH" "$install_path\Scripts"
 }
 
 # Install PyPDF2 for QSR documentation

coin/provisioning/common/windows/version.ps1

@@ -4,6 +4,3 @@ Write-Host '*****************************************************'
 Write-Host '******************** Get-PSDrive ********************'
 Get-PSDrive
 Write-Host '*****************************************************'
-Write-Host '******************** Path Content *******************'
-$env:Path -split ';'
-Write-Host '*****************************************************'

coin/provisioning/common/windows/vulkansdk.ps1

@@ -6,36 +6,13 @@
 # This script will install Vulkan SDK
 # Original Download page: https://vulkan.lunarg.com/sdk/home#windows
 
-$cpu_arch = Get-CpuArchitecture
-Write-Host "Installing $cpu_arch Vulkan SDK"
-$version = "1.2.182.0"  # TODO: Update to newest 1.3.296.0
-switch ($cpu_arch) {
-    arm64 {
-        $version = "1.3.296.0"
-        $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/warm/InstallVulkanARM64-$version.exe"
-        $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\InstallVulkanARM64-$version.exe"
-        $sha1 = "7d47d8dd10c09d363e6103925c4a032abf7b2c02"
-        $installArgs = "--accept-licenses --default-answer --confirm-command install"
-        Break
-    }
-    x64 {
-        $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe"
-        $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe"
-        $sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
-        $installArgs = "/S"
-        Break
-    }
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
-}
-
+$version = "1.2.182.0"
 $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
-
-Download "$externalUrl" "$internalUrl" "$vulkanPackage"
+$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
+Download "https://sdk.lunarg.com/sdk/download/1.2.182.0/windows/VulkanSDK-$version-Installer.exe" "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" $vulkanPackage
 Verify-Checksum "$vulkanPackage" "$sha1"
 
-Run-Executable "$vulkanPackage" "$installArgs"
+Run-Executable $vulkanPackage "/S"
 
 Write-Host "Cleaning $vulkanPackage.."
 Remove "$vulkanPackage"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh

@@ -17,8 +17,6 @@ echo "Timeout for blanking the screen (0 = never)"
 gsettings set org.gnome.desktop.session idle-delay 0
 echo "Prevents screen lock when screesaver goes active."
 gsettings set org.gnome.desktop.screensaver lock-enabled false
-echo "Disable window animations."
-gsettings set org.gnome.desktop.interface enable-animations false
 echo "Set grub timeout to 0"
 sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub
 sudo update-grub

coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh

@@ -113,7 +113,7 @@ installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
-installPackages+=(openjdk-17-jdk)
+installPackages+=(openjdk-11-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
@@ -246,8 +246,7 @@ installPackages+=(pkg-kde-tools)
 installPackages+=(unixodbc-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(libusb-1.0-0-dev)
-# password management support for Qt Creator
-installPackages+=(libsecret-1-dev)
+
 
 echo "Running update for apt"
 waitLoop
@@ -262,10 +261,6 @@ keyring --disable
 
 pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin"
-
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
 #OpenSSLVersion="$(openssl version |cut -b 9-14)"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-golang.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#Copyright (C) 2024 The Qt Company Ltd
-#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -ex
-
-source "${BASH_SOURCE%/*}/../common/linux/install-golang.sh"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-upx.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#Copyright (C) 2024 The Qt Company Ltd
-#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -ex
-
-source "${BASH_SOURCE%/*}/../common/linux/install-upx.sh"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh

@@ -6,7 +6,7 @@
 mkdir -p /home/qt/debian_packages
 cd /home/qt/debian_packages || exit
 # Backported cmake 3.24
-wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz
+wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz
 tar xzf cmake-3.24-deb.tar.gz
 # get rest of ready made Ubuntu arm debian packages
 # so that sbuild can find those

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

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright (C) 2023 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -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
-