Change msvc packaging targets back to c++17

Packaging targets were accidentally moved to c++20.
Amends bf633f08b7
Amends b4bcf1e6ca

Fixes: QTQAINFRA-6424
Change-Id: Iad6f8202329b471733cc1bc8ddf22feb3ffadfb4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit b9fdfb3fb3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

.gitmodules

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

cmake/QtIRCommandLineHelpers.cmake

@@ -59,7 +59,7 @@ endfunction()
 
 # Helper macro to parse the arguments for the command line options.
 macro(qt_ir_commandline_option_parse_arguments)
-    set(options UNSUPPORTED)
+    set(options UNSUPPORTED COMMON)
     set(oneValueArgs TYPE NAME SHORT_NAME ALIAS VALUE DEFAULT_VALUE)
     set(multiValueArgs VALUES MAPPING)
     cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
@@ -81,6 +81,7 @@ endmacro()
 #    same value when retrieved.
 #  DEFAULT_VALUE - the default value to be set for the option when it's not specified
 #    on the command line
+#  COMMON - the argument is common for init-repository and configure scripts
 #
 # NOTE: Make sure to update the SHORT_NAME code path when adding new options.
 function(qt_ir_commandline_option_helper name)
@@ -97,6 +98,14 @@ function(qt_ir_commandline_option_helper name)
     set(commandline_known_options
         "${commandline_known_options};${name}" PARENT_SCOPE)
 
+    if(arg_COMMON)
+        set(commandline_option_${name}_common "true" PARENT_SCOPE)
+        if(NOT "${arg_TYPE}" STREQUAL "boolean")
+            message(FATAL_ERROR "${name} is '${arg_TYPE}', but COMMON arguments can be"
+                " 'boolean' only.")
+        endif()
+    endif()
+
     set(commandline_option_${name}_type "${arg_TYPE}" PARENT_SCOPE)
 
     if(NOT "${arg_VALUE}" STREQUAL "")
@@ -137,7 +146,12 @@ macro(qt_ir_commandline_option name)
         AND "${commandline_option_${arg_SHORT_NAME}_type}" STREQUAL "")
         set(unsupported "")
         if(arg_UNSUPPORTED)
-            set(unsupported "${arg_UNSUPPORTED}")
+            set(unsupported "UNSUPPORTED")
+        endif()
+
+        set(common "")
+        if(arg_COMMON)
+            set(common "COMMON")
         endif()
 
         qt_ir_commandline_option_helper("${arg_SHORT_NAME}"
@@ -148,6 +162,7 @@ macro(qt_ir_commandline_option name)
             MAPPING ${arg_MAPPING}
             DEFAULT_VALUE ${arg_DEFAULT_VALUE}
             ${unsupported}
+            ${common}
         )
     endif()
 endmacro()
@@ -323,6 +338,9 @@ function(qt_ir_process_args_from_optfile optfile_path)
                 qt_ir_append_unknown_args("${arg}")
                 continue()
             endif()
+        elseif(commandline_option_${opt}_common AND arg_IGNORE_UNKNOWN_ARGS)
+            message(DEBUG "Common command line option '${arg}'. Collecting.")
+            qt_ir_append_unknown_args("${arg}")
         endif()
 
         if(NOT COMMAND "qt_ir_commandline_${type}")

cmake/QtIROptionsHelpers.cmake

@@ -29,7 +29,7 @@ macro(qt_ir_set_known_command_line_options)
     qt_ir_commandline_option(quiet SHORT_NAME q TYPE boolean)
     qt_ir_commandline_option(resolve-deps TYPE boolean DEFAULT_VALUE yes)
     qt_ir_commandline_option(update TYPE boolean DEFAULT_VALUE yes)
-    qt_ir_commandline_option(verbose TYPE boolean)
+    qt_ir_commandline_option(verbose TYPE boolean COMMON)
 
     # These are used when init-repository is called from configure.
     qt_ir_commandline_option(from-configure TYPE boolean)

coin/platform_configs/address_sanitizer_platforms.yaml

@@ -8,5 +8,5 @@ Configurations:
     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}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]

coin/platform_configs/cmake_platforms.yaml

@@ -14,7 +14,7 @@ Configurations:
     Compiler: 'GCC'
     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}}']
+    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
     Id: 'ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
@@ -23,7 +23,7 @@ Configurations:
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 # Test on Ubuntu 22.04 X11
 -
@@ -38,23 +38,28 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Sccache', 'TestOnly']
     Platform dependency: 'ubuntu-22.04'
-# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later
+# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
     Id: 'ubuntu-24.04-arm64'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
     ]
-# Test on Ubuntu 24.04 ARM64 X11
+# Test on Ubuntu 24.04 ARM64 offscreen
 -
-    Id: 'ubuntu-24.04-arm64-x11-tests'
+    Id: 'ubuntu-24.04-arm64-offscreen-tests'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['TestOnly', 'InsignificantTests']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'QT_QPA_OFFSCREEN_NO_GLX=1',
+        'QT_QPA_PLATFORM=offscreen'
+    ]
     Platform dependency: 'ubuntu-24.04-arm64'
 -
     Id: 'opensuse-15.5-developer-build'
@@ -65,7 +70,7 @@ Configurations:
     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}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 -
     Id: 'sles-15_sp5-static'
@@ -77,30 +82,6 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
--
-    Id: 'windows-10_22h2-msvc2019'
-    Template: 'qtci-windows-10_22H2-x86_64-51'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
-    Id: 'windows-11_23H2-msvc2019'
-    Template: 'qtci-windows-11_23H2-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
     Id: 'windows-10_22h2-msvc2022'
     Template: 'qtci-windows-10_22H2-x86_64-51'
@@ -118,7 +99,7 @@ Configurations:
     Template: 'qtci-windows-11_23H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20'
+    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
@@ -130,65 +111,12 @@ Configurations:
     Template: 'qtci-windows-11_22H2-aarch64-51'
     Compiler: 'MSVC2022'
     Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql'
+    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_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
--
-    Id: 'windows-10_22h2-msvc2019-developer-build'
-    Template: 'qtci-windows-10_22H2-x86_64-51'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
-    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: 'windows-10_22h2-msvc2019-arm64'
-    Template: 'qtci-windows-10_22H2-x86_64-51'
-    Compiler: 'MSVC2019'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'UseConfigure']
-    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
-        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
--
-    Id: 'windows-11_23H2-msvc2019-developer-build'
-    Template: 'qtci-windows-11_23H2-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
-    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: 'windows-11_23H2-msvc2019-arm64'
-    Template: 'qtci-windows-11_23H2-x86_64-52'
-    Compiler: 'MSVC2019'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'UseConfigure']
-    Platform dependency: 'windows-11_23H2-msvc2019-developer-build'
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
     Id: 'rhel-8.8'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
@@ -197,7 +125,7 @@ Configurations:
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON'
     ]
 -
     Id: 'rhel-9.2'
@@ -207,7 +135,7 @@ Configurations:
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
+        '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
 -
@@ -227,6 +155,7 @@ Configurations:
     Features: ['Sccache', 'InsignificantTests', 'TestOnly']
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'QT_QPA_OFFSCREEN_NO_GLX=1',
         'QT_QPA_PLATFORM=offscreen'
     ]
     Platform dependency: 'debian-11.6-arm64'
@@ -241,7 +170,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}}'
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
     ]
 -
     Id: 'windows-10_22h2-mingw13'
@@ -256,19 +185,6 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
--
-    Id: 'windows-10_22h2-llvm'
-    Template: 'qtci-windows-10_22H2-x86_64-51'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
-    Environment variables: [
-        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
-    ]
 -
     Id: 'windows-11_23H2-llvm'
     Template: 'qtci-windows-11_23H2-x86_64-52'
@@ -282,19 +198,6 @@ Configurations:
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
     ]
--
-    Id: 'windows-10_22h2-mingw13-developer-build'
-    Template: 'qtci-windows-10_22H2-x86_64-51'
-    Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    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}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
-    ]
 -
     Id: 'windows-11_23H2-mingw13-developer-build'
     Template: 'qtci-windows-11_23H2-x86_64-52'

coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml

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

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -12,7 +12,7 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
@@ -28,7 +28,7 @@ Configurations:
         'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
@@ -43,7 +43,7 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
@@ -59,7 +59,7 @@ Configurations:
     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}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
         'ANDROID_EMULATOR=emulator_x86_64_api_34'
     ]

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'rhel_8.8_android_multi'
+    Id: 'android-9-multi-abi'
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'multi'

coin/platform_configs/macos.yaml

@@ -60,27 +60,15 @@ Configurations:
 
     -
         Id: 'macos-12-arm64-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-12-arm64-tart-tests'
         Template: 'qtci-macos-12-arm-102'
         Compiler: 'Clang'
-        Features: ['TestOnly']
+        Features: ['TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-13-arm64-tart-tests'
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
-        Features: ['TestOnly']
+        Features: ['TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-14-arm64-tests'
@@ -93,12 +81,6 @@ Configurations:
 
     -
         Id: 'macos-12-arm-on-arm64-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-12-arm-on-arm64-tart-tests'
         Template: 'qtci-macos-12-arm-102'
         Compiler: 'Clang'
         Features: ['TestOnly']
@@ -154,24 +136,12 @@ Configurations:
     # Test on all supported macOS versions (deployment targets)
     -
         Id: 'macos-12-arm64-developer-build-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-14-arm64-developer-build'
-    -
-        Id: 'macos-12-arm64-tart-developer-build-tests'
         Template: 'qtci-macos-12-arm-102'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-14-arm64-developer-build'
     -
         Id: 'macos-13-arm64-developer-build-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-14-arm64-developer-build'
-    -
-        Id: 'macos-13-arm64-tart-developer-build-tests'
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
         Features: ['TestOnly']

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

@@ -6,7 +6,7 @@ Configurations:
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON'

coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 # cmake_platforms.yaml
-# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later
+# Build on Ubuntu 24.04 ARM64 Wayland and test on both offscreen and Wayland later
 -
     Id: 'ubuntu-24.04-arm64-documentation'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
@@ -9,10 +9,14 @@ Configurations:
     Features: ['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}}']
-# Test on Ubuntu 24.04 ARM64 X11
+# Test on Ubuntu 24.04 ARM64 offscreen
 -
-    Id: 'ubuntu-24.04-arm64-documentation-x11-tests'
+    Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['TestDocs', 'TestOnly', 'InsignificantTests']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'QT_QPA_PLATFORM=offscreen'
+    ]
     Platform dependency: 'ubuntu-24.04-arm64-documentation'

coin/platform_configs/precheck.yaml

@@ -9,7 +9,7 @@ Include: [
     "ios-universal"
   ],
   macos.yaml: [
-    "macos-12-x86_64-tests",
+    "macos-14-x86_64-tests",
   ],
   cmake_platforms_target_android.yaml: [
     "android-arm64-on-macos"

coin/platform_configs/qt-creator.yaml

@@ -15,13 +15,6 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
     Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
--
-    Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
-    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
 -
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'
@@ -29,7 +22,7 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-macos-12-x86_64-106'
+    Template: 'qtci-macos-14-arm-106'
     Compiler: 'Clang'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''

coin/platform_configs/qtbase.yaml

@@ -7,7 +7,7 @@ Include: [
     address_sanitizer_platforms.yaml,
     linux_android_tests_multi_abi.yaml,
     wasm_qtbase_tests.yaml,
-    cmake_platforms_qemu_vxworks.yaml,
+    cmake_platforms_qemu_vxworks_buildtest.yaml,
     qtlite.yaml,
     qtbase-new-compiler-testing.yaml
 ]

coin/platform_configs/qtwayland.yaml

@@ -17,6 +17,13 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-22.04'
+# Test on Ubuntu 24.04 ARM64 Wayland
+-
+    Id: 'ubuntu-24.04-arm64-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-arm64'
 # Test on Debian-11.6 Wayland
 -
     Id: 'debian-11.6-arm64-wayland-tests'

coin/platform_configs/tqtc-android-automotive.yaml

@@ -18,7 +18,7 @@ Include: [
 ]
 Configurations:
 -
-    Id: "automotive-android-13-x86_64-on-linux"
+    Id: "automotive-android-14-x86_64-on-linux"
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
@@ -31,7 +31,7 @@ Configurations:
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33'
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
     ]
 -
     Id: "automotive-android-10-x86_64-on-linux"

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

@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.gradle_project"
-        minSdk 23
+        minSdk 28
         targetSdk 34
         versionCode 1
         versionName "1.0"
@@ -21,6 +21,7 @@ android {
 }
 
 dependencies {
+    implementation libs.core
     implementation libs.appcompat
     implementation libs.material
 }

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

@@ -1,10 +1,12 @@
 [versions]
-agp = "7.4.1"
+agp = "8.4.0"
+core = "1.13.1"
 appcompat = "1.6.1"
 material = "1.11.0"
 constraintlayout = "2.1.4"
 
 [libraries]
+core = { group = 'androidx.core', name = "core", version.ref = "core" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }

coin/provisioning/common/linux/android_linux.sh

@@ -39,9 +39,9 @@ android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
 android14SystemPath="$basePath/$android14SystemZipName"
 
 # Android Automotive max SDK level image
-sdkApiLevelAutomotiveMax="android-33"
+sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
-androidAutomotiveMaxSha="b020a938ec46af2510047284406e9bed608cad03"
+androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519"
 # Android Automotive min SDK level image
 sdkApiLevelAutomotiveMin="android-29"
 androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
@@ -125,7 +125,7 @@ SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
 # shellcheck disable=SC2129
-cat <<EOB >>~/versions.txt
+cat >>~/versions.txt <<EOB
 Android SDK tools = $toolsVersion
 Android SDK Build Tools = $sdkBuildToolsVersion
 Android SDK API level = $sdkApiLevel
@@ -168,7 +168,7 @@ echo "Install maximum supported SDK level image for Android Automotive $sdkApiLe
 DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
     "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
 sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -C "$sdkTargetFolder/system-images"
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_33 -c 2048M -f \
+echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_34 -c 2048M -f \
     -k "system-images;${sdkApiLevelAutomotiveMax};android-automotive;x86_64"
 
 echo "Install minimum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMin"
@@ -193,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="0d91cc866f2799d56911bcdadabebb137eafcea8"
+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/fix-bwrap-apparmor.sh

@@ -0,0 +1,22 @@
+#!/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
+
+# See https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
+# and https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/2046844/comments/89
+sudo bash -c 'cat > /etc/apparmor.d/bwrap' << EOF
+# This profile allows everything and only exists to give the
+# application a name instead of having the label "unconfined"
+
+abi <abi/4.0>,
+include <tunables/global>
+
+profile bwrap /usr/bin/bwrap flags=(unconfined) {
+  userns,
+
+  # Site-specific additions and overrides. See local/README for details.
+  include if exists <local/bwrap>
+}
+EOF
+
+sudo apparmor_parser -r /etc/apparmor.d/bwrap

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

@@ -0,0 +1,26 @@
+#!/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
+
+
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+patchelf_version="0.18.0"
+
+url_cached="http://ci-files01-hki.ci.qt.io/input/patchelf/$patchelf_version.tar.gz"
+url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz"
+sha1="7eb974172de73b7b452ee376237ad78601603c45"
+
+target_source_dir="$HOME/patchelf-$patchelf_version"
+
+if [ ! -d "$target_source_dir" ]; then
+   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" ""
+fi
+
+pushd "$target_source_dir"
+
+./bootstrap.sh
+./configure
+make
+sudo make install
+
+popd

coin/provisioning/common/macos/disable_spotlight.sh

@@ -2,10 +2,29 @@
 # Copyright (C) 2017 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
 
-# Disable spotlight and and stop indexing
-sudo mdutil -a -i off
-sudo mdutil -a -i off /
-# Disable spotlight indexing /Volumes
-sudo mdutil -i off /Volumes
-# Erase spotlight index
-sudo mdutil -E /
+disableSpotlight() {
+    # Disable spotlight and and stop indexing
+    sudo mdutil -a -i off
+    sudo mdutil -a -i off /
+    # Disable spotlight indexing /Volumes
+    sudo mdutil -i off /Volumes
+    # Erase spotlight index
+    sudo mdutil -E /
+}
+
+# Disabling spotlight tends to be flaky, add some retry
+for i in $(seq 1 5)
+do
+    disableSpotlight
+    res=$?
+    if [[ $res -eq 0 ]]
+    then
+        echo "Spotlight disabled"
+        break
+    else
+        echo "Failed to disable spotlight, $i retry..."
+        sleep 2
+    fi
+done
+
+exit $res

coin/provisioning/common/macos/python3.sh

@@ -26,6 +26,7 @@ echo "Configure pip"
 /Library/Frameworks/Python.framework/Versions/3.9/bin/pip config --user set global.extra-index-url https://pypi.org/simple/
 
 /Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install virtualenv wheel html5lib
+/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/sbom_requirements.txt
 
 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"

coin/provisioning/common/macos/sccache.sh

@@ -6,7 +6,12 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
-targetArch=x86_64-apple-darwin
 targetVersion=0.2.14
-sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+if [[ `arch` == arm* ]]; then
+    targetArch=aarch64-apple-darwin
+    sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
+else
+    targetArch=x86_64-apple-darwin
+    sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+fi
 installSccache "$targetArch" "$targetVersion" "$sha1"

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

@@ -1,5 +1,5 @@
 set(CMAKE_SYSTEM_NAME QNX)
-set(CMALE_SYSTEM_PROCESSOR armv7le)
+set(CMAKE_SYSTEM_PROCESSOR armle-v7)
 
 if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh

@@ -0,0 +1,50 @@
+#!/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 -x
+
+lib_dir="$1/lib"
+additional_suffix="${2:-}"
+set_rpath="${3:-yes}"
+
+if uname -a |grep -q "Darwin"; then
+    readelf() {
+        /usr/local/opt/binutils/bin/readelf "$@"
+    }
+fi
+
+ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
+
+for lib_name in "${ffmpeg_libs[@]}"; do
+    lib_path="$lib_dir/lib$lib_name.so"
+    pkg_config_file_path="$lib_dir/pkgconfig/lib$lib_name.pc"
+
+    if [ ! -f "$lib_path" ]; then
+        echo "FFmpeg lib $lib_path hasn't been found"
+        exit 1
+    fi
+
+    if [ ! -f "$pkg_config_file_path" ]; then
+        echo "FFmpeg pc file $pkg_config_file_path hasn't been found"
+        exit 1
+    fi
+
+    while read -r line; do
+        if [[ $line =~ .*\[(lib((ssl|crypto|va|va-x11|va-drm)(_3)?\.so(\.[0-9]+)*))\].* ]]; then
+            stub_name="libQt6FFmpegStub-${BASH_REMATCH[2]}"
+            if [[ ${BASH_REMATCH[4]} == "_3" ]]; then
+                stub_name="${stub_name/_3/}"  # Remove "_3" from stub_name
+            fi
+            if [[ -n "$additional_suffix" ]]; then
+                stub_name="${stub_name%%.*}${additional_suffix}.${stub_name#*.}" # Add additional_suffix
+            fi
+            patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" $lib_path
+        fi
+    done <<< "$(readelf -d $lib_path | grep '(NEEDED)' )"
+
+    sed -i.bak -E '/^Libs.private:/s/ -l(va|va-x11|va-drm|ssl|crypto)/ -lQt6FFmpegStub-\1/g;' $pkg_config_file_path && rm -f ${pkg_config_file_path}.bak
+    if [[ "$set_rpath" == "yes" ]]; then
+        patchelf --set-rpath '$ORIGIN' $lib_path
+    fi
+done

coin/provisioning/common/shared/sbom_requirements.txt

@@ -0,0 +1,5 @@
+# Python packages used to validate and audit Qt SBOM informaiton
+spdx-tools>=0.8.0
+ntia-conformance-checker
+sbomaudit
+sbom2doc

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

@@ -2,7 +2,7 @@
 # Copyright (C) 2022 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 will build and install FFmpeg static libs
+# This script will build and install FFmpeg shared libs
 set -ex
 os="$1"
 
@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n6.1.1"
+version="n7.0"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
+sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -30,28 +30,36 @@ build_ffmpeg_android() {
 
   target_arch=$1
   target_dir=$2
+  shared="${3:-no}"
 
   sudo mkdir -p "$target_dir"
 
   openssl_include="$OPENSSL_ANDROID_HOME_DEFAULT/include"
   openssl_libs=""
+  libs_prefix=""
   if [ "$target_arch" == "x86_64" ]; then
     target_toolchain_arch="x86_64-linux-android"
     target_arch=x86_64
     target_cpu=x86-64
     openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64"
+    libs_prefix="_x86_64"
   elif [ "$target_arch" == "x86" ]; then
     target_toolchain_arch="i686-linux-android"
     target_arch=x86
     target_cpu=i686
     openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86"
+    libs_prefix="_x86"
   elif [ "$target_arch" == "arm64" ]; then
     target_toolchain_arch="aarch64-linux-android"
     target_arch=aarch64
     target_cpu=armv8-a
     openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/arm64-v8a"
+    libs_prefix="_arm64-v8a"
   fi
 
+  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
 
   ndk_root=$ANDROID_NDK_ROOT_DEFAULT
@@ -71,6 +79,9 @@ build_ffmpeg_android() {
 
   ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
   ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
+  if [[ "$shared" == "yes" ]]; then
+      ffmpeg_config_options+=" --enable-shared --disable-static"
+  fi
   ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
   ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
   ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}"
@@ -83,6 +94,15 @@ build_ffmpeg_android() {
   sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$target_dir"
 
   sudo make install -j4
+
+  rm -f "${openssl_libs}/libcrypto.so"
+  rm -f "${openssl_libs}/libssl.so"
+
+  if [[ "$shared" == "yes" ]]; then
+      fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
+      sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no"
+  fi
+
   popd
 }
 
@@ -103,4 +123,4 @@ elif  [ "$os" == "android-arm64" ]; then
   SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir"
 fi
 
-build_ffmpeg_android "$target_arch" "$target_dir"
+build_ffmpeg_android "$target_arch" "$target_dir" "yes"

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

@@ -10,8 +10,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n6.1.1"
-sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
+version="n7.0"
+sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
@@ -61,6 +61,9 @@ build_ffmpeg_ios() {
   --extra-cflags="$minos" \
   --extra-cxxflags="$minos" \
   --enable-cross-compile \
+  --enable-shared \
+  --disable-static \
+  --install-name-dir='@rpath/Frameworks' \
   --enable-swscale \
   --enable-pthreads \
   --disable-audiotoolbox
@@ -69,8 +72,37 @@ build_ffmpeg_ios() {
   popd
 }
 
+install_ffmpeg() {
+    for dir in "$@"; do
+        echo "Processing files in $dir ..."
+        pushd "$dir" >/dev/null
+        find . -type l -name '*.*.dylib' | while read -r f; do
+            dst="${f:1}"
+            dstdir="$(dirname "$dst")"
+            sudo mkdir -p "$dstdir"
+
+            if [[ ! -f "$dst" ]]; then
+                echo "<Copying $dir/$f to $dst"
+                sudo cp -c "$f" "$dst"
+                symlinkname="$(tmp=${f/*\/}; echo ${tmp/\.*}).dylib"
+                sudo ln -s "$(basename -- "$f")" $dstdir/"$symlinkname"
+            elif lipo -info "$f" >/dev/null 2>&1; then
+                echo "Lipoing $dir/$f into $dst"
+                sudo lipo -create -output "$dst" "$dst" "$f"
+            elif ! diff "$f" "$dst"; then
+                echo "Error: File $f in $dir doesn't match destination $dst"
+                exit 1
+            fi
+        done
+        echo "LS"
+        popd >/dev/null
+    done
+    sudo cp -r $1$prefix/include $prefix
+    echo "LS done."
+}
+
 build_ffmpeg_ios "x86_64"
 build_ffmpeg_ios "arm64"
-sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
-SetEnvVar "FFMPEG_DIR_IOS" $prefix
 
+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

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n6.1.1"
+version="n7.0"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
-sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
+sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"
 
@@ -71,11 +71,26 @@ build_ffmpeg() {
 }
 
 if [ "$os" == "linux" ]; then
+  build_type="$2"
+
   install_ff_nvcodec_headers
 
   ffmpeg_config_options+=" --enable-openssl"
+
+  if [ "$build_type" != "static" ]; then
+    ffmpeg_config_options+=" --enable-shared --disable-static"
+  fi
+
   build_ffmpeg
-  sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
+
+  output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name"
+
+  if [ "$build_type" != "static" ]; then
+    fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
+    "$fix_dependencies" "$output_dir"
+  fi
+
+  sudo mv "$output_dir" "/usr/local"
   SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
 
 elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
@@ -111,3 +126,5 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
 
   SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
 fi
+
+

coin/provisioning/common/unix/mqtt_broker.sh

@@ -8,10 +8,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-CommitSHA="2873885d7e840b4e06483f36f170c609eb30527d"
+CommitSHA="9d7bb80bb8b9d9cfc0b52f8cb4c1916401281103"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="1fcc4e61b12f11a1421cc8c3f379276d732e62b7"
+SHA1="c31cfd5de9329dcd25e28b306f94dccf632cc318"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"
 

coin/provisioning/common/windows/helpers.ps1

@@ -297,13 +297,52 @@ function DeleteSchedulerTask {
     SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F
 }
 
-function GetVSPath {
+function GetVsProperty {
     Param (
-        [string]$VSWhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe",
-        [string]$Component = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
+        [string]$Component = 'Microsoft.VisualStudio.Component.VC.CoreIde',
+        [string]$Property,
+        [switch]$Latest
     )
 
-    return (& $VSWhere -nologo -latest -products * -requires $Component -property installationPath)
+    $vsWhereProcessInfo = New-Object System.Diagnostics.ProcessStartInfo
+    $vsWhereProcessInfo.FileName = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+    $vsWhereProcessInfo.RedirectStandardError = $true
+    $vsWhereProcessInfo.RedirectStandardOutput = $true
+    $vsWhereProcessInfo.UseShellExecute = $false
+
+    # -sort: sorts the instances from newest version and last installed to oldest
+    $vsWhereProcessInfo.Arguments = " -nologo -sort -products * -requires $Component -property $Property"
+    if ($Latest) {
+        # -latest: return only the newest version and last installed
+        $vsWhereProcessInfo.Arguments += ' -latest'
+    }
+
+    $vsWhereProcess = New-Object System.Diagnostics.Process
+    $vsWhereProcess.StartInfo = $vsWhereProcessInfo
+
+    $vsWhereProcess.Start() | Out-Null
+    $vsWhereProcess.WaitForExit()
+
+    $standardOutput = $vsWhereProcess.StandardOutput.ReadToEnd()
+    if ([string]::IsNullOrEmpty($standardOutput)) {
+        throw "vswhere could not find property '$Property'"
+    }
+
+    $exitCode = $vsWhereProcess.ExitCode
+    if ($exitCode -ne 0) {
+        $standardError = $vsWhereProcess.StandardError.ReadToEnd()
+        throw "vswhere failed with exit code $exitCode ($standardError)"
+    }
+
+    return $standardOutput.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries) | Select-Object -Last 1
+}
+
+function GetVsInstallationPath {
+    Param (
+        [switch]$Latest
+    )
+
+    return GetVsProperty -Property 'installationPath' @PSBoundParameters
 }
 
 function EnterVSDevShell {
@@ -312,13 +351,11 @@ function EnterVSDevShell {
         [string]$Arch = "amd64"
     )
 
-    $vsWere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
-    $vcComponent = "Microsoft.VisualStudio.Component.VC.CoreIde"
     # We pick the oldest build tools we can find and use that to be compatible with it and any newer version:
     # If MSVC has an ABI break this will stop working, and yet another build must be added.
-    $VSPath = (& $vsWere -nologo -products * -requires $vcComponent -sort -format value -property installationPath | Select-Object -Last 1)
+    $VSPath = GetVsInstallationPath
 
-    Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch)"
+    Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch -VsInstallPath='$VSPath')"
     try {
         Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
         Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo"

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

@@ -6,12 +6,28 @@
 # This script will install Dependency Walker 2.2.6000
 
 $version = "2.2.6000"
-if (Is64BitWinHost) {
-    $arch = "_x64"
-    $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
-} else {
-    $arch = "_x86"
-    $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9"
+$cpu_arch = Get-CpuArchitecture
+switch ($cpu_arch) {
+    x64 {
+        $arch = "_x64"
+        $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
+        $nuitka_arch = "x86_64"
+    }
+    arm64 {
+        # There is no ARM64 version of Dependency Walker
+        # just use the x64 version
+        $arch = "_x64"
+        $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
+        $nuitka_arch = "arm64"
+    }
+    x86 {
+        $arch = "_x86"
+        $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9"
+        $nuitka_arch = "x86"
+    }
+    default {
+        throw "Unknown architecture $cpu_arch"
+    }
 }
 $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\depends22" + $arch + ".zip"
 $url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip"
@@ -28,7 +44,7 @@ Extract-7Zip $dependsPackage $TARGETDIR
 
 # Copy the content also into the cache location of nuitka
 # This makes it usable without the need to download it again
-Copy-Item -Path $TARGETDIR -Destination "$env:LOCALAPPDATA\Nuitka\Nuitka\Cache\downloads\depends\x86_64" -Recurse
+Copy-Item -Path $TARGETDIR -Destination "$env:LOCALAPPDATA\Nuitka\Nuitka\Cache\downloads\depends\$nuitka_arch" -Recurse
 
 Write-Host "Cleaning $dependsPackage.."
 Remove "$dependsPackage"

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

@@ -6,9 +6,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
 
-$version = "n6.1.1"
+$version = "n7.0"
 $ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "7AECCED8A0366BE407329B4E176167534233DA12"
+$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843"
 
 $url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip"
 $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
@@ -22,11 +22,16 @@ Verify-Checksum $download_location $sha1
 Extract-7Zip $download_location $unzip_location
 Remove $download_location
 
-$config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
-Write-Host "FFmpeg configuration $config"
+function GetFfmpegDefaultConfiguration {
+    $defaultConfiguration = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
+    Write-Host "FFmpeg default configuration: $defaultConfiguration"
+
+    return $defaultConfiguration
+}
 
 function InstallFfmpeg {
     Param (
+        [string]$config,
         [string]$buildSystem,
         [string]$msystem,
         [string]$additionalPath,
@@ -35,19 +40,25 @@ function InstallFfmpeg {
         [bool]$shared
     )
 
-    Write-Host "Configure and compile ffmpeg for $buildSystem"
+    Write-Host "Configure and compile FFmpeg for $buildSystem with configuration: $config"
 
     $oldPath = $env:PATH
 
-    if ($additionalPath) { $env:PATH = "$additionalPath;$env:PATH" }
+    if ($additionalPath) {
+        $env:PATH = "$additionalPath;$env:PATH"
+    }
     $env:MSYS2_PATH_TYPE = "inherit"
     $env:MSYSTEM = $msystem
 
     $cmd = "cd /c/$ffmpeg_name"
     $cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem"
     $cmd += " && ../../configure --prefix=installed $config"
-    if ($toolchain) { $cmd += " --toolchain=$toolchain" }
-    if ($shared) { $cmd += " --enable-shared --disable-static" }
+    if ($toolchain) {
+        $cmd += " --toolchain=$toolchain"
+    }
+    if ($shared) {
+        $cmd += " --enable-shared --disable-static"
+    }
     $cmd += " && make install -j"
 
     Write-Host "MSYS cmd:"
@@ -57,7 +68,7 @@ function InstallFfmpeg {
     $env:PATH = $oldPath
 
     if ($buildResult.ExitCode) {
-        Write-Host "Failed to build ffmpeg for $buildSystem"
+        Write-Host "Failed to build FFmpeg for $buildSystem"
         return $false
     }
 
@@ -66,8 +77,9 @@ function InstallFfmpeg {
 }
 
 function InstallMingwFfmpeg {
+    $config = GetFfmpegDefaultConfiguration
     $mingwPath = [System.Environment]::GetEnvironmentVariable("MINGW_PATH", [System.EnvironmentVariableTarget]::Machine)
-    return InstallFfmpeg -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW" -shared $true
+    return InstallFfmpeg -config $config -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW" -shared $true
 }
 
 
@@ -80,7 +92,7 @@ function InstallMsvcFfmpeg {
     $buildSystem = "msvc"
     $ffmpegDirEnvVar = "FFMPEG_DIR_MSVC"
 
-    $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
+    $config = GetFfmpegDefaultConfiguration
 
     if ($isArm64) {
         $arch = "arm64"
@@ -94,7 +106,7 @@ function InstallMsvcFfmpeg {
         return $false
     }
 
-    $result = InstallFfmpeg -buildSystem $buildSystem -msystem "MSYS" -toolchain "msvc" -ffmpegDirEnvVar $ffmpegDirEnvVar -shared $true
+    $result = InstallFfmpeg -config $config -buildSystem $buildSystem -msystem "MSYS" -toolchain "msvc" -ffmpegDirEnvVar $ffmpegDirEnvVar -shared $true
 
     if ($result) {
         # As ffmpeg build system creates lib*.a file we have to rename them to *.lib files to be recognized by WIN32
@@ -117,11 +129,12 @@ function InstallMsvcFfmpeg {
 
 
 function InstallLlvmMingwFfmpeg {
-    return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin" -shared $true
+    $config = GetFfmpegDefaultConfiguration
+    return InstallFfmpeg -config $config -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin" -shared $true
 }
 
 function InstallAndroidArmv7 {
-
+    $shared=$true
     $target_toolchain_arch="armv7a-linux-androideabi"
     $target_arch="armv7-a"
     $target_cpu="armv7-a"
@@ -143,14 +156,49 @@ function InstallAndroidArmv7 {
     $openssl_path = [System.Environment]::GetEnvironmentVariable("OPENSSL_ANDROID_HOME_DEFAULT", [System.EnvironmentVariableTarget]::Machine)
     $openssl_path = $openssl_path.Replace("\", "/")
 
-    $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
+    New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libcrypto.so -Target ${openssl_path}/armeabi-v7a/libcrypto_3.so
+    New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libssl.so -Target ${openssl_path}/armeabi-v7a/libssl_3.so
+
+    $config = GetFfmpegDefaultConfiguration
     $config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
     $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
     $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
     $config += " --extra-cflags=-I$envOPENSSL_ANDROID_HOME_DEFAULT/include --extra-ldflags=-L$env:OPENSSL_ANDROID_HOME_DEFAULT/armeabi-v7a"
     $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a"
+    $config += " --strip=$strip"
 
-    return InstallFfmpeg -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7"
+
+    $result= InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7" -shared $shared
+
+    Remove-Item -Path ${openssl_path}/armeabi-v7a/libcrypto.so
+    Remove-Item -Path ${openssl_path}/armeabi-v7a/libssl.so
+
+    if (-not $shared) {
+        return $result
+    }
+
+    # For Shared ffmpeg we need to change dependencies to stubs
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm binutils`"")
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm autoconf`"")
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm automake`"")
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"")
+
+    $patchelf_sha1 = "7EB974172DE73B7B452EE376237AD78601603C45"
+    $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.18.0.tar.gz"
+    $patchelf_download_location = "C:\Windows\Temp\0.18.0.tar.gz"
+
+    Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location
+    Verify-Checksum $patchelf_download_location $patchelf_sha1
+    Extract-tar_gz $patchelf_download_location $unzip_location
+    Remove $patchelf_download_location
+
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.18.0 && ./bootstrap.sh && ./configure && make install`"")
+
+    $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh C:/${ffmpeg_name}/build/android-arm/installed/ _armeabi-v7a no"
+    $command = $command.Replace("\", "/")
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"")
+
+    return $result
 }
 
 $mingwRes = InstallMingwFfmpeg

coin/provisioning/common/windows/mimersql.ps1

@@ -16,7 +16,7 @@ $mimer_dir="c:\MimerSQL"
 
 Download $url_official $url_cache $mimersqlPackage
 Verify-Checksum $mimersqlPackage $sha1
-Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive"
+Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive ExcludeDbVisualizer=1 ExcludeJava=1 ExcludeServer=1 ExcludeDocumentation=1 ExcludeReplication=1"
 
 Set-EnvironmentVariable "MIMERSQL_DEV_ROOT" "$mimer_dir\dev"
 

coin/provisioning/common/windows/mqtt_broker.ps1

@@ -5,8 +5,8 @@
 
 Write-Host "MQTT: Downloading Paho test broker..."
 $zip = Get-DownloadLocation "pahotest.zip"
-$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e"
-$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233"
+$commitSHA = "9d7bb80bb8b9d9cfc0b52f8cb4c1916401281103"
+$sha1 = "c31cfd5de9329dcd25e28b306f94dccf632cc318"
 
 $internalUrl = "http://ci-files01-hki.ci.qt.io/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip"
 $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip"

coin/provisioning/common/windows/python3.ps1

@@ -78,6 +78,12 @@ 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.8.
+# ntia-conformance-checker requires at least 3.8
+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"
+}
+
 # Install PyPDF2 for QSR documentation
 Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2"
 

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

@@ -78,9 +78,17 @@ installPackages+=(libasound2-dev)
 installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(gstreamer1.0-libav)
+installPackages+=(gstreamer1.0-plugins-base)
+installPackages+=(gstreamer1.0-plugins-good)
+installPackages+=(gstreamer1.0-plugins-bad)
+installPackages+=(gstreamer1.0-plugins-rtp)
+installPackages+=(gstreamer1.0-plugins-ugly)
 installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
+installPackages+=(libpipewire-0.3-dev)
+installPackages+=(libspa-0.2-dev)
 
 ## Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 #installPackages+=(g++-multilib)
@@ -250,6 +258,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install cmake apt-cacher-ng -t
 # Disable keyring password prompt
 keyring --disable
 
+pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
+
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
 #OpenSSLVersion="$(openssl version |cut -b 9-14)"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh

@@ -0,0 +1,5 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh"

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh

@@ -0,0 +1,5 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh"

coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh

@@ -0,0 +1,5 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh"

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

@@ -57,6 +57,8 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
+# pipewire for QtMultimedia
+installPackages+=(pipewire-devel)
 # for QtMultimedia, ffmpeg
 installPackages+=(yasm)
 installPackages+=(libva-devel)
@@ -164,9 +166,11 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/
 sudo pip3 install virtualenv wheel
 # Just make sure we have virtualenv to run with python3.8 -m virtualenv
 sudo python3.11 -m pip install virtualenv wheel
+sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
 sudo /usr/bin/pip3 install wheel
 sudo /usr/bin/pip3 install dataclasses
+# No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8
 
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh

@@ -0,0 +1,5 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh"

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh

@@ -2,6 +2,7 @@
 #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
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+# TODO: investigate why the FFmpeg plugin can't find shared FFmpeg on rhel-8.8
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh

@@ -0,0 +1,5 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh"

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

@@ -62,6 +62,8 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
+# pipewire for QtMultimedia
+installPackages+=(pipewire-devel)
 # yasm for QtMultimedia
 installPackages+=(yasm)
 # gtk3 style for QtGui/QStyle
@@ -176,8 +178,10 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/
 sudo pip3 install virtualenv wheel
 # Just make sure we have virtualenv to run with python3.8 -m virtualenv
 sudo python -m pip install virtualenv wheel
+sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
 sudo /usr/bin/pip3 install wheel
+sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
 # Make FindPython3.cmake to find python3
 sudo ln -s /usr/bin/python3 /usr/local/bin/python3

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh

@@ -0,0 +1,5 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh"

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh

@@ -18,9 +18,9 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
 export PACKAGE_NAME="python"
 python2Version="2.7.18"
-python3Version="3.8.16"
+python3Version="3.12.3"
 python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b"
-python3Sha="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"
+python3Sha="56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1"
 
 
 function InstallPython {

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh

@@ -18,9 +18,9 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
 export PACKAGE_NAME="python"
 python2Version="2.7.18"
-python3Version="3.8.16"
+python3Version="3.12.3"
 python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b"
-python3Sha="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"
+python3Sha="56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1"
 
 
 function InstallPython {
@@ -71,6 +71,7 @@ python3 --version | grep -F "$python3Version"
 
 pip3 install --user wheel
 pip3 install --user virtualenv
+pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh

@@ -2,4 +2,4 @@
 # 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
 
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

@@ -80,6 +80,12 @@ installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(gstreamer1.0-libav)
+installPackages+=(gstreamer1.0-plugins-base)
+installPackages+=(gstreamer1.0-plugins-good)
+installPackages+=(gstreamer1.0-plugins-bad)
+installPackages+=(gstreamer1.0-plugins-rtp)
+installPackages+=(gstreamer1.0-plugins-ugly)
 installPackages+=(yasm)
 installPackages+=(libva-dev)
 # for QtMultimedia streaming tests
@@ -162,6 +168,8 @@ installPackages+=(ruby)
 installPackages+=(libxslt1-dev)
 installPackages+=(libxml2-dev)
 installPackages+=(libhyphen-dev)
+# Fix dependencies in shared ffmpeg libs
+installPackages+=(patchelf)
 
 echo "Running update for apt"
 waitLoop

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh

@@ -96,6 +96,12 @@ installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(gstreamer1.0-libav)
+installPackages+=(gstreamer1.0-plugins-base)
+installPackages+=(gstreamer1.0-plugins-good)
+installPackages+=(gstreamer1.0-plugins-bad)
+installPackages+=(gstreamer1.0-plugins-rtp)
+installPackages+=(gstreamer1.0-plugins-ugly)
 installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
@@ -132,8 +138,8 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
-#Java 11 for Android
-installPackages+=(openjdk-11-jdk)
+#Java 17 for Android
+installPackages+=(openjdk-17-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
@@ -211,6 +217,8 @@ sudo dpkg --add-architecture i386
 installPackages+=(nfs-kernel-server)
 installPackages+=(net-tools)
 installPackages+=(bridge-utils)
+# Fix dependencies in shared ffmpeg libs
+installPackages+=(patchelf)
 
 echo "Running update for apt"
 waitLoop

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh

@@ -98,8 +98,16 @@ installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
 installPackages+=(libgstreamer-gl1.0-0)
+installPackages+=(gstreamer1.0-libav)
+installPackages+=(gstreamer1.0-plugins-base)
+installPackages+=(gstreamer1.0-plugins-good)
+installPackages+=(gstreamer1.0-plugins-bad)
+installPackages+=(gstreamer1.0-plugins-rtp)
+installPackages+=(gstreamer1.0-plugins-ugly)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
+installPackages+=(libpipewire-0.3-dev)
+installPackages+=(libspa-0.2-dev)
 installPackages+=(yasm)
 installPackages+=(libva-dev)
 # for QtMultimedia streaming tests
@@ -134,8 +142,8 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
-#Java 11 for Android
-installPackages+=(openjdk-11-jdk)
+#Java 17 for Android, needed by RTA
+installPackages+=(openjdk-17-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)
@@ -227,6 +235,8 @@ installPackages+=(uml-utilities)
 # used for reading vcpkg packages version, from vcpkg.json
 installPackages+=(jq)
 
+installPackages+=(patchelf)
+
 echo "Running update for apt"
 waitLoop
 sudo apt-get update
@@ -237,6 +247,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins
 # Configure pip
 pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache
 pip config --user set global.extra-index-url https://pypi.org/simple/
+pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh

@@ -95,14 +95,24 @@ installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
+installPackages+=(gstreamer1.0-libav)
+installPackages+=(gstreamer1.0-plugins-base)
+installPackages+=(gstreamer1.0-plugins-good)
+installPackages+=(gstreamer1.0-plugins-bad)
+installPackages+=(gstreamer1.0-plugins-rtp)
+installPackages+=(gstreamer1.0-plugins-ugly)
 installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
+installPackages+=(libpipewire-0.3-dev)
+installPackages+=(libspa-0.2-dev)
 installPackages+=(yasm)
 installPackages+=(libva-dev)
 # for QtMultimedia streaming tests
 installPackages+=(vlc-bin)
 installPackages+=(vlc-plugin-base)
+# for tst_qfloat16format, see also QTQAINFRA-6390
+installPackages+=(locales-all)
 
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 #installPackages+=(g++-multilib)
@@ -111,6 +121,7 @@ installPackages+=(g++-multilib-powerpc-linux-gnu)
 # python3 development package
 installPackages+=(python3-dev)
 installPackages+=(python3-pip)
+installPackages+=(python3-venv)
 installPackages+=(virtualenv)
 installPackages+=(python3-wheel)
 installPackages+=(python-is-python3)
@@ -228,6 +239,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins
 # Configure pip
 pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache
 pip config --user set global.extra-index-url https://pypi.org/simple/
+# Ubuntu 24.04 comes with a newer pip that disallows installing into the system site-packages,
+# so we explicitly ask it to allow it.
+pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" --break-system-packages
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-fix-bwrap-apparmor.sh

@@ -0,0 +1,6 @@
+#!/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=../common/linux/fix-bwrap-apparmor.sh
+source "${BASH_SOURCE%/*}/../common/linux/fix-bwrap-apparmor.sh"

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh

@@ -49,7 +49,7 @@ sudo zypper -nq install libxml2-devel libxslt-devel
 sudo zypper -nq install yasm
 
 # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
-sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel
+sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel
 
 # cups
 sudo zypper -nq install cups-devel

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh

@@ -14,5 +14,6 @@ sudo zypper -nq install python-devel python-xml
 # install python3
 sudo zypper -nq install python311-base python311-devel python311-pip python311-virtualenv python311-wheel
 python3.11 -m pip install selenium netifaces scache webdriver-manager
+python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
 
 SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11"

coin/provisioning/qtci-macos-12-arm/01-set_tcc_permissions.sh

@@ -0,0 +1,6 @@
+#!/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/macos/set_tcc_permissions.sh"

coin/provisioning/qtci-macos-12-arm/25-python.sh

@@ -11,6 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 pyenv install 3.9.7
 
 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
+/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt
 
 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

coin/provisioning/qtci-macos-12-x86_64/27-binutils.sh

@@ -0,0 +1,10 @@
+#!/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
+
+# binutlis is installed with an error: The formula built, but is not symlinked into /usr/local
+# To avoid stopping the configuration due to this problem, "|| true" is added.
+brew install binutils || true
+

coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh

@@ -0,0 +1,8 @@
+#!/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
+
+brew install patchelf
+

coin/provisioning/qtci-macos-13-arm/01-set_tcc_permissions.sh

@@ -0,0 +1,6 @@
+#!/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/macos/set_tcc_permissions.sh"

coin/provisioning/qtci-macos-13-arm/25-python.sh

@@ -11,6 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 pyenv install 3.9.7
 
 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
+/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt
 
 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

coin/provisioning/qtci-macos-13-x86_64/27-binutils.sh

@@ -0,0 +1,10 @@
+#!/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
+
+# binutlis is installed with an error: The formula built, but is not symlinked into /usr/local
+# To avoid stopping the configuration due to this problem, "|| true" is added.
+brew install binutils || true
+

coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh

@@ -0,0 +1,8 @@
+#!/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
+
+brew install patchelf
+

coin/provisioning/qtci-macos-14-arm/25-python.sh

@@ -11,6 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 pyenv install 3.9.7
 
 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
+/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt
 
 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

coin/provisioning/qtci-windows-11_22H2-aarch64/08-python3.ps1

@@ -5,5 +5,5 @@
 #  - version
 #  - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
 
-# Downloading https://www.python.org/ftp/python/3.12.3/python-3.12.3-arm64.exe
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a7fe973fd406c0db2b982d83e9feb30f8fde704f" "C:\Python312_64" "3.12.3" $true
+# Downloading https://www.python.org/ftp/python/3.11.9/python-3.11.9-arm64.exe
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "9e0487af5f0472978b7b6d4f4d3d8fd56865ff97" "C:\Python311_64" "3.11.9" $true

coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-dependencywalker.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1"

coin/provisioning/qtci-windows-11_23H2-x86_64/40-qnx710.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\qnx710.ps1"