Update submodules on '6.11.0 in qt/qt5'

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

.gitignore

@@ -5,8 +5,8 @@ Makefile
 CMakeLists.txt.user*
 CMakeUserPresets.json
 .vscode
-build/
-build-*/
+build
+build-*
 .DS_Store
 init-repository.opt
 init-repository.opt.in

.gitmodules

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

cmake/QtIRHelpers.cmake

@@ -130,11 +130,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
     set(extra_configure_args "")
     set(extra_cmake_args "")
 
-    # Collect modules to skip. These may come from:
-    # 1. The -skip option (consumed by init-repository's option parser)
-    # 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
-    qt_ir_get_option_value(skip skip_modules)
-
     # If the -submodules or --module-subset options were specified, transform
     # the values into something configure understands and pass them to configure.
     qt_ir_get_option_value(module-subset submodules)
@@ -158,10 +153,25 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         endif()
 
         list(JOIN include_submodules "," include_submodules)
+        list(JOIN exclude_submodules "," exclude_submodules)
 
-        # Merge exclusions from module-subset into the skip list.
-        if(exclude_submodules)
-            list(APPEND skip_modules ${exclude_submodules})
+        # Handle case when the -skip argument is already passed.
+        # In that case read the passed values, merge with new ones,
+        # remove both the -skip and its values, and re-add it later.
+        list(FIND filtered_args "-skip" skip_index)
+        if(exclude_submodules AND skip_index GREATER -1)
+            list(LENGTH filtered_args filtered_args_length)
+            math(EXPR skip_args_index "${skip_index} + 1")
+
+            if(skip_args_index LESS filtered_args_length)
+                list(GET filtered_args "${skip_args_index}" skip_args)
+                string(REPLACE "," ";" skip_args "${skip_args}")
+                list(APPEND skip_args ${exclude_submodules})
+                list(REMOVE_DUPLICATES skip_args)
+                list(JOIN skip_args "," exclude_submodules)
+                list(REMOVE_AT filtered_args "${skip_args_index}")
+                list(REMOVE_AT filtered_args "${skip_index}")
+            endif()
         endif()
 
         # Handle case when only '-submodules existing' is passed and the
@@ -169,13 +179,9 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         if(include_submodules)
             list(APPEND extra_configure_args "-submodules" "${include_submodules}")
         endif()
-    endif()
-
-    # Forward all collected skip modules to configure.
-    if(skip_modules)
-        list(REMOVE_DUPLICATES skip_modules)
-        list(JOIN skip_modules "," skip_csv)
-        list(APPEND extra_configure_args "-skip" "${skip_csv}")
+        if(exclude_submodules)
+            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
+        endif()
     endif()
 
     # Insert the extra arguments into the proper positions before and after '--'.

coin/platform_configs/cmake_platforms.yaml

@@ -155,7 +155,6 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
         'VCPKG_HOST_TRIPLET=x64-linux-qt',
         'VCPKG_TARGET_TRIPLET=x64-linux-qt',
-        'SCCACHE_C_CUSTOM_CACHE_BUSTER=v1'
     ]
 -
     Id: 'sles-15_sp6-static'
@@ -191,7 +190,7 @@ Configurations:
     Features: ['Sccache', 'Packaging', "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_ROOT_DIR_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        '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_clangcpp=OFF -DINPUT_headersclean=ON',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'VCPKG_HOST_TRIPLET=x64-windows-qt',
@@ -225,9 +224,9 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'OPENSSL_INCLUDE={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'OPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
+        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
         'VCPKG_HOST_TRIPLET=x64-windows-qt',
         'VCPKG_TARGET_TRIPLET=arm64-windows-qt',

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -69,22 +69,3 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
         'ANDROID_EMULATOR=emulator_x86_64_api_36'
     ]
--
-    Id: 'android-17-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_USE_ANDROID_MODERN_BUNDLE only in one
-        # configuration, to ensure builds without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_37'
-    ]

coin/platform_configs/macos.yaml

@@ -46,7 +46,7 @@ Configurations:
 
     -
         Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm-108'
+        Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
@@ -109,7 +109,7 @@ Configurations:
     # Test on all supported macOS versions (deployment targets)
     -
         Id: 'macos-13-arm64-developer-build-tests'
-        Template: 'qtci-macos-13-arm-108'
+        Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-arm64-developer-build'

coin/platform_configs/wasm_qtbase_tests.yaml

@@ -12,5 +12,5 @@ Configurations:
     Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'TestOnly']
     Platform dependency: 'webassembly-linux-thread-asyncify-new'

coin/provisioning/common/linux/android_linux.sh

@@ -199,23 +199,6 @@ echo "Unzipping the Android 16 to $maxVersionDestination"
 sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
 rm "$maxVersionFilePath"
 
-echo "Download and unzip Android 17 Beta 3 16KB System Image"
-insignificantMaxVersionFileName="x86_64-ps16k-37.0_r03.zip"
-insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-37/google_apis_ps16k/"
-insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
-insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionSha1="b89a6686f9a9e9942d596bed45d422cbccb70c98"
-
-mkdir -p "$insignificantMaxVersionDestination"
-DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
-
-echo "Unzipping the Android 17 Beta3 16KB to $insignificantMaxVersionDestination"
-sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
-# Hack to avoid SDK version bug in source.properties file, the usage of ".0" messes things for avdmanager. TODO: undo when official comes
-sudo sed -i 's/AndroidVersion.ApiLevel=37.0/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
-rm "$insignificantMaxVersionFilePath"
-
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
 
@@ -225,9 +208,6 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
     -k "system-images;android-36;google_apis;x86_64"
 
-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_37 -c 2048M -f \
-    -k "system-images;android-37;google_apis,page_size_16kb,ai_glasses_compatible;x86_64"
-
 echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
 DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
     "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"

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

@@ -21,13 +21,13 @@ prefix="${2:-$default_prefix}"
 pkgconfig_path="$PKG_CONFIG_PATH"
 
 install_ff_nvcodec_headers() {
-    local nv_codec_version="11.1.5.3" # use 11.x.x.x to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
-    local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/tags/n$nv_codec_version.zip"
-    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-$nv_codec_version.zip"
-    local nv_codec_sha1="78715d521de102362e553dc92577bbe81905a321"
+    local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
+    local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
+    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
+    local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
     #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
     local target_dir="$HOME"
-    local nv_codec_dir="$target_dir/nv-codec-headers-n$nv_codec_version"
+    local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
 
     if [ ! -d  "$nv_codec_dir" ]; then
         source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"

coin/provisioning/common/linux/install-vxworks-qemu.sh

@@ -13,7 +13,7 @@ QEMU_VER="8.2.3"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qemu/qemu-$QEMU_VER.tar.xz"
 AltUrl="https://download.qemu.org/qemu-$QEMU_VER.tar.xz"
 SHA1="1b29c8105cf8d15b9e7fb6f8e85170b6c54a1788"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" "$appPrefix"
 
 targetFolder=/tmp/qemu-${QEMU_VER}
 mkdir -p "$targetFolder/build"

coin/provisioning/common/linux/qnx_800.sh

@@ -43,17 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi
 
 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20250612.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="a3fdcd98e12bc5054d00f18e4088af26288fd020"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
-
-# IANA timezone database overlay. Packaged separately from the SDP so it can be
-# bumped without rebuilding the SDP tarball. Archive root is qnx800/target/qnx/
-# so it overlays onto $targetFolder (/opt/) directly.
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a.tar.xz"
-targetFile="zoneinfo.tar.xz"
-sha1="8c1678ff673bb588f63fc9277497cd38e0ea2253"
+sha1="d7ca20be6867b569067a17e8b3fa633c7eadad89"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
 sudo cp "$aarch64le_toolchain" "$targetPath"

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom

@@ -22,7 +22,7 @@ lib/libEGL.so.1=usr/lib/libEGL.so.1
 lib/libz.so.2=usr/lib/libz.so.2
 lib/libzstd.so.1=usr/lib/libzstd.so.1
 lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.26=usr/lib/libfreetype.so.26
+lib/libfreetype.so.24=usr/lib/libfreetype.so.24
 lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libdbus-1.so=usr/lib//libdbus-1.so
@@ -54,7 +54,7 @@ xbin/fsevmgr=sbin/fsevmgr
 lib/libscreen.so.1=usr/lib/libscreen.so.1
 
 # for fontconfig
-lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17
+lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
 xbin/fc-cache=bin/fc-cache
 xbin/fc-match=local/misc_files/fc-match
 

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

@@ -26,14 +26,9 @@ readonly MINIMUM_IOS_VERSION="16.0"
 
 source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
 
+ffmpeg_version=$(ffmpeg_version_default)
 ffmpeg_source_dir=$(download_ffmpeg)
-ffmpeg_version="n$(<"${ffmpeg_source_dir}/RELEASE")"
-if [ ! -n "$ffmpeg_version" ]; then
-    echo "Error. Unable to determine FFmpeg version."
-    exit 1
-fi
-ffmpeg_build_type="shared"
-ffmpeg_config_options=$(get_ffmpeg_config_options "$ffmpeg_build_type")
+ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
 default_prefix="/usr/local/ios/ffmpeg"
 prefix="${1:-$default_prefix}"
 
@@ -101,6 +96,8 @@ build_ffmpeg_ios() {
         --extra-cxxflags="${common_arch_flags}"
         --extra-ldflags="${common_arch_flags}"
         --target-os=darwin
+        --enable-shared
+        --disable-static
         --install-name-dir="@rpath"
         --disable-audiotoolbox
 

coin/provisioning/common/macos/libiodbc.rb

@@ -19,7 +19,7 @@ class Libiodbc < Formula
 
   def install
     if build.with? "universal"
-      ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9 -std=gnu89'
+      ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9'
     end
     system "./autogen.sh"
     system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"

coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh

@@ -8,27 +8,25 @@ lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"
 page_size="${4:-}"
-custom_readelf="${5:-""}"
 
-# If custom_readelf is not provided, we fallback to host readelf.
-if [ -n "$custom_readelf" ]; then
-    if ! command -v "$custom_readelf"; then
-        echo "Error. Provided readelf executable '${custom_readelf}' is not a valid executable"
+# readelf and patchelf are prerequisite tools for this script. Check
+# that they are available.
+if [ "$(uname -s)" = "Darwin" ]; then
+    # Under Homebrew, binutils package is not symlinked into PATH.
+    # This lets us use readelf provided by Homebrew.
+    readelf_homebrew_path="$(brew --prefix binutils)/bin/readelf"
+    if [[ ! -x "$readelf_homebrew_path" ]]; then
+        echo "Found no valid readelf executable. It is possible it was not correctly installed through Homebrew."
         exit 1
     fi
-elif ! command -v readelf; then
+    readelf() { "$readelf_homebrew_path" "$@"; }
+fi
+
+if ! command -v readelf; then
     echo "Found no valid readelf command. It is possible it was not correctly installed."
     exit 1
 fi
 
-readelf_wrapper() {
-    if [ -n "$custom_readelf" ]; then
-        "$custom_readelf" "$@"
-    else
-        readelf "$@"
-    fi
-}
-
 if ! command -v patchelf; then
     echo "Found no valid patchelf command. It is possible it was not correctly installed."
     exit 1
@@ -59,7 +57,7 @@ for lib_name in "${ffmpeg_libs[@]}"; do
     fi
 
     read_needed_deps() {
-        readelf_wrapper -d "$lib_path" | grep '(NEEDED)'
+        readelf -d "$lib_path" | grep '(NEEDED)'
     }
 
     while read -r line; do

coin/provisioning/common/unix/ffmpeg-installation-utils.sh

@@ -2,8 +2,12 @@
 # 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
 
+ffmpeg_version_default() {
+    echo "n7.1.3"
+}
+
 download_ffmpeg() {
-    local version="${1:-"n7.1.3"}"
+    local version="${1:-$(ffmpeg_version_default)}"
     local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
 
     local ffmpeg_name="FFmpeg-$version"

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

@@ -124,14 +124,8 @@ build_ffmpeg_android() {
         if [ $page_size == "use_16kb_page_size" ]; then
             page_size_arg="16384"
         fi
-        local set_rpath_arg="no"
-        local readelf_path_arg="${toolchain_bin}/llvm-readelf"
-        sudo "$fix_dependencies" \
-            "$target_dir" \
-            "$libs_prefix" \
-            "$set_rpath_arg" \
-            "$page_size_arg" \
-            "$readelf_path_arg"
+
+        sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" "$page_size_arg"
     fi
 }
 

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

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 set -ex
 os="$1"
-version=${2:-"3.5.4"}
-sha=${3:-"b75daac8e10f189abe28a076ba5905d363e4801f"}
+version=${2:-"3.0.7"}
+sha=${3:-"f20736d6aae36bcbfa9aba0d358c71601833bf27"}
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 # shellcheck source=../unix/DownloadURL.sh
@@ -104,18 +104,6 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
     SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
     SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
 
-    # Set runtime loader (dyld) and OpenSSL providers for SSL tests (QTBUG-142392)
-    SetEnvVar "DYLD_LIBRARY_PATH" "\"$opensslTargetLocation/lib:\$DYLD_LIBRARY_PATH\""
-    SetEnvVar "OPENSSL_MODULES" "\"$opensslTargetLocation/lib/ossl-modules\""
-    # Check that the versioned dylibs exists and ML-DSA is available
-    test -f "$opensslTargetLocation/lib/libcrypto.3.dylib"
-    test -f "$opensslTargetLocation/lib/libssl.3.dylib"
-    test -d "$opensslTargetLocation/lib/ossl-modules"
-
-    OPENSSL_MODULES="$opensslTargetLocation/lib/ossl-modules" \
-    "$opensslTargetLocation/bin/openssl" list -signature-algorithms | \
-    grep -q -i 'ML-DSA' || { echo "ML-DSA not available"; exit 1; }
-
     security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a "$opensslTargetLocation/ssl/cert.pem" > /dev/null
     security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a "$opensslTargetLocation/ssl/cert.pem" > /dev/null
 fi

coin/provisioning/common/unix/openssl_for_android.sh

@@ -5,23 +5,21 @@
 # This script install prebuilt OpenSSL which was built against Android NDK 25.
 # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
 
-set -eux
+set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-outputPathBase="${HOME}"
-
-sslVersionForLatest="3.5.4"
+sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
-featureSuffixLatest="_16kb_fixed_symversions"
-prebuiltOpensslShaLatest="b9dc30ed77bfd26e526e81d558d6964585b27283"
+featureSuffixLatest="_16kb"
+prebuiltOpensslShaLatest="2cc15dd990460c2c7157ab257a47071fbd9e0ac8"
 
-sslVersionForPreview="3.5.4"
+sslVersionForPreview="3.0.7"
 ndkVersionPreview="r29-beta2"
-featureSuffixPreview="_16kb_fixed_symversions"
-prebuiltOpensslShaPreview="89b6692e983c7e9678dcd9fc03da623fb75593d3"
+featureSuffixPreview="_16kb"
+prebuiltOpensslShaPreview="76c9788216440111be97ea1a63c4d8cd807baacd"
 
 ndkVersionNightly1=$ndkVersionLatest
 sslVersionForNightly1=$sslVersionForLatest
@@ -33,126 +31,87 @@ sslVersionForNightly2=$sslVersionForLatest
 featureSuffixNightly2=""
 prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest
 
-: <<'EOB' SOURCE BUILD INSTRUCTIONS
-Openssl 3.5.4 prebuilt was made using Android NDK r27c Revision 27.2.12479018
-and r29-beta2 Revision 29.0.13599879
+: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r29-beta2
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
+exports_file="/tmp/export.sh"
+# source previously made environmental variables.
+if uname -a |grep -q "Ubuntu"; then
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+else
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+fi
 
-By using a helpful (build_ssl.sh) script from:
-Android OpenSSL support for Qt
-https://github.com/KDAB/android_openssl/commit/b71f1470962019bd89534a2919f5925f93bc5779
-
-Download the same NDK version that the Qt branch supports
-https://developer.android.com/ndk/downloads
-
-Modify the script to your liking: set a path to NDK root, set OpenSSL version
-(script will download needed OpenSSL packages)
-Set ANDROID_API to the lowest version of Android which will be used.
+officialUrl="https://www.openssl.org/source/openssl-$sslVersionForLatest.tar.gz"
+cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$sslVersionForLatest.tar.gz"
+targetFile="/tmp/openssl-$sslVersionForLatest.tar.gz"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
+opensslHome="${HOME}/openssl/android/openssl-${sslVersionForLatest}"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+mkdir -p "${HOME}/openssl/android/"
+tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
+if uname -a |grep -q "Darwin"; then
+    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
+else
+    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
+fi
+cd "$opensslHome"
+PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
+PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 EOB
 
-function BuildOutputPath() {
-    local ndkVersion="$1"
-    local suffix="$2"
-    local sslVersion="$3"
-
-    echo "${outputPathBase}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
-}
-
 function InstallPrebuiltOpenssl() {
-    local ndkVersion="$1"
-    local suffix="$2"
-    local sha="$3"
-    local sslVersion="$4"
-    local output_dir="$5"
 
-    local prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
-    local targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    ndkVersion=$1
+    suffix=$2
+    sha=$3
+    sslVersion=$4
+
+    renamed_root="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
+
+    prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
 
     DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
 
-    local tmp_extract
     tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
     unzip -q -o "$targetFile" -d "$tmp_extract"
-    rm -f "$targetFile"
+    sudo rm -f "$targetFile"
 
     # We assume there is only one top-level directory in the openssl zip
-    local temp_openssl_root
     temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
     if [[ -z "$temp_openssl_root" ]]; then
         echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
-        exit 1
+        return 1
     fi
 
-    mv "$temp_openssl_root" "$output_dir"
+    mv "$temp_openssl_root" "$renamed_root"
     rm -rf "$tmp_extract"
 
-    # There have been cases where necessary symlinks are lost when unarchiving.
-    # Force-create them now.
-    local abi_list="arm64-v8a armeabi-v7a x86 x86_64"
-    for abi in $abi_list; do
-        ln -fs "${output_dir}/include" "${output_dir}/${abi}/include"
-        ln -fs "${output_dir}/${abi}/libcrypto_3.so" "${output_dir}/${abi}/libcrypto.so"
-        ln -fs "${output_dir}/${abi}/libssl_3.so" "${output_dir}/${abi}/libssl.so"
-    done
+    opensslHome="${renamed_root}"
 }
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    outputDirNightly1=$(BuildOutputPath \
-        "$ndkVersionNightly1" \
-        "$featureSuffixNightly1" \
-        "$sslVersionForNightly1")
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionNightly1" \
-        "$featureSuffixNightly1" \
-        "$prebuiltOpensslShaNightly1" \
-        "$sslVersionForNightly1" \
-        "$outputDirNightly1"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly1"
-    echo "OpenSSL for Android ${ndkVersionNightly1} = ${sslVersionForNightly1}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionNightly1" "$featureSuffixNightly1" "$prebuiltOpensslShaNightly1" "$sslVersionForNightly1"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    outputDirNightly2=$(BuildOutputPath \
-        "$ndkVersionNightly2" \
-        "$featureSuffixNightly2" \
-        "$sslVersionForNightly2")
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionNightly2" \
-        "$featureSuffixNightly2" \
-        "$prebuiltOpensslShaNightly2" \
-        "$sslVersionForNightly2" \
-        "$outputDirNightly2"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly2"
-    echo "OpenSSL for Android ${ndkVersionNightly2} = ${sslVersionForNightly2}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionNightly2" "$featureSuffixNightly2" "$prebuiltOpensslShaNightly2" "$sslVersionForNightly2"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    outputDirPreview="$(BuildOutputPath \
-        "$ndkVersionPreview" \
-        "$featureSuffixPreview" \
-        "$sslVersionForPreview")"
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionPreview" \
-        "$featureSuffixPreview" \
-        "$prebuiltOpensslShaPreview" \
-        "$sslVersionForPreview" \
-        "$outputDirPreview"
-    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$outputDirPreview"
-    echo "OpenSSL for Android ${ndkVersionPreview} = ${sslVersionForPreview}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionPreview" "$featureSuffixPreview" "$prebuiltOpensslShaPreview" "$sslVersionForPreview"
+    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionPreview = $sslVersionForPreview" >> ~/versions.txt
 fi
 
-outputDirLatest="$(BuildOutputPath \
-    "$ndkVersionLatest" \
-    "$featureSuffixLatest" \
-    "$sslVersionForLatest")"
-
-InstallPrebuiltOpenssl \
-    "$ndkVersionLatest" \
-    "$featureSuffixLatest" \
-    "$prebuiltOpensslShaLatest" \
-    "$sslVersionForLatest" \
-    "$outputDirLatest"
-SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$outputDirLatest"
-echo "OpenSSL for Android ${ndkVersionLatest} = ${sslVersionForLatest}" >> ~/versions.txt
+InstallPrebuiltOpenssl "$ndkVersionLatest" "$featureSuffixLatest" "$prebuiltOpensslShaLatest" "$sslVersionForLatest"
+SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt

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

@@ -15,15 +15,15 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$openssl_version_latest = "3.5.4"
-$ndk_version_latest = "r27c_16kb"
-$prebuilt_ssl_sha1_latest = "a76cd9ec719d4e71473dcf451d648a9766247081"
-$openssl_sha1_latest = "b75daac8e10f189abe28a076ba5905d363e4801f"
+$openssl_version_latest = "3.0.7"
+$ndk_version_latest = "r27c"
+$prebuilt_ssl_sha1_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
+$openssl_sha1_latest = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
 
-$openssl_version_preview = "3.5.4"
-$ndk_version_preview = "r29-beta2_16kb"
-$prebuilt_ssl_sha1_preview = "664bab8b4f5e01c8bb87ab0ea8333b2ef1af703d"
-$openssl_sha1_preview = "b75daac8e10f189abe28a076ba5905d363e4801f"
+$openssl_version_preview = "3.0.7"
+$ndk_version_preview = "r29-beta2"
+$prebuilt_ssl_sha1_preview = "c2cf8fabfb7e00b31abcc554e6e306dafd99ae1b"
+$openssl_sha1_preview = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
 
 $openssl_version_nightly1 = $openssl_version_latest
 $ndk_version_nightly1 = $ndk_version_latest

coin/provisioning/common/windows/dxsdk.ps1

@@ -10,7 +10,7 @@ $sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
 $package_path = "C:\Windows\Temp\$package"
 
 Download $officialUrl $cachedUrl $package_path
-Verify-Checksum $package_path $sdkChecksumSha1
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
 Run-Executable $package_path "/u"
 

coin/provisioning/common/windows/grpc.ps1

@@ -49,7 +49,6 @@ function build-install-grpc {
         "-DgRPC_SSL_PROVIDER=package"
         # protobuf
         "-DProtobuf_USE_STATIC_LIBS=ON"
-        "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
         "-DCMAKE_PREFIX_PATH=$protobufRoot"
     )
     cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" $extraCMakeArgs $configureOptions

coin/provisioning/common/windows/helpers.ps1

@@ -2,20 +2,16 @@ function Verify-Checksum
 {
     Param (
         [string]$File=$(throw("You must specify a filename to get the checksum of.")),
-        [string]$Expected=$(throw("Checksum required"))
+        [string]$Expected=$(throw("Checksum required")),
+        [ValidateSet("sha256","sha1","md5")][string]$Algorithm="sha1"
     )
-    switch ($Expected.Length) {
-        40 { $Algorithm = "SHA1" }
-        64 { $Algorithm = "SHA256" }
-        default { throw "Unknown hash length for: $Expected" }
-    }
     Write-Host "Verifying checksum of $File"
     $fs = new-object System.IO.FileStream $File, "Open"
     $algo = [type]"System.Security.Cryptography.$Algorithm"
     $crypto = $algo::Create()
     $hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
     $fs.Close()
-    if ($hash -ine $Expected) {
+    if ($hash -ne $Expected) {
         throw "Checksum verification failed, got: '$hash' expected: '$Expected'"
     }
 }

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

@@ -271,16 +271,10 @@ function InstallAndroidArmv7 {
     $patchelf_sources = "https://ci-files01-hki.ci.qt.io/input/android/patchelf/0.17.2.tar.gz"
     $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz"
 
-    try {
-        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
-    } catch {
-        Write-Host "Error grabbing sources when installing patchelf:"
-        Write-Host $_
-        return $false
-    }
+    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.17.2 && ./bootstrap.sh && ./configure && make install`"")
 

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

@@ -33,7 +33,7 @@ $url_official = "https://go.dev/dl/go" + $version + ".windows-" + $arch + ".msi"
 
 Write-Host "Fetching Go $version..."
 Download $url_official $url_cache $goPackage
-Verify-Checksum $goPackage $sha256
+Verify-Checksum $goPackage $sha256 sha256
 Write-Host "Installing Go $version..."
 Run-Executable "msiexec" "/quiet /i $goPackage"
 Write-Output "Go = $version" >> ~\versions.txt

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

@@ -9,10 +9,10 @@ $version = "20240113"
 $prog = "msys2"
 $arch = "x86_64"
 $sha1 = "b46c08fd901da0fdba1dc30422a322766d7d03c6"
-$sha1_prebuilt = "29d16a81de4a570c41f92491e20b5554a1baab8f"
+$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
 $folder = "msys64"
 
-$package_prebuilt = $folder + "_" + $version + "_prebuilt_v2.7z"
+$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
 $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
 
 $url_cache_prebuilt = "\\ci-files01-hki.ci.qt.io\provisioning\windows\$package_prebuilt"

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

@@ -10,17 +10,17 @@ $temp = "$env:tmp"
 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
     arm64 {
-        $base_file_name = "OpenSSH-ARM64"
+        $zipPackage = "OpenSSH-ARM64"
         $sha1 = "ca3e8f44a550b7ae71c8e122acd4ed905d66feb0"
         Break
     }
     x64 {
-        $base_file_name = "OpenSSH-Win64"
+        $zipPackage = "OpenSSH-Win64"
         $sha1 = "1397d40d789ae0911b3cc818b9dcd9321fed529b"
         Break
     }
     x86 {
-        $base_file_name = "OpenSSH-Win32"
+        $zipPackage = "OpenSSH-Win32"
         $sha1 = "4642C62F72C108C411E27CE282A863791B63329B"
         Break
     }
@@ -29,27 +29,20 @@ switch ($cpu_arch) {
     }
 }
 
-Write-Host "Fetching $base_file_name $version..."
-$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/openssh/$version/$base_file_name.zip"
-$url_official = "https://github.com/PowerShell/Win32-OpenSSH/releases/download/$version/$base_file_name.zip"
-$output_zip_file = "$temp\$base_file_name.zip"
-Download $url_official $url_cache $output_zip_file
-Verify-Checksum $output_zip_file $sha1
+Write-Host "Fetching $zipPackage $version..."
+$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/openssh/" + $version + "/" + $zipPackage + ".zip"
+$url_official = "https://github.com/PowerShell/Win32-OpenSSH/releases/download/" + $version + "/" + $zipPackage + ".zip"
+Download $url_official $url_cache "$temp\$zipPackage"
+Verify-Checksum "$temp\$zipPackage" $sha1
 
 Write-Host "Extracting the package"
-Extract-7Zip $output_zip_file "C:\Program Files"
-# We assume the incoming zip contains exactly one directory, named the same
-# as the base file name of th zip.
-$output_dir = "C:\Program Files\$base_file_name"
-if (-not (Test-Path $output_dir -PathType Container)) {
-    throw "Error. Expected output directory '$output_dir' does not exist."
-}
+Extract-7Zip "$temp\$zipPackage" C:\"Program Files"
 
-Write-Host "Installing $base_file_name $version..."
-$install_script = "$output_dir\install-sshd.ps1"
+Write-Host "Installing $zipPackage $version..."
+$path = "C:\Program Files\" + $zipPackage + "\install-sshd.ps1"
 
 # Installation done as shown at https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH
-powershell.exe -ExecutionPolicy Bypass -File $install_script
+powershell.exe -ExecutionPolicy Bypass -File $path
 netsh advfirewall firewall add rule name=sshd dir=in action=allow protocol=TCP localport=22
 net start sshd
 Set-Service sshd -StartupType Automatic

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

@@ -1,46 +0,0 @@
-# Copyright (C) 2026 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-. "$PSScriptRoot\helpers.ps1"
-
-# This script will install Rust
-
-$rust_version="1.92.0"
-
-$cpu_arch = Get-CpuArchitecture
-switch ($cpu_arch) {
-    arm64 {
-        $rust_arch = "aarch64"
-        $sha256="DBB09F213D5A9EBB3B2F4C7D65BA7C3C6CAD7D9A76927D079604020C3EA0AD5A"
-        Break
-    }
-    x64 {
-        $rust_arch = "x86_64"
-        $sha256="BD3FD270E92D12094151AAE3A67435B7FEF2164B10D96E99A94230929CDA09FD"
-        Break
-    }
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
-}
-
-$installer_name="rust-" + $rust_version + "-" + $rust_arch + "-pc-windows-msvc.msi"
-
-$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\" + $installer_name
-$url_official = "https://static.rust-lang.org/dist/" + $installer_name
-$tmp_package = "C:\Windows\Temp\" + $installer_name
-
-Download $url_official $url_cache $tmp_package
-Verify-Checksum $tmp_package $sha256 "sha256"
-Run-Executable "msiexec" "/quiet /i $tmp_package"
-
-Set-EnvironmentVariable "PATH" "C:\Program Files\Rust stable MSVC 1.92\bin;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
-
-Run-Executable "cargo" "install bindgen-cli --root=C:\Utils\rust-tools"
-
-Set-EnvironmentVariable "PATH" "C:\Utils\rust-tools\bin;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
-
-Write-Host "Cleaning $tmp_package.."
-Remove "$tmp_package"
-
-Write-Output "Rust = $version" >> ~\versions.txt

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

@@ -17,9 +17,9 @@ $install_location = "c:\Utils\$prog"
 
 $tmp_location = "c:\users\qt\downloads"
 Download $cached_url $cached_url "$tmp_location\$pkg"
-Verify-Checksum "$tmp_location\$pkg" $sha1
+Verify-Checksum "$tmp_location\$pkg" $sha1 sha1
 Download $dep_cached_url $dep_cached_url "$tmp_location\$dep_pkg"
-Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1
+Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1 sha1
 
 Extract-7Zip "$tmp_location\$pkg" $install_location
 Extract-7Zip "$tmp_location\$dep_pkg" $install_location

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

@@ -60,7 +60,7 @@ $vcpkgExeCacheUrl = "\\ci-files01-hki.ci.qt.io\provisioning\vcpkg\vcpkg-$nonDott
 $vcpkgExe = "C:\Windows\Temp\vcpkg.exe"
 
 Download "$vcpkgExeOfficialUrl" "$vcpkgExeCacheUrl" "$vcpkgExe"
-Verify-Checksum $vcpkgExe $vcpkgExechecksum
+Verify-Checksum $vcpkgExe $vcpkgExechecksum "sha256"
 Move-Item "$vcpkgExe" -Destination "$vcpkgRoot" -Force
 
 if(![System.IO.File]::Exists("$vcpkgRoot\vcpkg.exe")){

coin/provisioning/common/windows/install_telegraf.ps1

@@ -43,7 +43,7 @@ $tempfile = "C:\Windows\Temp\" + $filename_zip
 
 Write-Host "Fetching Telegraf $version..."
 Download $url_official $url_cache $tempfile
-Verify-Checksum $tempfile $sha256
+Verify-Checksum $tempfile $sha256 sha256
 
 Write-Host "Installing telegraf.exe under C:\Utils\telegraf"
 

coin/provisioning/common/windows/nodejs.ps1

@@ -38,7 +38,7 @@ $internalUrl = "http://ci-files01-hki.ci.qt.io/input/windows/node-v$version-win-
 
 Write-Host "Installing Node.js"
 Download $externalUrl $internalUrl $package
-Verify-Checksum $package $sha256
+Verify-Checksum $package $sha256 "sha256"
 Extract-7Zip $package $targetFolder
 Add-Path $installFolder
 Remove $package

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

@@ -1,28 +1,31 @@
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script installs OpenSSL ARM64 (debug version)
+# This script installs OpenSSL ARM64 $version.
 
-##### OpenSSL ARM64 and x64-arm64 has been pre-built with following commands #####
-# From Visual studio 'C++ Universal Windows Platform support for v143 build tools' and 'Windows Universal C Runtime' were installed
-# cd C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build
-# call vcvarsamd64_arm64 (or vcvarsarm64 in Windows 11 arm64 OS)
-# curl -o C:\Utils\openssl-3.5.4.zip http://ci-files01-hki.ci.qt.io/input/openssl/openssl-3.5.4.zip
-# (or https://github.com/openssl/openssl/releases/download/openssl-3.5.4/openssl-3.5.4.tar.gz)
+##### OpenSSL ARM64 has been pre-built with following commands #####
+# Two different builds were done to the same folder C:\openssl_arm64\. One with '--debug' and one with '--release' parameter
+# From Visual studio 'C++ Universal Windows Platform support for v142 build tools (ARM64)' and 'Windows Universal C Runtime' were installed
+# cd C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build
+# call vcvarsamd64_arm64
+# curl -o C:\Utils\openssl-3.0.7.zip http://ci-files01-hki.ci.qt.io/input/openssl/openssl-3.0.7.zip
 # cd C:\Utils
-# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.5.4.zip
-# cd C:\Utils\openssl-3.5.4
-# perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\
+# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.0.7.zip
+# cd C:\Utils\openssl-3.0.7
+# perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
 # nmake
 # nmake install
-##################################################################################
+#
+# perl Configure no-asm VC-WIN64-ARM --release --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
+# nmake
+# nmake install
+#################################################################################################################################################
 
-$version = "3.5.4"
-
-$url = "https://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version-prebuild-windows-msvc2022-arm64.zip"
-$sha1 = "e5fdf5c565e7c275fdfe877f31b387eb48da5d96"
+$version = "3_0_7"
+$url = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
+$sha1 = "19be15069d981b4a96f5715f039df7aaa7456d52"
 $installFolder = "C:\openssl_arm64"
 $zip_package = "C:\Windows\Temp\$version.zip"
 
@@ -35,8 +38,9 @@ Remove $zip_package
 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
     arm64 {
-        # Native arm64
+        # For native arm64
         Set-EnvironmentVariable "OPENSSL_ROOT_DIR_arm64" "$installFolder"
+        Set-EnvironmentVariable "OPENSSL_CONF_arm64" "$installFolder\bin\openssl.cfg"
         Set-EnvironmentVariable "OPENSSL_INCLUDE_arm64" "$installFolder\include"
         Set-EnvironmentVariable "OPENSSL_LIB_arm64" "$installFolder\lib"
         Break
@@ -44,6 +48,7 @@ switch ($cpu_arch) {
     x64 {
         # For cross-compiling x64_arm64
         Set-EnvironmentVariable "OPENSSL_ROOT_DIR_x64_arm64" "$installFolder"
+        Set-EnvironmentVariable "OPENSSL_CONF_x64_arm64" "$installFolder\bin\openssl.cfg"
         Set-EnvironmentVariable "OPENSSL_INCLUDE_x64_arm64" "$installFolder\include"
         Set-EnvironmentVariable "OPENSSL_LIB_x64_arm64" "$installFolder\lib"
     }

coin/provisioning/common/windows/openssl.ps1

@@ -1,44 +1,64 @@
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script installs OpenSSL x86_64 (debug version)
+# This script installs OpenSSL $version.
+# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-##### OpenSSL has been pre-built with following commands #####
-# cd C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build
-# call vcvarsamd64
-# curl -o C:\Utils\openssl-3.5.4.zip http://ci-files01-hki.ci.qt.io/input/openssl/openssl-3.5.4.zip
-# cd C:\Utils
-# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.5.4.zip
-# cd C:\Utils\openssl-3.5.4
-# perl Configure VC-WIN64A --debug --prefix=C:\openssl_x64\
-# nmake
-# nmake install
-####################################################################################################
+$version = "3_0_7"
+$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
+$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
-$version = "3.5.4"
-$url = "https://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version-prebuild-windows-msvc2022-x64.zip"
-$sha1 = "a028caa10ade0c1d39ad60d06201345908dfaaf2"
-$installFolder = "C:\openssl_x64"
-$zip_package = "C:\Windows\Temp\$version.zip"
+if (Is64BitWinHost) {
+
+    # Install x64 bit version
+    $architecture = "x64"
+    $installFolder = "C:\openssl"
+    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
+    $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
+    $sha1 = "2fb73f233bc565939312782b8157bebc26a5e17b"
+
+    Write-Host "Fetching from URL ..."
+    Download $externalUrl $internalUrl $packagex64
+    Verify-Checksum $packagex64 $sha1
+    Write-Host "Installing $packagex64 ..."
+    Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
+
+    Write-Host "Remove downloaded $packagex64 ..."
+    Remove "$packagex64"
+
+    Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg"
+    Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
+    Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
+    Prepend-Path "$installFolder\bin"
+}
+
+# Install x86 bit version
+$architecture = "x86"
+
+if (Is64BitWinHost) {
+    $installFolder = "C:\openssl$architecture"
+} else {
+    $installFolder = "C:\openssl"
+}
+
+$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
+$sha1 = "ddead693fa279ad6b1baf123b3af51a9ef289dc1"
 
 Write-Host "Fetching from URL ..."
-Download $url $url $zip_package
-Verify-Checksum $zip_package $sha1
-Extract-7Zip $zip_package C:\
-Remove $zip_package
+Download $externalUrl $internalUrl $packagex86
+Verify-Checksum $packagex86 $sha1
+Write-Host "Installing $packagex86 ..."
+Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
 
-Set-EnvironmentVariable "OPENSSL_ROOT_DIR_x64" "$installFolder"
-Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
-Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
+Write-Host "Remove downloaded $packagex86 ..."
+Remove "$packagex86"
 
-# Set envvars for builds in provisoning e.g. grpc
-Set-EnvironmentVariable "OPENSSL_ROOT_DIR" "$installFolder"
-Set-EnvironmentVariable "OPENSSL_INCLUDE" "$installFolder\include"
-Set-EnvironmentVariable "OPENSSL_LIB" "$installFolder\lib"
-
-Prepend-Path "$installFolder\bin"
+Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg"
+Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"
+Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib"
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
-Write-Output "OpenSSL x64= $version" >> ~/versions.txt
+Write-Output "OpenSSL = $version" >> ~/versions.txt

coin/provisioning/common/windows/winappsdk.ps1

@@ -13,7 +13,7 @@ $script:package_path = "$packageRoot\\$nugetPackage"
 
 New-Item -ItemType Directory -Path "$packageRoot"
 Download $officialUrl $cachedUrl $package_path
-Verify-Checksum $package_path $sdkChecksumSha1
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing Nuget"
 Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot"
 

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

@@ -252,8 +252,6 @@ installPackages+=(libusb-1.0-0-dev)
 # password management support for Qt Creator
 installPackages+=(libsecret-1-dev)
 installPackages+=(debian-archive-keyring)
-# Keep zoneinfo up-to-date (COIN-1282)
-installPackages+=(tzdata)
 
 
 echo "Running update for apt"

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/03-enable-repos.sh

@@ -22,15 +22,13 @@ sudo subscription-manager release --list
 
 # Do not update Tier 1 via GUI without using this same --set
 #   - To avoid System to have newer packages than RPMS which will cause update issues
-#   - Note! This will only work with RHEL official RPMs - Not with internal repo clones
 sudo subscription-manager release --set=10.0
 sudo yum clean all
 
-# Internal repo-clones must have exact release numbers to lock packages correctly
 sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
 [rhel-10-for-x86_64-baseos-rpms]
 metadata_expire = 86400
-baseurl = http://repo-clones-rhel10.ci.qt.io/10.0/rhel-10-for-x86_64-baseos-rpms
+baseurl = http://repo-clones-rhel10.ci.qt.io/rhel-10-for-x86_64-baseos-rpms
 ui_repoid_vars = releasever basearch
 name = Qt Red Hat Enterprise Linux 10 Base OS (RPMs)
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
@@ -39,7 +37,7 @@ gpgcheck = 1
 
 [rhel-10-for-x86_64-appstream-rpms]
 metadata_expire = 86400
-baseurl = http://repo-clones-rhel10.ci.qt.io/10.0/rhel-10-for-x86_64-appstream-rpms
+baseurl = http://repo-clones-rhel10.ci.qt.io/rhel-10-for-x86_64-appstream-rpms
 ui_repoid_vars = releasever basearch
 name = Qt Red Hat Enterprise Linux 10 Appstream (RPMs)
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
@@ -48,7 +46,7 @@ gpgcheck = 1
 
 [codeready-builder-for-rhel-10-x86_64-rpms]
 metadata_expire = 86400
-baseurl = http://repo-clones-rhel10.ci.qt.io/10.0/codeready-builder-for-rhel-10-x86_64-rpms
+baseurl = http://repo-clones-rhel10.ci.qt.io/codeready-builder-for-rhel-10-x86_64-rpms
 ui_repoid_vars = releasever basearch
 name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
@@ -56,18 +54,9 @@ enabled = 1
 gpgcheck = 1
 EOC
 
-# Epel repo must have exact release number to lock packages correctly
-sudo tee "/etc/yum.repos.d/epel-10.0.repo" > /dev/null <<EOC
-[epel-10.0]
-name = Extra Packages for Enterprise Linux 10.0 (Qt pinned)
-baseurl = https://dl.fedoraproject.org/pub/epel/10.0/Everything/x86_64/
-enabled = 1
+# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
+sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
 
-gpgcheck = 1
-repo_gpgcheck = 0
-gpgkey = https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-10
-
-metadata_expire = 86400
-skip_if_unavailable = false
-priority = 90
-EOC
+sudo yum clean all
+# As well as this fetching the repository data, we also get a printout of the used repos
+sudo yum repolist

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

@@ -8,8 +8,7 @@ set -ex
 sudo yum -y remove PackageKit gnome-software
 
 # CI: All platforms should have up-to-date packages when new provision is made
-echo "Quick fix: Temporarily skip RHEL 10.0 updates due to cockpit update fail (QTQAINFRA-7773)"
-#sudo yum -y update
+sudo yum -y update
 
 installPackages=()
 # Make sure needed ca-certificates are available
@@ -84,7 +83,6 @@ installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
 installPackages+=(python3-html5lib)
 installPackages+=(libstdc++-static)
-installPackages+=(libatomic)
 # For Android builds
 #installPackages+=(java-21-openjdk-devel.21.0.9.0.10-1.el10)
 installPackages+=(java-21-openjdk-devel)
@@ -163,8 +161,6 @@ installPackages+=(perl-JSON)
 installPackages+=(perl-Test-Simple) # To install Test::More module for SBOM
 # For qtgrpc build
 installPackages+=(zlib-static)
-# Keep zoneinfo up-to-date (COIN-1282)
-installPackages+=(tzdata)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/05-libclang-dyn.sh

@@ -5,4 +5,4 @@ set -ex
 
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/libclang-dyn.sh
-"$BASEDIR/../common/unix/libclang-dyn.sh"
+"$BASEDIR/../common/unix/libclang-dyn.sh" "-snld10"

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/05-libclang.sh

@@ -5,4 +5,4 @@ set -ex
 
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/libclang.sh
-"$BASEDIR/../common/unix/libclang.sh"
+"$BASEDIR/../common/unix/libclang.sh" "-snld10"

coin/provisioning/qtci-linux-RHEL-10.0-x86_64/30-install_icu.sh

@@ -23,7 +23,7 @@ echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
 
 targetFile=$(mktemp)
 DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
-sudo 7z x -y -o/usr/lib64 "$targetFile"
+sudo 7z x -snld10 -y -o/usr/lib64 "$targetFile"
 sudo rm "$targetFile"
 
 echo "Installing custom ICU devel packages on RHEL"
@@ -32,7 +32,7 @@ tempDir=$(mktemp -d)
 
 targetFile=$(mktemp)
 DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile"
-7z x -y -o"$tempDir" "$targetFile"
+7z x -snld10 -y -o"$tempDir" "$targetFile"
 
 sudo cp -a "$tempDir"/lib/* /usr/lib64
 sudo cp -a "$tempDir"/* /usr/