Update submodules on '6.6 in qt/qt5'

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

.gitignore

@@ -2,4 +2,9 @@ Makefile
 .qmake.cache
 .qmake.super
 *.pro.user*
+CMakeLists.txt.user*
 CMakeUserPresets.json
+.vscode
+build
+build-*
+.DS_Store

CMakeLists.txt

@@ -12,7 +12,12 @@ include("${__qt6_qtbase_src_path}/.cmake.conf")
 
 # Run platform auto-detection /before/ the first project() call and thus
 # before the toolchain file is loaded.
-include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
+# Don't run auto-detection when doing standalone tests. In that case, the detection
+# results are taken from either QtBuildInternals or the qt.toolchain.cmake file.
+
+if(NOT QT_BUILD_STANDALONE_TESTS)
+    include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
+endif()
 
 project(Qt
     VERSION "${QT_REPO_MODULE_VERSION}"

coin/platform_configs/cmake_platforms.yaml

@@ -12,7 +12,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DoNotRunTests']
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests', 'Insignificant']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
@@ -30,7 +30,7 @@ Configurations:
     Id: 'ubuntu-22.04-documentation-x11-tests'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestDocs', 'TestOnly', 'InsignificantTests']
     Platform dependency: 'ubuntu-22.04-documentation'
 -
     Id: 'ubuntu-22.04-x11-tests'
@@ -68,19 +68,19 @@ Configurations:
     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}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
     Id: 'windows-11_22h2-msvc2019'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'MSVC2019'
     Features: ['Packaging', '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}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
@@ -100,7 +100,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-msvc2022'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -133,6 +133,7 @@ Configurations:
     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',
         'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
         'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
         'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
@@ -141,7 +142,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-msvc2019-developer-build'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-11_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 -c++std c++20'
@@ -153,7 +154,7 @@ Configurations:
     ]
 -
     Id: 'windows-11_22h2-msvc2019-arm64'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
@@ -161,6 +162,7 @@ Configurations:
     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',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
@@ -172,7 +174,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}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF'
     ]
 -
     Id: 'rhel-9.0'
@@ -184,6 +186,16 @@ Configurations:
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
+-
+    Id: 'debian-11.6-arm64'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
+    ]
+
 -
     Id: 'ios-universal'
     Template: 'qtci-macos-12-x86_64-106'
@@ -194,18 +206,19 @@ Configurations:
     Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
+        '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',
     ]
 -
     Id: 'windows-10_22h2-mingw11'
     Template: 'qtci-windows-10_22H2-x86_64-51'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
+        '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}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
@@ -215,25 +228,25 @@ Configurations:
     Template: 'qtci-windows-10_22H2-x86_64-51'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    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}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
+        '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}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
     Id: 'windows-11_22h2-llvm'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    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}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
+        '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}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR=C:\llvm-mingw',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
@@ -243,25 +256,25 @@ Configurations:
     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 -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
+        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
     Id: 'windows-11_22h2-mingw11-developer-build'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-11_22H2-x86_64-51'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
+        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -14,6 +14,7 @@ Configurations:
         '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.24.2/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',
     ]
 -
     Id: 'qnx-710-arm64-on-linux'
@@ -27,6 +28,7 @@ Configurations:
     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',
     ]
 -
     Id: 'qnx-710-armv7-on-linux'
@@ -40,4 +42,5 @@ Configurations:
     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',
     ]

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}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
@@ -28,7 +28,7 @@ Configurations:
         'Path={{.Env.MINGW1120}}\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}}',
+        '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',
         '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}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF',
         'ANDROID_EMULATOR=@emulator_x86_api_23',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
@@ -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}} -DFEATURE_native_grpc=OFF',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
         'ANDROID_EMULATOR=@emulator_x86_64_api_33'
     ]

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -25,7 +25,7 @@ Configurations:
         '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}}'
+        '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',
     ]
 -
     Id: 'webassembly-macos-thread'
@@ -38,6 +38,6 @@ Configurations:
     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',
+        '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',
         'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
     ]

coin/platform_configs/linux_android_tests_developer.yaml

@@ -13,4 +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',
         'ANDROID_EMULATOR=@emulator_x86_api_23']

coin/platform_configs/macos.yaml

@@ -16,7 +16,7 @@ Configurations:
         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}}',
+            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
         ]
 

coin/platform_configs/tqtc-android-automotive.yaml

@@ -29,5 +29,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',
         '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',
         'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
     ]

coin/platform_configs/tqtc-qtsdk.yaml

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

coin/pre-provisioning/qtci-windows-11_22H2-x86_64/msvc2019.txt

@@ -1,5 +1,6 @@
 ### Visual Studio 2019 ###
-Visual Studio 2019 version 16.11.19 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe
+Visual Studio 2019 version 16.11.19 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe
+Visual Studio 2019 was updated to version 16.11.27 with Visual Studio Installer
 
 Installed MSVC-2019 Components:
 
@@ -68,6 +69,7 @@ Windows 11 SDK (10.0.22000.0)
 
 Visual studio 2019 build tools version 16.11.19 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
  * Only default installation, no additional selections
+Visual studio 2019 build tools were updated to version 16.11.27 with Visual Studio Installer
 
 ############################################################
 ### Debugging tools ###

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

@@ -1,5 +1,6 @@
 ### Visual Studio 2022 Official release ###
-Visual Studio 2022 version 17.3.5 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+Visual Studio 2022 version 17.3.5 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+Visual Studio 2022 was updated to 17.6.4 vith Visual Studio Installer
 
 Installed MSVC-2022 Components:
 
@@ -63,6 +64,8 @@ Windows Universal C Runtime
 
  Visual studio 2022 build tools version 17.3.5 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
   * Only default installation, no additional selections
+ Visual Studio 2022 build tools were updated to 17.6.4 vith Visual Studio Installer
+  * Some of the installed framework versions are out of support and do not get any security updates
 
 ############################################################
 ### Debugging tools ###

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

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

coin/provisioning/common/macos/nodejs.sh

@@ -44,12 +44,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 # This script will install Nodejs
 
-version="14.16.1"
+version="18.16.0"
 urlCache="http://ci-files01-hki.intra.qt.io/input/nodejs/node-v$version.pkg"
 urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
+sha256="156aa5b9580288fb0b3c6134eb8fac64e50745d78d33eebe9e29eb7ff87b8e1e"
 
-DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg"
+DownloadURL $urlCache $urlOffcial $sha256 "/tmp/node-v$version.pkg"
 sudo installer -pkg "/tmp/node-v$version.pkg" -target /
 
  echo "Nodejs = $version" >> ~/versions.txt

coin/provisioning/common/macos/python3.sh

@@ -63,10 +63,6 @@ InstallPip python3.9
 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
 
-# Install all needed packages in a special wheel cache directory
-/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 # Install Python certificates. Required at least for emsdk installation
 open /Applications/Python\ 3.9/Install\ Certificates.command
 

coin/provisioning/common/shared/requirements.txt

@@ -1,19 +0,0 @@
-# This file holds all python3 packages need for a certain qt module
-# When adding new packages here, first add a comment with the name of the module
-# Then all the packages. Duplicates are wanted as every module should install
-# all packages it needs and shouldn't depend on a package from another module
-#
-# qtinterfaceframework
-antlr4-python3-runtime==4.9.2
-argh==0.26.2
-click==8.0.1
-coloredlogs==15.0.1
-humanfriendly==10.0
-Jinja2==3.0.1
-MarkupSafe==2.0.1
-path.py==12.5.0
-pathtools==0.1.2
-PyYAML==5.4.1
-six==1.16.0
-typing==3.7.4
-watchdog==2.1.5

coin/provisioning/common/shared/testserver/californium/Dockerfile

@@ -1,5 +1,5 @@
 FROM qt_ubuntu_18.04
-ARG packages="avahi-daemon maven default-jdk"
+ARG packages="avahi-daemon maven default-jdk patch"
 RUN apt-get update && apt-get -y install $packages
 
 # Get californium-based CoAP test server
@@ -7,6 +7,8 @@ WORKDIR /root/src
 ADD californium-*.tar.gz .
 RUN mv californium-* californium
 WORKDIR /root/src/californium
+ADD qt_changes.patch ./
+RUN patch -p1 < qt_changes.patch
 RUN mvn clean install -q -DskipTests
 WORKDIR /
 

coin/provisioning/common/shared/testserver/californium/qt_changes.patch

@@ -0,0 +1,43 @@
+diff -ruN californium_3.8.0/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java californium/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java
+--- californium_3.8.0/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java	2023-07-21 11:16:21.142201240 +0200
++++ californium/demo-apps/cf-plugtest-server/src/main/java/org/eclipse/californium/plugtests/PlugtestServer.java	2023-07-21 11:16:51.074210378 +0200
+@@ -100,6 +100,14 @@
+ import org.eclipse.californium.unixhealth.NetSocketHealthLogger;
+ import org.eclipse.californium.unixhealth.NetStatLogger;
+ 
++import org.eclipse.californium.scandium.DTLSConnector;
++import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
++import org.eclipse.californium.scandium.dtls.pskstore.AdvancedSinglePskStore;
++import org.eclipse.californium.core.network.CoapEndpoint;
++
++import java.net.InetSocketAddress;
++import java.net.InetAddress;
++
+ import picocli.CommandLine;
+ import picocli.CommandLine.ArgGroup;
+ import picocli.CommandLine.Command;
+@@ -437,7 +445,23 @@
+ 			// server.addEndpoint(new CoAPEndpoint(new InetSocketAddress("127.0.0.1", port)));
+ 			// server.addEndpoint(new CoAPEndpoint(new InetSocketAddress("2a01:c911:0:2010::10", port)));
+ 			// server.addEndpoint(new CoAPEndpoint(new InetSocketAddress("10.200.1.2", port)));
+-			server.addEndpoints(config);
++			// server.addEndpoints(config);
++
++			CoapEndpoint.Builder endpointBuilder = new CoapEndpoint.Builder();
++			endpointBuilder.setPort(5683);
++			server.addEndpoint(endpointBuilder.build());
++
++			AdvancedSinglePskStore pskStore = new AdvancedSinglePskStore("Client_identity", "secretPSK".getBytes());
++
++			DtlsConnectorConfig.Builder builder = new DtlsConnectorConfig.Builder(new Configuration());
++			builder.setAddress(new InetSocketAddress(5684));
++			builder.setAdvancedPskStore(pskStore);
++			DTLSConnector dtlsConnector = new DTLSConnector(builder.build());
++
++			endpointBuilder = new CoapEndpoint.Builder();
++			endpointBuilder.setConnector(dtlsConnector);
++			server.addEndpoint(endpointBuilder.build());
++
+ 			if (server.getEndpoints().isEmpty()) {
+ 				System.err.println("no endpoint available!");
+ 				System.exit(ERR_INIT_FAILED);

coin/provisioning/common/shared/testserver/docker_images.sh

@@ -89,13 +89,14 @@ DownloadURL  \
     FreeCoAP-0.7.tar.gz
 mv FreeCoAP-0.7.tar.gz "$SERVER_PATH/freecoap/"
 
-# Custom fork of Eclipse Californium with changes not upstream
+# Eclipse Californium 3.8.0, requires to apply a custom patch from
+# $SERVER_PATH/californium/ before usage
 DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/docker/californium-secure-test-server.tar.gz  \
-    https://github.com/sonakur/californium/archive/secure-test-server.tar.gz  \
-    0ee7f5d4366b9e31f6d2d42e389cb7a66d2db54987b700a38a3a31e8f38a7a19  \
-    californium-secure-test-server.tar.gz
-mv californium-secure-test-server.tar.gz "$SERVER_PATH/californium/"
+    http://ci-files01-hki.intra.qt.io/input/docker/californium-3.8.0.tar.gz \
+    https://github.com/eclipse-californium/californium/archive/refs/tags/3.8.0.tar.gz \
+    24f8ca393f26c922739462e4586b8ced1ff75f99bfa795defa34a967b5a4a5a0  \
+    californium-3.8.0.tar.gz
+mv californium-3.8.0.tar.gz "$SERVER_PATH/californium/"
 
 
 echo 'Building the docker images...'

coin/provisioning/common/unix/emsdk.sh

@@ -49,10 +49,10 @@ versionNode="v14.18.2"
 tarBallVersion=$(sed "s/\./\_/g" <<<"$version")
 if uname -a |grep -q Darwin; then
     tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
-    sha="33a3d1227e1409cfcb42d40c3e50108469bd5930"
+    sha="e9369deda4013fc24e085affc9975833cb2d9872"
 else
     tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
-    sha="7280f68da2cb232d8b5dca843706cb10e49ab901"
+    sha="000bbd5666d8fc1afbf2dce1a7938ef0efeeab3f"
 fi
 cacheUrl="https://ci-files01-hki.intra.qt.io/input/emsdk/${tarBallPackage}"
 target="/tmp/${tarBallPackage}"

coin/provisioning/common/windows/emsdk.ps1

@@ -45,7 +45,7 @@ $version = "3.1.37"
 $zipVersion = $version -replace '\.', "_"
 $temp = "$env:tmp"
 $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
-$sha = "cd180cae757e75316d50f2edc2f99a9d2eb83d5b"
+$sha = "5e5c0f50a940be09b82bf8256434f4510270e208"
 
 # Make sure python is in the path
 Prepend-Path "C:\Python27"

coin/provisioning/common/windows/mimersql.ps1

@@ -44,20 +44,24 @@
 
 $version = "1107b"
 
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\MimerSqlX64Windows" + $version + ".exe"
-$url_official = "https://download.mimer.com/pub/dist/windows/MimerSqlX64Windows" + $version + ".exe"
-$mimersqlPackage = "C:\Windows\Temp\MimerSqlX64Windows" + $version + ".exe"
-$sha1 = "e27bb6bdbd5cbd895a64b70051e3e5346f738957"
+$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\MimerSQLInstaller_x64_" + $version + ".exe"
+$url_official = "https://install.mimer.com/qt/windows_" + $version + "/MimerSQLInstaller_x64.exe"
+$mimersqlPackage = "C:\Windows\Temp\MimerSQLInstaller_x64_" + $version + ".exe"
+$sha1 = "A709A06EA1D897B13FA10DBDD4BE3BD0FEB04B28"
+$mimer_dir="c:\MimerSQL"
+
 Download $url_official $url_cache $mimersqlPackage
 Verify-Checksum $mimersqlPackage $sha1
-Run-Executable "$mimersqlPackage" "/install /passive"
+Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive"
+
+Set-EnvironmentVariable "MIMERSQL_DEV_ROOT" "$mimer_dir\dev"
 
 Write-Host "Cleaning $mimersqlPackage.."
-Remove "$mimersqlPackage"
-Remove "C:\Program Files\Mimer SQL Experience 11.0\dev\include\odbcinst.h"
-Remove "C:\Program Files\Mimer SQL Experience 11.0\dev\include\Sql.h"
-Remove "C:\Program Files\Mimer SQL Experience 11.0\dev\include\sqlext.h"
-Remove "C:\Program Files\Mimer SQL Experience 11.0\dev\include\sqltypes.h"
-Remove "C:\Program Files\Mimer SQL Experience 11.0\dev\include\sqlucode.h"
+#Remove "$mimersqlPackage"
+Remove "$mimer_dir\dev\include\odbcinst.h"
+Remove "$mimer_dir\dev\include\Sql.h"
+Remove "$mimer_dir\dev\include\sqlext.h"
+Remove "$mimer_dir\dev\include\sqltypes.h"
+Remove "$mimer_dir\dev\include\sqlucode.h"
 
 Write-Output "Mimer SQL = $version" >> ~\versions.txt

coin/provisioning/common/windows/python3.ps1

@@ -98,17 +98,6 @@ Run-Executable "$install_path\python.exe" "-m pip install --upgrade pip"
 
 Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel html5lib"
 
-# Install all needed packages in a special wheel cache directory
-$python3_wheel_dir="$install_path\python3-wheels"
-Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt"
-
-Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE-$version-$archVer" "$python3_wheel_dir"
-# PYTHON3_WHEEL_CACHE is already in use so we should keep it pointing to 64 bit default
-# wheel cache
-if (($setDefault) -And ($archVer -eq 64)) {
-    Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir"
-}
-
 # 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

@@ -92,8 +92,7 @@ installPackages+=(libgbm-dev)
 installPackages+=(libxkbfile-dev)
 installPackages+=(libxshmfence-dev)
 installPackages+=(libxss-dev)
-## installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated
-installPackages+=(nodejs)
+# installPackages+=(nodejs) too old
 installPackages+=(python3-html5lib)
 #
 ## Common event loop handling
@@ -286,11 +285,6 @@ waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install cmake apt-cacher-ng -t bullseye-backports
 
-# Install all needed packages in a special wheel cache directory
-#pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-#source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-#SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
 #OpenSSLVersion="$(openssl version |cut -b 9-14)"

coin/provisioning/qtci-linux-Debian-11.6-aarch64/03-install-nodejs.sh

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

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

@@ -78,8 +78,9 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
-# yasm for QtMultimedia
+# for QtMultimedia, ffmpeg
 installPackages+=(yasm)
+installPackages+=(libva-devel)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -167,12 +168,6 @@ sudo pip3 install --upgrade pip
 sudo pip3 install virtualenv wheel
 
 sudo /usr/bin/pip3 install wheel
-# Install all needed packages in a special wheel cache directory
-/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

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

@@ -79,8 +79,9 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
-# yasm for QtMultimedia
+# for QtMultimedia, ffmpeg
 installPackages+=(yasm)
+installPackages+=(libva-devel)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -102,11 +103,14 @@ installPackages+=(gperftools-libs)
 installPackages+=(gperf)
 installPackages+=(alsa-lib-devel)
 installPackages+=(pulseaudio-libs-devel)
+installPackages+=(libdrm-devel)
+installPackages+=(libva-devel)
 installPackages+=(libXtst-devel)
 installPackages+=(libxshmfence-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 installPackages+=(python3-html5lib)
+installPackages+=(mesa-libgbm-devel)
 # For Android builds
 installPackages+=(java-11-openjdk-devel)
 # For receiving shasum
@@ -176,15 +180,6 @@ sudo pip3 install virtualenv wheel
 sudo python3.8 -m pip install virtualenv wheel
 
 sudo /usr/bin/pip3 install wheel
-# Install all needed packages in a special wheel cache directory
-/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# Install 3.8 compatible wheels
-python3.8 -m pip wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

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

@@ -56,8 +56,9 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
-# yasm for QtMultimedia
+# for QtMultimedia, ffmpeg
 installPackages+=(yasm)
+installPackages+=(libva-devel)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -85,7 +86,7 @@ installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 installPackages+=(python3-html5lib)
 # For Android builds
-installPackages+=(java-11-openjdk-devel)
+installPackages+=(java-11-openjdk-devel-11.0.19.0.7)
 # For receiving shasum
 installPackages+=(perl-Digest-SHA)
 # INTEGRITY requirements
@@ -143,7 +144,9 @@ sudo yum -y install "${installPackages[@]}"
 
 sudo ln -s /usr/bin/python2 /usr/bin/python
 
-sudo dnf -y module install nodejs:12
+sudo dnf -y module install nodejs:16
+
+sudo /usr/bin/pip3 install dataclasses
 
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
 # working, but we can use installed pip
@@ -153,15 +156,6 @@ sudo pip3 install virtualenv wheel
 sudo python3.8 -m pip install virtualenv wheel
 
 sudo /usr/bin/pip3 install wheel
-# Install all needed packages in a special wheel cache directory
-/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# Install 3.8 compatible wheels
-python3.8 -m pip wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
 OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

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

@@ -0,0 +1,152 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# Remove update notifications and packagekit running in the background
+sudo yum -y remove PackageKit gnome-software
+
+sudo yum -y update
+
+installPackages=()
+installPackages+=(git)
+installPackages+=(zlib-devel)
+installPackages+=(glib2-devel)
+installPackages+=(openssl3)
+installPackages+=(openssl3-devel)
+installPackages+=(freetype-devel)
+installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
+# cmake build
+installPackages+=(ninja-build)
+installPackages+=(pcre2-devel)
+installPackages+=(double-conversion-devel)
+installPackages+=(zstd)
+# update kernel
+installPackages+=(kernel)
+installPackages+=(kernel-tools)
+installPackages+=(kernel-devel)
+installPackages+=(kernel-core)
+installPackages+=(kernel-modules)
+installPackages+=(kernel-headers)
+# EGL support
+# mesa-libraries need to use older version than 22.1.5-2 which cause Xorg to crash
+installPackages+=(mesa-libEGL-devel-21.3.4-1.el8)
+installPackages+=(mesa-libGL-devel-21.3.4-1.el8)
+installPackages+=(mesa-dri-drivers-21.3.4-1.el8.x86_64)
+installPackages+=(mesa-libgbm-21.3.4-1.el8.x86_64)
+installPackages+=(mesa-vulkan-drivers-21.3.4-1.el8.x86_64)
+installPackages+=(libxkbfile-devel)
+# Xinput2
+installPackages+=(libXi-devel)
+installPackages+=(mysql-server)
+installPackages+=(mysql)
+installPackages+=(mysql-devel)
+installPackages+=(postgresql-devel)
+installPackages+=(cups-devel)
+installPackages+=(dbus-devel)
+# gstreamer 1 for QtMultimedia
+# Note! gstreamer1-plugins-bad-free needs to be upgraded or it will conflicts with gstreamer1-plugins-base-devel
+installPackages+=(gstreamer1-plugins-bad-free)
+installPackages+=(gstreamer1-devel)
+installPackages+=(gstreamer1-plugins-base-devel)
+# for QtMultimedia, ffmpeg
+installPackages+=(yasm)
+installPackages+=(libva-devel)
+# gtk3 style for QtGui/QStyle
+installPackages+=(gtk3-devel)
+# libusb1 for tqtc-boot2qt/qdb
+installPackages+=(libusbx-devel)
+# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
+installPackages+=(speech-dispatcher-devel)
+# Python 3.8 for pyside. Qt for Python support for Python 3.6 will be deprecated in within pyside6.3
+installPackages+=(python38)
+installPackages+=(python38-devel)
+# WebEngine
+installPackages+=(bison)
+installPackages+=(flex)
+installPackages+=(gperftools-libs)
+installPackages+=(gperf)
+installPackages+=(alsa-lib-devel)
+installPackages+=(pulseaudio-libs-devel)
+installPackages+=(libXtst-devel)
+installPackages+=(libxshmfence-devel)
+installPackages+=(nspr-devel)
+installPackages+=(nss-devel)
+installPackages+=(python3-html5lib)
+# For Android builds
+installPackages+=(java-11-openjdk-devel)
+# For receiving shasum
+installPackages+=(perl-Digest-SHA)
+# INTEGRITY requirements
+installPackages+=(glibc.i686)
+# Enable Qt Bluetooth
+installPackages+=(bluez-libs-devel)
+# QtNfc
+installPackages+=(pcsc-lite-devel)
+# QtWebKit
+installPackages+=(libxml2-devel)
+installPackages+=(libxslt-devel)
+# For building Wayland from source
+installPackages+=(libffi-devel)
+# QtWayland
+#installPackages+=(mesa-libwayland-egl)
+#installPackages+=(mesa-libwayland-egl-devel)
+installPackages+=(libwayland-client)
+installPackages+=(libwayland-cursor)
+installPackages+=(libwayland-server)
+# Jenkins
+installPackages+=(chrpath)
+# libxkbcommon
+installPackages+=(libxkbcommon-devel)
+installPackages+=(libxkbcommon-x11-devel)
+# xcb-util-* libraries
+installPackages+=(xcb-util)
+installPackages+=(xcb-util-image-devel)
+installPackages+=(xcb-util-keysyms-devel)
+installPackages+=(xcb-util-wm-devel)
+installPackages+=(xcb-util-renderutil-devel)
+installPackages+=(xcb-util-cursor)
+installPackages+=(xcb-util-cursor-devel)
+
+# ODBC support
+installPackages+=(unixODBC-devel)
+installPackages+=(unixODBC)
+# Vulkan support
+installPackages+=(vulkan-devel)
+installPackages+=(vulkan-tools)
+# Conan: For Python build
+installPackages+=(xz-devel)
+installPackages+=(zlib-devel)
+installPackages+=(libffi-devel)
+installPackages+=(libsqlite3x-devel)
+# Build.pl
+installPackages+=(perl-Data-Dumper)
+# In RedHat these come with Devtoolset
+installPackages+=(gcc)
+installPackages+=(gcc-c++)
+installPackages+=(make)
+# Open source VMware Tools
+installPackages+=(open-vm-tools)
+
+sudo yum -y install "${installPackages[@]}"
+
+sudo dnf -y module install nodejs:16
+
+# We shouldn't use yum to install virtualenv. The one found from package repo is not
+# working, but we can use installed pip
+sudo pip3 install --upgrade pip
+sudo pip3 install virtualenv wheel
+# Just make sure we have virtualenv to run with python3.8 -m virtualenv
+sudo python3.8 -m pip install virtualenv wheel
+
+sudo /usr/bin/pip3 install wheel
+
+OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
+echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

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

@@ -81,8 +81,9 @@ installPackages+=(dbus-devel)
 installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
-# yasm for QtMultimedia
+# QtMultimedia, ffmpeg
 installPackages+=(yasm)
+installPackages+=(libva-devel)
 # gtk3 style for QtGui/QStyle
 installPackages+=(gtk3-devel)
 # libusb1 for tqtc-boot2qt/qdb
@@ -102,14 +103,18 @@ installPackages+=(gperftools-libs)
 installPackages+=(gperf)
 installPackages+=(alsa-lib-devel)
 installPackages+=(pulseaudio-libs-devel)
+installPackages+=(libdrm-devel)
+installPackages+=(libva-devel)
+installPackages+=(libuuid-devel)
 installPackages+=(libXtst-devel)
 installPackages+=(libxshmfence-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 installPackages+=(python3-html5lib)
+installPackages+=(mesa-libgbm-devel-21.3.4-2.el9)
 installPackages+=(libstdc++-static)
 # For Android builds
-installPackages+=(java-11-openjdk-devel)
+installPackages+=(java-11-openjdk-devel-11.0.19.0.7)
 # For receiving shasum
 installPackages+=(perl-Digest-SHA)
 # INTEGRITY requirements
@@ -181,18 +186,9 @@ sudo pip3 install virtualenv wheel
 sudo python -m pip install virtualenv wheel
 
 sudo /usr/bin/pip3 install wheel
-# Install all needed packages in a special wheel cache directory
-/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# Install compatible wheels
-python -m pip wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
 # Make FindPython3.cmake to find python3
 sudo ln -s /usr/bin/python3 /usr/local/bin/python3
 
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh

@@ -92,7 +92,11 @@ sudo zypper -nq install --force-resolution libxcb-cursor0 xcb-util-cursor-devel
 # qtwebengine
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
          libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel
+         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel \
+         libgbm-devel Mesa-dri-devel
+
+# qtwebengine, qtmultimedia+ffmpeg
+sudo zypper -nq install libva-devel
 
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

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

@@ -108,10 +108,6 @@ python3 --version | fgrep "$python3Version"
 pip3 install --user wheel
 pip3 install --user virtualenv
 
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_PATH" "/usr/local/bin"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

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

@@ -118,6 +118,8 @@ installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
 installPackages+=(yasm)
+installPackages+=(libva-dev)
+
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
 # python3 development package
@@ -201,12 +203,6 @@ echo "Installing packages"
 waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

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

@@ -93,6 +93,7 @@ installPackages+=(libxi-dev)
 installPackages+=(libdbus-1-dev)
 # Needed libraries for WebEngine
 installPackages+=(libudev-dev)
+installPackages+=(libdrm-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(libfontconfig1-dev)
 installPackages+=(libgbm-dev)
@@ -100,6 +101,7 @@ installPackages+=(liblcms2-dev)
 installPackages+=(libpci-dev)
 installPackages+=(libre2-dev)
 installPackages+=(libsnappy-dev)
+installPackages+=(libva-dev)
 installPackages+=(libvpx-dev)
 installPackages+=(libxkbfile-dev)
 installPackages+=(libxshmfence-dev)
@@ -135,6 +137,7 @@ installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
 installPackages+=(yasm)
+installPackages+=(libva-dev)
 
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
@@ -249,11 +252,7 @@ echo "Installing packages"
 waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}"
 
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
 OpenSSLVersion="$(openssl version |cut -b 9-14)"

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

@@ -94,6 +94,7 @@ installPackages+=(libdbus-1-dev)
 # Needed libraries for WebEngine
 installPackages+=(udev)
 installPackages+=(libudev-dev)
+installPackages+=(libdrm-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(libfontconfig1-dev)
 installPackages+=(libgbm-dev)
@@ -101,11 +102,12 @@ installPackages+=(liblcms2-dev)
 installPackages+=(libpci-dev)
 installPackages+=(libre2-dev)
 installPackages+=(libsnappy-dev)
+installPackages+=(libva-dev)
 installPackages+=(libvpx-dev)
 installPackages+=(libxkbfile-dev)
 installPackages+=(libxshmfence-dev)
 installPackages+=(libxss-dev)
-installPackages+=(nodejs)
+# installPackages+=(nodejs) too old
 installPackages+=(python3-html5lib)
 
 # Common event loop handling
@@ -136,6 +138,7 @@ installPackages+=(libgstreamer-gl1.0-0)
 installPackages+=(gir1.2-gst-plugins-base-1.0)
 installPackages+=(gir1.2-gst-plugins-bad-1.0)
 installPackages+=(yasm)
+installPackages+=(libva-dev)
 
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
@@ -254,11 +257,7 @@ echo "Installing packages"
 waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 install "${installPackages[@]}"
 
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
 OpenSSLVersion="$(openssl version |cut -b 9-14)"

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-nodejs.sh

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

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

@@ -38,7 +38,10 @@ sudo zypper -nq install libicu-devel
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
          libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
          mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
-         libxshmfence-devel libXdamage-devel
+         libxshmfence-devel libXdamage-devel libdrm-devel libgbm-devel
+
+# qtwebengine, qtmultimedia+ffmpeg
+sudo zypper -nq install libva-devel
 
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

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

@@ -10,9 +10,3 @@ sudo zypper -nq install python-devel python-xml
 # install python3
 sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
 
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

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

@@ -70,7 +70,10 @@ sudo zypper -nq install libicu-devel
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
          libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
          mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
-         libxshmfence-devel libXdamage-devel
+         libxshmfence-devel libXdamage-devel libdrm-devel libgbm-devel
+
+# qtwebengine, qtmultimedia+ffmpeg
+sudo zypper -nq install libva-devel
 
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

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

@@ -43,9 +43,3 @@ sudo zypper -nq install python-devel python-xml
 # install python3
 sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel
 
-# Install all needed packages in a special wheel cache directory
-pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

coin/provisioning/qtci-macos-11-arm/25-python3.sh

@@ -56,8 +56,4 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 # Use 3.9 as a default python
 SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 
-# Install all needed packages in a special wheel cache directory
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 echo "python3 = 3.9.7" >> ~/versions.txt

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

@@ -56,10 +56,6 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 # Use 3.9 as a default python
 SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 
-# Install all needed packages in a special wheel cache directory
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 # QtWebengine still requires python2
 pyenv install 2.7.18
 SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/"

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

@@ -56,10 +56,6 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
 # Use 3.9 as a default python
 SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 
-# Install all needed packages in a special wheel cache directory
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
 # QtWebengine still requires python2
 pyenv install 2.7.18
 SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/"

init-repository

@@ -669,7 +669,7 @@ sub run
 
     chomp(my $url = `git config remote.origin.url`);
     die("Have no origin remote.\n") if (!$url);
-    $url =~ s,\.git$,,;
+    $url =~ s,\.git/?$,,;
     $url =~ s/((?:tqtc-)?qt5)$//;
     my $qtrepo = $1 || 'qt5';
     $self->{'base-url'} = $url;