Update submodules on '6.8 in qt/qt5'

Change-Id: Ibc71f98d1ca5ad73da7dff2b3c2ed79aac7ff94e Reviewed-by: Qt Submodule Update Bot <[email protected]>
Add 'Packaging' -flag for ubuntu 22.04
2026-10-10 09:07:31 +08:00 · 2024-08-09 21:35:55 +00:00 · 2024-08-09 05:25:40 +00:00 · 2024-08-07 06:48:56 +00:00 · 2024-08-07 08:48:51 +02:00 · 2024-08-06 03:40:31 +00:00
88 changed files with 253 additions and 193 deletions
@@ -10,10 +10,13 @@
 # ==[ Footers: Uncomment and edit where applicable ]===================|
 #
 # One task per entry. Add a space after the colon.
-# Use Fixes to automatically close an issue, and Task-number to
-# reference it without further action.
-# You do not need both for the same issue.
+# Use Fixes to automatically close an issue, Reopens to automatically
+# reopen an issue, and Task-number to reference it without further
+# action.
+# You do not need to include Task-Number where Fixes or Reopens is
+# specified for the same issue.
 #Fixes: 
+#Reopens: 
 #Task-number: 
 #Coverity-Id: 
 #
@@ -19,7 +19,7 @@ Configurations:
    Id: 'ubuntu-22.04'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
    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',
@@ -43,7 +43,7 @@ Configurations:
    Id: 'ubuntu-24.04-arm64'
    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
-    Features: ['UseConfigure', 'DoNotRunTests']
+    Features: ['Packaging', '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 -qpa offscreen\;xcb'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
@@ -76,7 +76,7 @@ Configurations:
    Id: 'sles-15_sp5-static'
    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -static -no-sql-mysql'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
@@ -86,11 +86,11 @@ Configurations:
    Id: 'windows-10_22h2-msvc2022'
    Template: 'qtci-windows-10_22H2-x86_64-51'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    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}}\.. -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 -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
@@ -98,11 +98,11 @@ Configurations:
    Id: 'windows-11_23H2-msvc2022'
    Template: 'qtci-windows-11_23H2-x86_64-52'
    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
    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',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
@@ -110,28 +110,28 @@ Configurations:
    Id: 'windows-11_22h2-arm64-msvc2022'
    Template: 'qtci-windows-11_22H2-aarch64-51'
    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests']
+    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
+        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
    Id: 'rhel-8.8'
    Template: 'qtci-linux-RHEL-8.8-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
    ]
 -
    Id: 'rhel-9.2'
    Template: 'qtci-linux-RHEL-9.2-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
@@ -167,21 +167,21 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
    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}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -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'
    Template: 'qtci-windows-10_22H2-x86_64-51'
    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake 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}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
    ]
@@ -189,13 +189,13 @@ Configurations:
    Id: 'windows-11_23H2-llvm'
    Template: 'qtci-windows-11_23H2-x86_64-52'
    Compiler: 'Clang'
-    Features: ['Packaging','Sccache', 'UseConfigure']
+    Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    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',
        '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',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
    ]
 -
@@ -207,7 +207,7 @@ Configurations:
    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',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
    ]
@@ -41,7 +41,7 @@ Configurations:
    Target arch: 'mips64'
    Compiler: 'GCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
@@ -8,13 +8,13 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'QCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'QT_CMAKE_DIR=/opt/cmake-3.27.7/bin',
        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
    ]
 -
    Id: 'qnx-710-arm64-on-linux'
@@ -24,11 +24,11 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'QCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
    ]
 -
    Id: 'qnx-710-armv7-on-linux'
@@ -38,9 +38,9 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'QCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
    ]
@@ -8,11 +8,11 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis 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}} -DQT_DEPLOY_FFMPEG=TRUE -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 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
@@ -23,12 +23,12 @@ Configurations:
    Compiler: 'Mingw'
    Target compiler: 'Clang'
    Platform dependency: 'windows-10_22h2-mingw13'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        '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}} -DQT_DEPLOY_FFMPEG=TRUE -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 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
@@ -39,11 +39,11 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
        '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}} -DQT_DEPLOY_FFMPEG=TRUE -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 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
@@ -55,11 +55,11 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.8'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_34'
    ]
@@ -19,13 +19,13 @@ Configurations:
    Compiler: 'Mingw'
    Target compiler: 'Clang'
    Platform dependency: 'windows-10_22h2-mingw13'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include',
    ]
 -
    Id: 'webassembly-linux-thread'
@@ -33,10 +33,10 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'GCC'
    Platform dependency: 'opensuse-15.5-developer-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', '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 -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 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
    ]
@@ -13,5 +13,5 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=',
        'ANDROID_EMULATOR=emulator_x86_api_28']
@@ -12,11 +12,11 @@ Configurations:
        Template: 'qtci-macos-14-x86_64-105'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON',
+            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
        ]

@@ -5,7 +5,7 @@ Include: [
    "ubuntu-22.04",
    "ubuntu-22.04-documentation",
    "ubuntu-22.04-documentation-x11-tests",
-    "windows-10_22h2-msvc2019-developer-build",
+    "windows-11_23H2-msvc2022",
    "ios-universal"
  ],
  macos.yaml: [
@@ -4,7 +4,7 @@ Configurations:
    Id: 'debian-11.6-static-qtlite-arm64'
    Template: 'qtci-linux-Debian-11.6-aarch64-50'
    Compiler: 'GCC'
-    Features: ['UseConfigure', 'DisableTests']
+    Features: ['UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
    Configure arguments: >
        -nomake examples
        -release
@@ -147,7 +147,6 @@ Configurations:
        -no-feature-systemtrayicon
        -no-feature-tabletevent
        -no-feature-tablewidget
-        -no-feature-testlib
        -no-feature-textbrowser
        -no-feature-texthtmlparser
        -no-feature-textmarkdownreader
@@ -30,7 +30,7 @@ Configurations:
        '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}}',
        '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',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
    ]
 -
@@ -46,6 +46,6 @@ Configurations:
        '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}}',
        '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',
+        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
    ]
@@ -2,52 +2,52 @@ Version: 2
 Module only: true
 Configurations:
  - Id: 'webos-emulator-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['DoNotRunTests']
    Environment variables: ['BUILD_EMULATOR=enabled']
  - Id: 'webos-emulator-qtbase-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtbase']
    Platform dependency: 'webos-emulator-build'
  - Id: 'webos-emulator-qtdeclarative-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtdeclarative']
    Platform dependency: 'webos-emulator-build'
  - Id: 'webos-emulator-qtwayland-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtwayland']
    Platform dependency: 'webos-emulator-build'
  - Id: 'webos-emulator-qtshadertools-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtshadertools']
    Platform dependency: 'webos-emulator-build'
  - Id: 'webos-emulator-qtgraphicaleffects-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Environment variables: ['MODULE=qtgraphicaleffects']
    Platform dependency: 'webos-emulator-build'
  - Id: 'webos-raspberry-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['DoNotRunTests']
    Environment variables: ['BUILD_RASPBERRY=enabled']
  - Id: 'webos-ndk-installer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['DoNotRunTests']
    Environment variables: ['BUILD_NDK_INSTALLER=enabled']
  - Id: 'webos-ndk-install'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-52'
    Compiler: 'GCC'
    Features: ['TestOnly']
    Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']
@@ -9,8 +9,16 @@ if touch "$TCC_DATABASE"; then
    REQ_STR=$(codesign -d -r- "$BOOTSTRAP_AGENT" 2>&1 | awk -F ' => ' '/designated/{print $2}')
    REQ_HEX=$(echo "$REQ_STR" | csreq -r- -b >(xxd -p | tr -d '\n'))

+    SERVICES=()
+
+    # Qt Multimedia tests need microphone access
+    SERVICES+=('kTCCServiceMicrophone')
+
+    # Qt Connectivity tests need Bluetooth access
+    SERVICES+=('kTCCServiceBluetoothAlways')
+
    # shellcheck disable=SC2043
-    for service in kTCCServiceMicrophone; do
+    for service in "${SERVICES[@]}"; do
        sqlite3 -echo "$TCC_DATABASE" <<EOF
            DELETE from access WHERE client = '$BOOTSTRAP_AGENT' AND service = '$service';
            INSERT INTO access (service, client, client_type, auth_value, auth_reason, auth_version, csreq, flags) VALUES (
@@ -3,3 +3,4 @@ spdx-tools>=0.8.0
 ntia-conformance-checker
 sbomaudit
 sbom2doc
+reuse
@@ -8,15 +8,15 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

-version="3.1.50"
+version="3.1.56"
 versionNode="v16.20.0"
 tarBallVersion="${version//./_}"
 if uname -a |grep -q Darwin; then
    tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
-    sha="c12169ec8d22fc7a9ef1ba98027435bdf3b72729"
+    sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84"
 else
    tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
-    sha="5d81a8f1ddcb8d74c70ba5608efd4266c857944a"
+    sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5"
 fi
 cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
 target="/tmp/${tarBallPackage}"
@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="n7.0"
+version="n7.0.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
+sha1="6bfb65c18516e95249942f34ef664c94c0768722"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"

@@ -10,9 +10,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="n7.0"
-sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
+version="n7.0.1"
 url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+sha1="6bfb65c18516e95249942f34ef664c94c0768722"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="n7.0"
-url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
-sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa"
+version="n7.0.1"
+url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+sha1="6bfb65c18516e95249942f34ef664c94c0768722"
 url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 ffmpeg_name="FFmpeg-$version"

@@ -4,11 +4,11 @@


 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-patchelf_version="0.18.0"
+patchelf_version="0.17.2"

-url_cached="http://ci-files01-hki.ci.qt.io/input/patchelf/$patchelf_version.tar.gz"
+url_cached="https://ci-files01-hki.intra.qt.io/input/android/patchelf/$patchelf_version.tar.gz"
 url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz"
-sha1="7eb974172de73b7b452ee376237ad78601603c45"
+sha1="ddd46a2e2a16a308245c008721d877455b23bba8"

 target_source_dir="$HOME/patchelf-$patchelf_version"

@@ -20,33 +20,33 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
 # shellcheck source=./common.sourced.sh
 source "$PROVISIONING_DIR"/common/unix/common.sourced.sh

-libclang_version="15.0.0"
+libclang_version="17.0.6"

 if uname -a |grep -q Darwin; then
    version=$libclang_version
    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z"
    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z"
-    sha1="6d916a17459c81551dde47580ae3f071e93338a5"
-elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep -v "8" ; then
+    sha1="e8ecc2fb0d7d7a0f60a50379f16fbf3eef679d78"
+elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then
    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
-    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
-    sha1="6ca035bb522022d34d61759e0460845832933b5c"
-elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
-        version=$libclang_version
-        url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
-        url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
-        sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
-elif [ "$PROVISIONING_OS_ID" = debian ]; then
-        version=17.0.1
-        url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
-        url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
-        sha1="43f0210121b889107e3dab631e8104e661a3866b"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z"
+    sha1="102374379af906bd26085fcd18047cac4d0fb7bf"
+elif test "$PROVISIONING_OS_ID" == "ubuntu" ; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
+    sha1="4a793c9da9a02bd23c163c74dbc5565164a00c3f"
+elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
+    sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93"
 else
    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    sha1="bd6615012b8bdb2720a45ede56e05f6db7191843"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
+    url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z"
+    sha1="2a58cc71ad90eb6234c56ef7b141f32361b4312a"
 fi

 zip="/tmp/libclang.7z"
@@ -5,11 +5,11 @@

 # This script will install emscripten needed by WebAssembly

-$version = "3.1.50"
+$version = "3.1.56"
 $zipVersion = $version -replace '\.', "_"
 $temp = "$env:tmp"
 $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
-$sha = "40dc636688166ecdb476da40d02c491ee5032f7b"
+$sha = "ab376d218f1a66302c36770977948f74f0576a42"

 # Make sure python is in the path
 Prepend-Path "C:\Python27"
@@ -6,20 +6,20 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"

-$version = "n7.0"
-$ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843"
+$version="n7.0.1"
+$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+$sha1="6bfb65c18516e95249942f34ef664c94c0768722"
+$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
+$ffmpeg_name="FFmpeg-$version"

-$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"
-$download_location = "C:\Windows\Temp\" + $ffmpeg_name + ".zip"
+$download_location = "C:\Windows\Temp\$ffmpeg_name.tar.gz"
 $unzip_location = "C:\"

 Write-Host "Fetching FFmpeg $version..."

 Download $url_public $url_cached $download_location
 Verify-Checksum $download_location $sha1
-Extract-7Zip $download_location $unzip_location
+Extract-tar_gz $download_location $unzip_location
 Remove $download_location

 function GetFfmpegDefaultConfiguration {
@@ -183,16 +183,16 @@ function InstallAndroidArmv7 {
    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"
+    $patchelf_sha1 = "DDD46A2E2A16A308245C008721D877455B23BBA8"
+    $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.17.2.tar.gz"
+    $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz"

    Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location
    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`"")
+    Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.17.2 && ./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("\", "/")
@@ -4,47 +4,50 @@
 . "$PSScriptRoot\helpers.ps1"

 # This script will install Java SE
+# https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html
+$version_major = "17"
+$installdir = "C:\Program Files\Java\jdk-$version_major"

-if (Is64BitWinHost) {
-    $version = "11.0.12"
-    $arch = "x64"
-    $sha1 = "135ffd1c350509729551876232a5354070732e92"
-    $installdir = "C:\Program Files\Java\jdk-$version"
-    $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
-} else {
-    $version = "11.0.11.9"
-    $arch = "x86-32"
-    $sha1 = "a861e994208ee85bf83a76105f6858feeb6fbb33"
-    $installdir = "C:\Program Files\AdoptOpenJDK\jdk-$version-hotspot"
-    $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.11_9.msi"
+$cpu_arch = Get-CpuArchitecture
+switch ($cpu_arch) {
+    arm64 {
+        $version = "17.0.11"
+        $arch = "aarch64"
+        $sha1 = "1c5984a185778ad91498b746e677d84e153d5918"
+        # Using Microsoft build version of OpenJDK from: https://learn.microsoft.com/en-us/java/openjdk/download
+        # as there are no available Windows ARM64 versions of JDK from Oracle
+        $url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}-windows-${arch}.msi"
+        $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.msi"
+        $javaPackage = "C:\Windows\Temp\jdk-$version.msi"
+        Break
+    }
+    x64 {
+        $version = "17.0.10"
+        $arch = "x64"
+        $sha1 = "d573091930076c3ffa9f74273cb41cb5c75c5400"
+        $url_official = "https://download.oracle.com/java/17/archive/jdk-${version}_windows-${arch}_bin.exe"
+        $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe"
+        $javaPackage = "C:\Windows\Temp\jdk-$version.exe"
+        Break
+    }
+    default {
+        throw "Unknown architecture $cpu_arch"
+    }
 }

-# NOTE! Official URL is behind login portal. It can't be used whit this script instead it need to be fetched to $url_cache first
-# java 11: https://www.oracle.com/java/technologies/downloads/#java11-windows
-# java 8: $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
-if (Is64BitWinHost) {
-    $javaPackage = "C:\Windows\Temp\jdk-$version.exe"
-} else {
-    $javaPackage = "C:\Windows\Temp\jdk-$version.msi"
-}
-
-Write-Host "Fetching Java SE $version..."
+Write-Host "Fetching Java SE $version"
 $ProgressPreference = 'SilentlyContinue'
-Write-Host "...from local cache"
-Download $url_cache $url_cache $javaPackage
+Download $url_official $url_cache $javaPackage
 Verify-Checksum $javaPackage $sha1

-if (Is64BitWinHost) {
+if ($javaPackage.EndsWith(".exe")) {
    Run-Executable "$javaPackage" "/s SPONSORS=0"
 } else {
    Run-Executable "msiexec" "/quiet /i $javaPackage"
 }
 Remove "$javaPackage"

-Write-Host "Remove Java update from startup"
-reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f
-
 Set-EnvironmentVariable "JAVA_HOME" "$installdir"
-Add-Path "$installdir\bin"
+Prepend-Path "$installdir\bin"

 Write-Output "Java SE = $version $arch" >> ~\versions.txt
@@ -5,7 +5,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"

-$libclang_version="15.0.0"
+$libclang_version="17.0.6"
 Write-Output "libClang = $libclang_version" >> ~/versions.txt

 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -38,7 +38,7 @@ $toolchainSuffix = ""

 if ( $toolchain -eq "vs2019" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "e7c2d27f0e99d63e49225cb1be18c76a1e2a124b"
+        $sha1 = "7e3e474081d2e1d5d95c9743532de01b8e59b9aa"
    }
    else {
        $sha1 = ""
@@ -48,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) {

 if ( $toolchain -eq "mingw" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "6c9300051533d5648ffe3e8ae1eb00decae8e6bf"
+        $sha1 = "b9e65f617cd8d6e8fb8ae734383f03f6a7b202ed"
    }
    else {
        $sha1 = ""
@@ -56,6 +56,18 @@ if ( $toolchain -eq "mingw" ) {
    $toolchainSuffix = "mingw"
 }

+if ( $toolchain -eq "llvm-mingw" ) {
+    if ( $archVer -eq 64 ) {
+        $sha1 = "1844f107d067b69deabf375fc024848c1c8b015d"
+    }
+    else {
+        $sha1 = ""
+    }
+    # Due to COIN-1137 forced to use a '_' instead of '-'
+    $toolchainSuffix = "llvm_mingw"
+}
+
+
 install $sha1 $baseDestination-$archVer

 if ( $setDefault ) {
@@ -5,6 +5,9 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt"
 $n = $n.Split('=')
 New-Variable -Name $n[0] -Value $n[1]

+Write-Host "Temporarily not setting proxy" # QTQAINFRA-6473
+$proxy = ""
+
 if ([string]::IsNullOrEmpty($proxy)) {
    Write-Host "No proxy is defined."
 } else {
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Copyright (C) 2018 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh"
@@ -2,4 +2,4 @@
 # 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"
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -2,4 +2,4 @@
 # 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"
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -2,4 +2,4 @@
 # 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"
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -2,4 +2,4 @@
 # 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"
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -2,4 +2,4 @@
 # 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"
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -2,4 +2,4 @@
 # 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"
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Copyright (C) 2018 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# shellcheck source=../common/unix/mqtt_broker.sh
+source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.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"
@@ -10,7 +10,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 virtualenv wheel html5lib

 SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
@@ -10,7 +10,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 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/"
@@ -4,5 +4,5 @@

 set -ex

-brew install patchelf
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"

@@ -10,7 +10,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 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/"
@@ -4,5 +4,4 @@

 set -ex

-brew install patchelf
-
+source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
@@ -10,7 +10,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 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/"
@@ -0,0 +1,7 @@
+#!/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/unix/install-patchelf.sh"
@@ -1,3 +1,4 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-jdk.ps1"
@@ -1,3 +1,4 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
Author	SHA1	Message	Date
Qt Submodule Update Bot	3f4790463c	Update submodules on '6.8 in qt/qt5' Change-Id: Ibc71f98d1ca5ad73da7dff2b3c2ed79aac7ff94e Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-08-09 21:35:55 +00:00
Jani Heikkinen	0fecad52b8	Add 'Packaging' -flag for ubuntu 22.04 Task-number: QTBUG-124630 Change-Id: Ie5f5a5b904c91df8c96bf8a00448e465863ee906 Reviewed-by: Jukka Jokiniva <[email protected]>	2024-08-09 05:25:40 +00:00
Bartlomiej Moskal	74cdd355d6	coin: Downgrade patchelf version on CI Downgrade patchelf version from 0.18.0 to 0.17.2 on MacOs, Linux and Windows. It looks like there is a problem with 0.18.0 version, when modyfing the Android libs. It causes an unresolved dependencies error when loading a changed library. Fixes: QTBUG-126861 Change-Id: I5a95daae0a78aadede009535b2813483afcbc99d Reviewed-by: Jøger Hansegård <[email protected]> (cherry picked from commit `64aee78df8`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-08-07 06:48:56 +00:00
Bartlomiej Moskal	a11202a0b6	coin: Move install-patchelf script to unix directory This patch prepare install-patchelf.sh script for use on MacOs Task-number: QTBUG-126861 Change-Id: Id16462a2819da748ecd0b04f1df57968e9d90c37 Reviewed-by: Jøger Hansegård <[email protected]> (cherry picked from commit `62b60c4caa`)	2024-08-07 08:48:51 +02:00
Qt Submodule Update Bot	f68d6a976c	Update submodules on '6.8 in qt/qt5' Change-Id: I8417191ea92caf11fac8283c12009b76d1f72eaa Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-08-06 03:40:31 +00:00
Tero Heikkinen	09aa68b3de	Python: Unset proxy for python pip cert issues Task-number: QTQAINFRA-6473 Pick-to: 6.7 Change-Id: I43cfd0cba3fcdcd7acdf1d75ee2347dac8b77175 Reviewed-by: Dimitrios Apostolou <[email protected]> (cherry picked from commit `31774f9103`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-08-03 12:12:04 +00:00
Qt Submodule Update Bot	83500b62c4	Update submodules on '6.8 in qt/qt5' Change-Id: I931a73d915bd314f742742b72ceb070f377c5910 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-07-31 20:22:31 +00:00
Simo Fält	72e5affa21	CI: Use Ubuntu 22.04 with WebOS configs Change-Id: I2d4a2f024140d79a2a893b02fe903a3e3ee8d37f Reviewed-by: Toni Saario <[email protected]> (cherry picked from commit `9b0a15268e`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-31 12:01:49 +00:00
Pavel Dubsky	21a8e07fb3	Update FFmpeg version to n7.0.1 Fixes: QTBUG-126687 Pick-to: 6.7 6.5 Change-Id: I327a33a65aaa0285a93fa228f47d6914623f8d3d Reviewed-by: Dimitrios Apostolou <[email protected]> (cherry picked from commit `a68d7302cd`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-27 09:11:15 +00:00
Daniel Smith	44a2c39aa7	Update commit template for Reopens footer Task-number: QTQAINFRA-6248 Pick-to: 6.7 6.5 6.2 5.15 Change-Id: Ie1b888a339eb62adc05e73a2307d4d23429c9aff Reviewed-by: Edward Welbourne <[email protected]> Reviewed-by: Oswald Buddenhagen <[email protected]> (cherry picked from commit `6a343fd319`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-26 14:02:45 +00:00
Qt Submodule Update Bot	5615fb5fc2	Update submodules on '6.8 in qt/qt5' Change-Id: Ib9255ddee3c279c7a83c5d86c9c2f212fe007f88 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-07-25 17:13:08 +00:00
Elias Toivola	6e3c55a33d	Provisioning: Add Java 17 to Windows on ARM There are no WoA versions of JDK builds available from Oracle but Microsoft maintains a WoA compatible OpenJDK build. This change also removes the registry edit to disable Java auto-update as the auto-update function in Java no longer exists. Task-number: QTQAINFRA-6109 Task-number: QTQAINFRA-6385 Change-Id: I672ef4ac7cbca3d62ecd6a646fd769aff1cad4c5 Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `b3f5b4fd64`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-24 13:30:51 +00:00
Tero Heikkinen	3303e2fe46	Provisioning: Update Java on Windows x64 to 17 Java 17 for Android, needed by RTA Task-number: QTQAINFRA-6385 Change-Id: I1200fc5fc4dfdac1faea6b262277aae525efc835 Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `84bf41ba5b`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-24 13:30:44 +00:00
Alexey Edelev	319f1f7945	Remove -DFEATURE_native_grpc=OFF The flag was removed from qtgrpc repo and has no effect now. Clean it up from all platform configs. Change-Id: I59e200c6bcd63e03cc7c7477d502e456af8c9b01 Reviewed-by: Alexandru Croitor <[email protected]> (cherry picked from commit `b3fda4d0fe`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-24 08:20:20 +00:00
Alexey Edelev	39a7a1a663	Enable building QtProtobufWellknownTypes module on Packaging platforms Add the missing QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR for qnx and Android 14 platforms. Fixes: QTBUG-127272 Change-Id: I60caa0141aa2d8566311d30677891201b12c4ed6 Reviewed-by: Dennis Oberst <[email protected]> (cherry picked from commit `8d190a38ce`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-24 08:20:15 +00:00
Jukka Jokiniva	df8c39ba7b	Change precheck windows target to windows-11_23H2-msvc2022 Configuration windows-10_22H2-msvc2019-developer-build has been removed from CI. Fixes: QTQAINFRA-6386 Change-Id: If2e5a2727101feb787d5e8bc3be7898156978c53 Reviewed-by: Toni Saario <[email protected]> (cherry picked from commit `a41d562205`) Reviewed-by: Fabian Kosmale <[email protected]> Reviewed-by: Simo Fält <[email protected]>	2024-07-22 16:45:11 +00:00
Alexandru Croitor	8771cbab9c	coin: Add reuse python package to allow generating a source SBOM Task-number: QTBUG-122899 Task-number: QTBUG-125211 Change-Id: Iaf22d5b2ce3c5d5b0d1b22e595da9cc28d0c2719 Reviewed-by: Alexey Edelev <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]> (cherry picked from commit `b3c7f07436`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-22 16:45:06 +00:00
Alexandru Croitor	471fa2306c	coin: Fix pip3 installation on macOS arm The pip3 install calls contained the word 'install' twice. Starting with newer pip versions, this seems to fail with: /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib ERROR: Could not find a version that satisfies the requirement install (from versions: none) ERROR: No matching distribution found for install Make sure install only appears once. Change-Id: I1bfc784d4e3d6a1c34d112e72e2739678d2f07ae Reviewed-by: Ville-Pekka Karhu <[email protected]> (cherry picked from commit `866b4cedaf`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-22 16:45:04 +00:00
Qt Submodule Update Bot	504304234d	Update submodules on '6.8 in qt/qt5' Change-Id: I98f9be4f0bdca153856980080882534a76e9db74 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-07-19 21:19:31 +00:00
Alexandru Croitor	3624ced5cf	coin: Mark platforms that should verify the generated SBOM Task-number: QTBUG-122899 Change-Id: Ia4854f3af188e971b555cc1bd7bd6463fbbf7273 Reviewed-by: Joerg Bornemann <[email protected]> (cherry picked from commit `562b56c8d7`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-18 22:03:10 +02:00
Alexandru Croitor	a066902627	coin: Mark platforms that should generate an SBOM Task-number: QTBUG-122899 Change-Id: I3722c048ec4be894a09d3b023d6af95d4dfedc6f Reviewed-by: Joerg Bornemann <[email protected]> (cherry picked from commit `3017e86d54`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-18 22:03:08 +02:00
Alexandru Croitor	2792250242	Update qtqa sha1 to latest qtqa/dev/HEAD to fix an SBOM issue Bring in a435bfcc674707855e6f6e3ad315fc6747c944d5 from qtqa to ensure SBOM generation can be enabled in 6.8 branch. Change-Id: I35245844f74ba6ffb2a1852ef040a785254f360f Reviewed-by: Daniel Smith <[email protected]>	2024-07-18 22:03:06 +02:00
Jari Helaakoski	9d37579b5d	Enable unit test build for QtLite configuration Task-number: QTBUG-122999 Change-Id: I7be6b2cd28a3e8f319f10c33d39245ccd528a552 Reviewed-by: Heikki Halmet <[email protected]> Reviewed-by: Alex Bu <[email protected]> Reviewed-by: Tero Heikkinen <[email protected]> (cherry picked from commit `055cfcd501`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-17 14:30:04 +00:00
Qt Submodule Update Bot	ffe464c889	Update submodules on '6.8 in qt/qt5' Change-Id: I8bc76743e19a71fca96c15e3984ead1f30c1ec0c Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-07-16 16:09:56 +00:00
Dominik Holland	367cacbb01	Provisioning: Apply the bwrap fix also to Ubuntu 24.04_x86 Change-Id: I8a5e93e7ed04ed9b090209696e649835a88604a5 Reviewed-by: Robert Griebl <[email protected]> (cherry picked from commit `e6a7a49d2f`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-15 11:18:28 +00:00
Qt Submodule Update Bot	128b526cea	Update submodules on '6.8 in qt/qt5' Change-Id: I0b04c7cf3af631ef7d6924137d8c0c14b7e91067 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2024-07-13 23:35:01 +00:00
Luca Di Sera	1b97371ea0	Update QDoc libclang to 17.0.6 The version variable that is used to define the packages to download was updated to reflect the new version. A new case was added for the new "Debian11" on "arm64" package which was not a provisioned package on older version but is now provided. As "Debian11" was not currenly loading "libclang.sh", a new script that performs this process was added to "coin/provisioning/qtci-linux-Debian-11.6-aarch64". The newly sourced "libclang.sh" includes "coin/provisiong/common/unix/common.sourced.sh", which sets up certain common variables such as the used architecture and the platform id. When "common.sourced.sh" sets "PROVISION_ARCH", that contains the current platform architecture, it fails if the platform architecture is not supported. For "Debian11" on "arm64", the architecture, as reported by "uname -m" is "aarch64", which is equivalent to "arm64". "aarch64" was not handled by the script, so that a platform with that architecture would result in a fail when sourcing "common.sourced.sh". To avoid the failure, the case that sets "PROVISIONING_ARCH" to "arm64" will not trigger when the reported architecture is "aarch64". The specialized RedHat case was update to work specifically for version 9, to use the new specifically built package for Rhel9.2. The default case, previously using an "ubuntu20.04" package, was modified to use a "Rhel8.8" package. A package for "Ubuntu20.04" is not currently provided anymore as the platform was removed from CI and the new "22.04" package is not compatible with all the platforms that would use it. In particular, the new packages are built on a too new glibc, which will then fail to link, due to undefined symbols in the produced Clang libraries, when used on older-glibc platforms such as "OpenSuse15" and "Rhel8.8". The "Rhel8.8" package was specifically used as the platform for the default package as it ships the older glibc, "2.28", of the supported platforms, which should ensure that it works on the older-version platforms. The "sha1" variables for cached downloads was updated to reflect the new packages. For provisioning on windows, the version variable and the sha1 variables were updated to reflect the new version and the new packages, respectively. Pick-to: 6.7 Task-number: QTBUG-111580 Task-number: QTBUG-121548 Change-Id: Ie7c1a8d8fe9114912d53a87f70ebfa00341a9d8a Reviewed-by: Paul Wicking <[email protected]> Reviewed-by: Cristian Adam <[email protected]> (cherry picked from commit `9975595a5e`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-13 23:35:00 +00:00
Simo Fält	bcaf172368	Provisioning: Install mqtt broker also for arm linux configs Task-number: QTBUG-126974 Change-Id: Ifcd61385057fcc6cef8943b3e0477d905d01b198 Reviewed-by: Maurice Kalinowski <[email protected]> (cherry picked from commit `00527a5de1`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-12 10:34:57 +00:00
Pavel Dubsky	66bcdbd0b3	Use single installation archive for FFmpeg provisioning on all platforms Fixes: QTBUG-125955 Change-Id: Ibfa97e3d765eb3c4ff5613004bc881e49ddf10e9 Reviewed-by: Jøger Hansegård <[email protected]> (cherry picked from commit `49c03849e3`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-11 22:54:09 +00:00
Tor Arne Vestbø	95c6513432	coin: Give coin agent permission to access Bluetooth The Qt Connectivity tests rely on this. Change-Id: I7218485e583ebe2c8d381a0104012a86350e6eac Reviewed-by: Timur Pocheptsov <[email protected]> Reviewed-by: Volker Hilsheimer <[email protected]> Reviewed-by: Aku Pietikäinen <[email protected]> (cherry picked from commit `3ad98d0b27`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-10 09:54:48 +00:00
Piotr Wierciński	be5eb71399	wasm: Update Emscripten to 3.1.56 Update Emscripten to 3.1.56 for Qt 6.8 release. Change-Id: Ic5054aa7b00fba1f155824a710b9562d2a8a2f95 Reviewed-by: Toni Saario <[email protected]> (cherry picked from commit `e4f7db1379`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2024-07-10 09:54:46 +00:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\windows\install-jdk.ps1"`