Add html5lib to python.3.11

RHEL 8 installs python3-html5lib, however this only affects
installed pythnon 3.6, webengine should use
3.11 therefore add it to pip installer.

The change for switching webengine to 3.11 is in
so installing of python3-htmllib can be removed.

Fixes: QTBUG-132584
Change-Id: Ia6f4262971f60b960a61a466f418750c0d956cbc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit f8e873b188)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

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

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

cmake/QtIRGitHelpers.cmake

@@ -93,9 +93,15 @@ 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.
-function(qt_ir_add_git_remotes repo_name working_directory)
-    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/")
+# Add gerrit remotes to the repository located in the working_directory.
+# repo_relative_url is the relative URL of the repository.
+# Examples:
+# - qt5
+# - qttools.git
+# - ../playground/qlitehtml.git
+# - ../qt/qttools-litehtml.git
+function(qt_ir_add_git_remotes repo_relative_url working_directory)
+    set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
     set(gerrit_repo_url "${gerrit_ssh_base}")
 
     qt_ir_get_option_value(codereview-username username)
@@ -110,7 +116,10 @@ function(qt_ir_add_git_remotes repo_name working_directory)
         string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
     endif()
 
-    string(APPEND gerrit_repo_url "${repo_name}")
+    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}")
 
     qt_ir_execute_process_and_log_and_handle_error(
         COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}"
@@ -193,15 +202,21 @@ 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_has_url_scheme("${submodule_url}" has_url_scheme)
+    qt_ir_parse_git_url(
+        URL "${submodule_url}"
+        OUT_VAR_HAS_URL_SCHEME 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/QtIRParsingHelpers.cmake

@@ -40,16 +40,77 @@ function(qt_ir_get_git_config_contents out_var)
     set(${out_var} "${git_output}" PARENT_SCOPE)
 endfunction()
 
-# 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}")
+# 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 "")
 
     if(has_url_scheme)
-        set(${out_var} TRUE PARENT_SCOPE)
-    else()
-        set(${out_var} FALSE PARENT_SCOPE)
+        string(PREPEND normalized_url "${url_scheme}")
     endif()
+
+    set(${out_var} "${normalized_url}" PARENT_SCOPE)
 endfunction()
 
 # Parses a key-value line from a .git/config or .gitmodules file
@@ -79,14 +140,22 @@ endmacro()
 # url_value
 #   the url where to clone a repo from
 #   in perl script it was called $base
-#   e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git'
+#   Examples:
+#    - '../qtbase.git'
+#    - 'https://code.qt.io/playground/qlitehtml.git'
+#    - '../../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
-#   e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git'
+#   Examples:
+#    - 'qt5'
+#    - 'tqtc-qt5'
+#    - 'qtdeclarative.git'
+#    - 'qttools.git'
+#    - 'https://code.qt.io/playground/qlitehtml.git'
 #
 # Outputs
 #
@@ -94,21 +163,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 all the ../ are collapsed
-#   e.g. 'qtdeclarative.git'
-#        'https://code.qt.io/playground/qlitehtml.git',
+#   ${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'
 macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path)
-    qt_ir_has_url_scheme("${url_value}" has_url_scheme)
+    qt_ir_parse_git_url(
+        URL "${url_value}"
+        OUT_VAR_HAS_URL_SCHEME has_url_scheme
+    )
     if(NOT has_url_scheme)
         set(base_git_path "${parent_repo_base_git_path}/${url_value}")
-
-        # 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 "")
+        qt_ir_normalize_git_url("${base_git_path}" base_git_path)
     else()
         set(base_git_path "${url_value}")
     endif()

coin/instructions/coin_qt_configure.yaml

@@ -47,3 +47,20 @@ 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/address_sanitizer_platforms.yaml

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

coin/platform_configs/cmake_platforms.yaml

@@ -107,22 +107,11 @@ Configurations:
     Compiler: 'GCC'
     Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x64'
--
-    Id: 'opensuse-15.5-developer-build'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
-    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-nomake examples -developer-build'
-    Environment variables: [
-        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
-    ]
 -
     Id: 'opensuse-15.6-developer-build'
     Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests']
+    Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-nomake examples -developer-build'
     Environment variables: [
         'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
@@ -151,7 +140,7 @@ Configurations:
     ]
 -
     Id: 'windows-10_22h2-msvc2022'
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Compiler: 'MSVC2022'
     Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -163,7 +152,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_23H2-msvc2022'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -175,7 +164,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-arm64-msvc2022'
-    Template: 'qtci-windows-11_22H2-aarch64-54'
+    Template: 'qtci-windows-11_22H2-aarch64-55'
     Compiler: 'MSVC2022'
     Features: ['PinCores', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
@@ -186,7 +175,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_23H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -202,7 +191,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_23H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
     Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
@@ -247,7 +236,7 @@ Configurations:
     ]
 -
     Id: 'windows-10_22h2-mingw13'
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Compiler: 'Mingw'
     Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -260,7 +249,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_23H2-llvm'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'Clang'
     Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -273,7 +262,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_23H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'Mingw'
     Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
     Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'

coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml

@@ -23,7 +23,7 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'vxworks-x86_64-buildtest'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
     Environment variables: [
         'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
         'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -3,7 +3,7 @@ Configurations:
 
 -
     Id: 'windows-11_23H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     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'
@@ -15,7 +15,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_22H2-aarch64-53'
+    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'

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -13,14 +13,14 @@ Configurations:
     Id: 'sles-15_sp6-minimal-static'
     Template: 'qtci-linux-SLES-15_SP6-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
+    Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
     Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
     Environment variables: [
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
     Id: 'windows-11_23H2-minimal-static'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
     Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'

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-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -2,18 +2,6 @@ Version: 2
 Configurations:
 -
     Id: 'webassembly-linux-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.5-developer-build'
-    Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
-    ]
--
-    Id: 'webassembly-linux-thread-asyncify-openSUSE-15.6'
     Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
@@ -22,11 +10,11 @@ Configurations:
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
         "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-        -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
+         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
     ]
 -
     Id: 'webassembly-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Target os: 'WebAssembly'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
@@ -41,10 +29,10 @@ Configurations:
     ]
 -
     Id: 'webassembly-linux-thread'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.5-developer-build'
+    Platform dependency: 'opensuse-15.6-developer-build'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -52,34 +40,8 @@ Configurations:
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
     ]
--
-    Id: 'webassembly-linux-thread-openSUSE-15.6'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
 -
     Id: 'webassembly-linux-shared'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.5-developer-build'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
--
-    Id: 'webassembly-linux-shared-openSUSE-15.6'
     Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
     Target os: 'WebAssembly'
     Compiler: 'GCC'

coin/platform_configs/ios-tests.yaml

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

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-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'MSVC2019'

coin/platform_configs/nightly_unity_builds.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'windows-11_23H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'

coin/platform_configs/qmake2cmake.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Compiler: 'MSVC2019'
     Features: ['DisableTests']
 -

coin/platform_configs/qt-creator.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -28,7 +28,7 @@ Configurations:
     Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
@@ -36,7 +36,7 @@ Configurations:
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    Template: 'qtci-windows-10_22H2-x86_64-53'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''

coin/platform_configs/qtbase.yaml

@@ -15,9 +15,6 @@ Include: [
 Configurations: []
 Overrides:
 # Make VxWorks tests insignificant.
--
-    Id: 'vxworks-imx6-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
 -
     Id: 'vxworks-x86_64-tests'
     Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

coin/platform_configs/qtgraphs.yaml

@@ -6,8 +6,3 @@ Include: [
     address_sanitizer_platforms.yaml
     ]
 Configurations: []
-Overrides:
-# Make VxWorks arm tests insignificant.
--
-    Id: 'vxworks-imx6-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

coin/platform_configs/qtgrpc.yaml

@@ -6,8 +6,3 @@ Include: [
     address_sanitizer_platforms.yaml
 ]
 Configurations: []
-Overrides:
-# Make VxWorks arm tests insignificant.
--
-    Id: 'vxworks-imx6-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -8,7 +8,6 @@ Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
     "ubuntu-22.04-developer-build",
-    "opensuse-15.5-developer-build",
     "opensuse-15.6-developer-build",
     "sles-15_sp5-static",
     "sles-15_sp6-static",

coin/platform_configs/qtsaferenderer.yaml

@@ -8,7 +8,6 @@ Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
     "ubuntu-22.04-developer-build",
-    "opensuse-15.5-developer-build",
     "opensuse-15.6-developer-build",
     "sles-15_sp5-static",
     "sles-15_sp6-static",
@@ -49,7 +48,7 @@ Configurations:
     ]
 -
     Id: 'Windows-MSVC2022_Static'
-    Template: 'qtci-windows-10_22H2-x86_64-52'
+    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'

coin/platform_configs/qtwebkit.yaml

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

coin/platform_configs/tqtc-android-automotive.yaml

@@ -14,7 +14,8 @@ Include: [
         'android-armv7-on-windows',
         'android-9-x86-on-linux',
         'android-14-x86_64-on-linux'
-    ]
+    ],
+    offline_documentation.yaml
 ]
 Configurations:
 -

coin/platform_configs/wasm_qtbase_tests.yaml

@@ -2,15 +2,8 @@ Version: 2
 Configurations:
 -
     Id: 'webassembly-linux-thread-asyncify-tests'
-    Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
+    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Features: ['PinCores', 'Sccache', 'TestOnly']
     Platform dependency: 'webassembly-linux-thread-asyncify'
--
-    Id: 'webassembly-linux-thread-asyncify-tests-openSUSE-15.6'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'webassembly-linux-thread-asyncify-openSUSE-15.6'

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt

@@ -56,6 +56,10 @@ 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/msvc2022.txt

@@ -56,6 +56,10 @@ Windows 11 SDK (10.0.22000.0)
 Windows 11 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_23H2-x86_64/msvc2022.txt

@@ -57,6 +57,10 @@ Windows 11 SDK (10.0.22000.0)
 Windows 11 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/provisioning/common/linux/android_linux.sh

@@ -136,12 +136,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
 ./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
     | eval "$sdkmanager_no_progress_bar_cmd"
 
-echo "Download and unzip Android Emulator version 34.1.19"
-emulatorFileName="emulator-linux_x64-11525734.zip"
+echo "Download and unzip Android Emulator version 35.2.10"
+emulatorFileName="emulator-linux_x64-12414864.zip"
 emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
 emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
 emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
-emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7"
+emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10"
 DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
 echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
 sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"

coin/provisioning/common/linux/cmake_min_supported.sh

@@ -9,13 +9,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.16"
-version="3.16.8"
-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="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c"
+majorminorversion="3.22"
+version="3.22.6"
+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="4a5ba17568d108d295719850dd584e775583f61b"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
+appPrefix="cmake-$version-linux-x86_64"
 
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 

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

@@ -0,0 +1,25 @@
+#!/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/unix/emsdk.sh

@@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh"
 version="3.1.56"
 versionNode="v16.20.0"
 tarBallVersion="${version//./_}"
-if uname -a |grep -q Darwin; then
+if uname -a | grep -q Darwin; then
     tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
     sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84"
 else
@@ -22,7 +22,7 @@ cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
 target="/tmp/${tarBallPackage}"
 
 mkdir -p /opt
-cd /opt
+cd /opt || exit
 echo "URL: $cacheUrl"
 
 if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
@@ -31,13 +31,16 @@ if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
 else
     echo "Emsdk isn't cached. Cloning it"
     sudo git clone https://github.com/emscripten-core/emsdk.git
-    cd emsdk
-    sudo ./emsdk install "$version"
+    cd emsdk || exit
+    if ! sudo ./emsdk install "$version"; then
+        echo "Error: emsdk installation failed"
+        exit 1
+    fi
     sudo ./emsdk activate "$version"
 fi
 
 # platform-specific toolchain and node binaries. urls obtained from "emsdk install"
-if uname -a |grep -q Darwin; then
+if uname -a | grep -q Darwin; then
     pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
 else
     pathNodeExecutable="node-$versionNode-linux-x64/bin/node"

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.0.2"
+version="n7.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
+sha1="f008a93710a7577e3f85a90f4b632cc615164712"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 

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.0.2"
+version="n7.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
+sha1="f008a93710a7577e3f85a90f4b632cc615164712"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -68,7 +68,7 @@ build_ffmpeg_ios() {
   --enable-pthreads \
   --disable-audiotoolbox
 
-  sudo make install DESTDIR="$build_dir/installed" -j
+  sudo make install DESTDIR="$build_dir/installed" -j4
   popd
 }
 

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

@@ -17,9 +17,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n7.0.2"
+version="n7.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
+sha1="f008a93710a7577e3f85a90f4b632cc615164712"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 

coin/provisioning/common/unix/squishInstall.sh

@@ -11,8 +11,8 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="8.0.0"
-qtBranch="67x"
+version="8.1.0"
+qtBranch="68x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
 preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable"
@@ -24,14 +24,14 @@ testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squi
 testSuiteLocal="/tmp/squish_test_suite"
 if uname -a |grep -q Darwin; then
     compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz"
-    sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a"
+    sha1="03a0c713d0d328667df2e7804f2e4d507707b849"
 else
     if [ "$PROVISIONING_ARCH" = arm64 ] ; then
         compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz"
-        sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5"
+        sha1="f6a2eb69faed64f13b164fb8d056182c41d2952c"
     else
         compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz"
-        sha1="db5c48f359b46a460551cdf9362c63f557cbc04f"
+        sha1="b798417ddf4b668306cb90d551df906828644152"
     fi
 fi
 

coin/provisioning/common/windows/emsdk.ps1

@@ -11,8 +11,9 @@ $temp = "$env:tmp"
 $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
 $sha = "ab376d218f1a66302c36770977948f74f0576a42"
 
-# Make sure python is in the path
-Prepend-Path "C:\Python27"
+# Python used for '.\emsdk install'
+$pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine")
+Prepend-Path $pythonPath
 
 cd "C:\\Utils"
 $installLocationEmsdk = "C:\\Utils\\emsdk"
@@ -24,11 +25,18 @@ try {
     cd $installLocationEmsdk
     .\emsdk activate $version
 } catch {
-    Write-Host "Can't find cached emsdk. Cloning it"
+    Write-Host "Can't find cached emsdk or another error occurred. Cloning it"
+    Write-Host "Error details: $_"
+
     C:\PROGRA~1\Git\bin\git clone https://github.com/emscripten-core/emsdk.git
     cd $installLocationEmsdk
-    .\emsdk install $version
-    .\emsdk activate $version
+
+    try {
+        .\emsdk install $version
+        .\emsdk activate $version
+    } catch {
+        throw "emsdk installation failed: $_"
+    }
 }
 
 $versionWinPython = $($Env:EMSDK_PYTHON -split ('python\\') -split ('_64bit'))[1]

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.0.2"
+$version="n7.1"
 $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
+$sha1="f008a93710a7577e3f85a90f4b632cc615164712"
 $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 $ffmpeg_name="FFmpeg-$version"
 

coin/provisioning/common/windows/squishInstall.ps1

@@ -6,8 +6,8 @@
 # This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
 
-$version = "8.0.0"
-$qtBranch = "67x"
+$version = "8.1.0"
+$qtBranch = "68x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
 $squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable"
@@ -33,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro
     # In Windows 11 case $OSVersion is 'Windows 10 Pro'
     $winVersion = "win10"
     if (Is64BitWinHost) {
-        $sha1 = "0f863c261f854ec38032815298f5636e99779bff"
+        $sha1 = "e7497b925b9a0aa17628344dbdacd6b3acd41c3b"
     }
 } else {
     $winVersion = "n/a"

coin/provisioning/common/windows/version.ps1

@@ -4,3 +4,6 @@ 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,13 +6,36 @@
 # This script will install Vulkan SDK
 # Original Download page: https://vulkan.lunarg.com/sdk/home#windows
 
-$version = "1.2.182.0"
+$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"
+    }
+}
+
 $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
-$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
+
+Download "$externalUrl" "$internalUrl" "$vulkanPackage"
 Verify-Checksum "$vulkanPackage" "$sha1"
 
-Run-Executable $vulkanPackage "/S"
+Run-Executable "$vulkanPackage" "$installArgs"
 
 Write-Host "Cleaning $vulkanPackage.."
 Remove "$vulkanPackage"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh

@@ -1,6 +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
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/squishInstall.sh"
-

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh

@@ -86,7 +86,6 @@ installPackages+=(libXtst-devel)
 installPackages+=(libxshmfence-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
-installPackages+=(python3-html5lib)
 installPackages+=(libatomic)
 installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64)
 # For Android builds
@@ -167,7 +166,7 @@ sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/py
 sudo pip config --user set global.extra-index-url https://pypi.org/simple/
 
 sudo pip3 install virtualenv wheel
-sudo python3.11 -m pip install virtualenv wheel
+sudo python3.11 -m pip install virtualenv wheel html5lib
 sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 # For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the
 # system python3.11.

coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh

@@ -0,0 +1,14 @@
+#!/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
+
+# shellcheck source=../common/macos/install-simulator-runtime.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
+version="17.4"
+packageName=iOS_"$version"_Simulator_Runtime.dmg
+url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
+sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50"
+
+InstallSimulatorRuntime $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh

@@ -0,0 +1,14 @@
+#!/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
+
+# shellcheck source=../common/macos/install-simulator-runtime.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
+version="17.4"
+packageName=iOS_"$version"_Simulator_Runtime.dmg
+url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
+sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50"
+
+InstallSimulatorRuntime $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh

@@ -5,3 +5,8 @@
 set -ex
 
 defaults write com.apple.CrashReporter DialogType server
+
+# shellcheck source=../common/unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+
+SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false"

coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh

@@ -0,0 +1,14 @@
+#!/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
+
+# shellcheck source=../common/macos/install-simulator-runtime.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
+version="18.0"
+packageName=iOS_"$version"_Simulator_Runtime.dmg
+url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
+sha1="f29778313459b3a2a497ffd711b9dfa212241183"
+
+InstallSimulatorRuntime $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh

@@ -5,3 +5,8 @@
 set -ex
 
 defaults write com.apple.CrashReporter DialogType server
+
+# shellcheck source=../common/unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+
+SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false"

coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh

@@ -0,0 +1,14 @@
+#!/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
+
+# shellcheck source=../common/macos/install-simulator-runtime.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
+version="18.0"
+packageName=iOS_"$version"_Simulator_Runtime.dmg
+url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
+sha1="f29778313459b3a2a497ffd711b9dfa212241183"
+
+InstallSimulatorRuntime $url $url $sha1 $packageName $version