coin: Update vcpkg to 2026.06.24-qt

Change-Id: I28a0ad7271d5800fefadcc5578b79bc69cea9999 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
[VxWorks] Tune the NFS server and move TMP,HOME,CACHE dirs to ramfs
2026-09-06 01:07:37 +08:00 · 2026-09-04 09:39:27 +00:00 · 2026-09-04 09:39:24 +00:00 · 2026-09-04 09:39:21 +00:00 · 2026-09-03 04:39:22 +00:00 · 2026-09-03 04:39:17 +00:00
110 changed files with 587 additions and 212 deletions
@@ -1,46 +1,46 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.12
+	branch = dev
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.12
+	branch = dev
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.12
+	branch = dev
 	status = essential
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.12
+	branch = dev
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -48,7 +48,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.12
+	branch = dev
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.12
+	branch = dev
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,234 +69,234 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.12
+	branch = dev
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.12
+	branch = dev
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.12
+	branch = dev
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.12
+	branch = dev
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative qtquicktimeline
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.12
+	branch = dev
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.12
+	branch = dev
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.12
+	branch = dev
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = 6.12
+	branch = dev
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = 6.12
+	branch = dev
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = 6.12
-	status = addon
+	branch = dev
+	status = preview
@@ -181,6 +181,7 @@ function(qt_ir_clone_one_submodule submodule_name)
    set(oneValueArgs
        ALTERNATES
        BASE_URL
+        DEPTH
        WORKING_DIRECTORY
    )
    set(multiValueArgs "")
@@ -263,6 +264,9 @@ function(qt_ir_clone_one_submodule submodule_name)
        else()
            list(APPEND clone_args --no-checkout)
        endif()
+        if(arg_DEPTH)
+            list(APPEND clone_args --depth "${arg_DEPTH}")
+        endif()
        list(APPEND clone_args ${progress_args})
        qt_ir_execute_process_and_log_and_handle_error(
            COMMAND_ARGS git clone ${clone_args} "${mirror_or_original_url}" "${submodule_path}"
@@ -1063,6 +1067,7 @@ function(qt_ir_handle_init_submodules prefix)
    set(oneValueArgs
        ALTERNATES
        BASE_URL
+        DEPTH
        PARENT_REPO_BASE_GIT_PATH
        WORKING_DIRECTORY
    )
@@ -1123,6 +1128,7 @@ function(qt_ir_handle_init_submodules prefix)
        qt_ir_clone_one_submodule(${submodule_name}
            ALTERNATES ${arg_ALTERNATES}
            BASE_URL ${arg_BASE_URL}
+            DEPTH "${arg_DEPTH}"
            WORKING_DIRECTORY "${working_directory}"
            ${branch_flag}
            ${fetch_flag}
@@ -1163,6 +1169,7 @@ function(qt_ir_handle_init_submodules prefix)
                    SUBMODULES "all"

                    BASE_URL "${base_url}"
+                    DEPTH "${arg_DEPTH}"
                    PARENT_REPO_BASE_GIT_PATH "${submodule_base_git_path}"
                    WORKING_DIRECTORY "${working_directory}/${submodule_name}"

@@ -122,6 +122,16 @@ Options:

        Note that this negates the disk usage benefits gained from the use
        of `--alternates'.
+
+    --depth <n>
+        Creates a shallow clone with a history truncated to <n> commits for
+        each submodule that is cloned, by passing `--depth <n>' to `git
+        clone'. This also applies recursively to submodules of submodules
+        (e.g. qtwebengine's third-party dependencies).
+
+        This option only affects submodules that are freshly cloned; it has
+        no effect on already-cloned submodules that are merely updated or
+        fetched.
    --mirror <url-base>
        Uses <url-base> as the base URL for submodule git mirrors.

@@ -312,6 +312,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
    # Get some additional options to pass down.
    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
    qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)
+    qt_ir_get_option_value(depth depth)

    # The prefix for the cmake-style 'dictionary' that will be used by various functions.
    set(prefix "ir_top")
@@ -321,6 +322,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
        ALTERNATES "${alternates}"
        ALREADY_INITIALIZED_SUBMODULES "${already_initialized_submodules}"
        BASE_URL "${base_url}"
+        DEPTH "${depth}"
        PARENT_REPO_BASE_GIT_PATH "${qt5_repo_name}"
        PROCESS_SUBMODULES_FROM_COMMAND_LINE
        WORKING_DIRECTORY "${working_directory}"
@@ -16,6 +16,7 @@ macro(qt_ir_set_known_command_line_options)
    qt_ir_commandline_option(codereview-username TYPE string)
    qt_ir_commandline_option(codereview-https TYPE boolean)
    qt_ir_commandline_option(copy-objects TYPE boolean)
+    qt_ir_commandline_option(depth TYPE string)
    qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
    qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)
    qt_ir_commandline_option(force-hooks TYPE boolean)
@@ -30,3 +30,6 @@ enable_if:
    - condition: property
      property: target.os
      equals_value: Linux
+    - condition: property
+      property: target.osVersion
+      not_equals_value: HarmonyOS_ANY
@@ -358,7 +358,7 @@ Configurations:
    Id: 'rhel-10.0'
    Template: 'qtci-linux-RHEL-10.0-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'DoNotAbortTestingOnFirstFailure']
    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',
@@ -10,7 +10,7 @@ Configurations:
    Platform dependency: 'macos-universal-on-arm64'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
@@ -26,7 +26,7 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
@@ -41,7 +41,7 @@ Configurations:
    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
    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',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds
@@ -60,7 +60,7 @@ Configurations:
    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
    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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -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_ANDROID_GRADLE_MULTI_MODULE only in one
@@ -79,7 +79,7 @@ Configurations:
    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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -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_ANDROID_GRADLE_MULTI_MODULE only in one
@@ -0,0 +1,4 @@
+Version: 2
+Module only: True
+Include: [yocto.yaml]
+Configurations: []
@@ -0,0 +1,24 @@
+Version: 2
+Module only: True
+Include: [
+  cmake_platforms.yaml: [
+    "ios-arm64-simulator"
+  ]
+]
+Configurations:
+-
+    Id: 'ios-26-simulator-tests'
+    Template: 'qtci-macos-26-arm-105'
+    Compiler: 'Clang'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Platform dependency: 'ios-arm64-simulator'
+    Features: ['TestOnly', 'Insignificant', 'DoNotAbortTestingOnFirstFailure']
+    Environment variables: [
+        'APPLE_SIMULATOR_DEVICE_TYPE=com.apple.CoreSimulator.SimDeviceType.iPad-Pro-13-inch-M4-8GB',
+    ]
+Overrides:
+-
+    Id: 'ios-arm64-simulator'
+    -Features: ['DisableTests']
+    +Features: ['DoNotRunTests']
@@ -0,0 +1,14 @@
+Version: 2
+Module only: True
+Configurations:
+-
+    Id: 'ubuntu-24.04-lcov'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'lcov', 'VMSize8', 'DisableTests']
+    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
+    ]
+
@@ -0,0 +1,6 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml,
+    address_sanitizer_platforms.yaml
+]
+Configurations: []
@@ -7,6 +7,7 @@ Include: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
    "ubuntu-24.04-arm64",
+    "ubuntu-24.04-x64",
    "opensuse-16.0-developer-build",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# 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
+
+set -e
+
+OS_STATE_DIR="/var/lib/qtciid"
+OS_STATE_FILE="$OS_STATE_DIR/os-version"
+
+get_os_id() {
+    if [[ -r /etc/os-release ]]; then
+        # shellcheck disable=SC1091
+        . /etc/os-release
+        # os-release contains ID of the distro (e.g. 'ubuntu')
+        # VERSION e.g. '24.04.1 LTS (Noble Numbat)'
+        if [[ -n "${ID:-}" && -n "${VERSION:-}" ]]; then
+            echo "${ID}:${VERSION}"
+            return 0
+        fi
+    fi
+
+    echo "unknown:unknown"
+    return 1
+}
+
+record_os_version() {
+    local os_id
+
+    os_id="$(get_os_id)"
+
+    if [[ "$os_id" == "unknown:unknown" ]]; then
+        echo "ERROR: Unable to determine OS version"
+        exit 1
+    fi
+
+    sudo mkdir -p "$OS_STATE_DIR"
+    echo "$os_id" | sudo tee "$OS_STATE_FILE" > /dev/null
+
+    echo "OS version: $os_id"
+}
+
+verify_os_version_unchanged() {
+    if [[ ! -f "$OS_STATE_FILE" ]]; then
+        echo "ERROR: OS version state file missing: $OS_STATE_FILE"
+        exit 1
+    fi
+
+    local start_version current_version
+
+    start_version="$(cat "$OS_STATE_FILE")"
+    current_version="$(get_os_id)"
+
+    if [[ "$current_version" == "unknown:unknown" ]]; then
+        echo "ERROR: Unable to determine current OS version"
+        exit 1
+    fi
+
+    if [[ "$start_version" != "$current_version" ]]; then
+        echo "ERROR: OS version changed during provisioning!"
+        echo "  Start version : $start_version"
+        echo "  End version   : $current_version"
+        exit 1
+    fi
+
+    echo "OS version unchanged ($current_version)"
+}
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
+sha1="c37e6f3a49a259d450b601843a9af2818b6feb96"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 # IANA timezone database overlay. Packaged separately from the SDP so it can be
@@ -43,9 +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-20260828.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="a3fdcd98e12bc5054d00f18e4088af26288fd020"
+sha1="f44b66d91625ab33e367cfb62a2950a041607caa"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 # IANA timezone database overlay. Packaged separately from the SDP so it can be
@@ -60,14 +60,17 @@ sudo cp "$aarch64le_toolchain" "$targetPath"
 sudo cp "$armv7le_toolchain" "$targetPath"
 sudo cp "$x8664_toolchain" "$targetPath"
 cp -R "$QNX_qemu_bld_files_dir" "$qemuTargetPath"
-# fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
-# Download code-only package from https://www.iana.org/time-zones and follow README
-# to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
-# package which contains it and update required info below
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
+# The SDP ships fc-cache but not fc-match, which tst_qfont needs. Build it from
+# fontconfig's fc-match/fc-match.c at the release matching the SDP's fontconfig
+# (FC_MINOR/FC_REVISION in fontconfig.h), once per arch:
+#   qcc -Vgcc_ntox86_64 -O2 -o fc-match fc-match.c \
+#       -DHAVE_GETOPT_LONG=1 -DHAVE_UNISTD_H=1 -lfontconfig
+# Pack as <arch>/fc-match into a new dated archive, then update below. 7.1 keeps
+# its own archive.
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx_qemu_utils_800_20260825.tar.xz"
 targetFile="qnx_qemu_utils.tar.xz"
 targetFolder="$qemuTargetPath/local/misc_files"
-sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"
+sha1="965b957c76d4bc59c010bb0908d1fea8975179c1"

 mkdir -p "$targetFolder"

@@ -17,7 +17,7 @@ var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf
 var/share/fonts=usr/share/fonts

 var/etc/hosts=local/misc_files/etc/hosts
-var/etc/resolv.conf=local/misc_files/etc/resolv.conf
+var/dhcpcd/resolv.conf=local/misc_files/etc/resolv.conf
 var/etc/nsswitch.conf=etc/nsswitch.conf

 [uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs
@@ -28,6 +28,8 @@ lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libdbus-1.so=usr/lib//libdbus-1.so
 lib/libdbus-1.so.22=usr/lib//libdbus-1.so.22
 lib/libbacktrace.so.1=lib/libbacktrace.so.1
+lib/libunwind-nto.so.0=usr/lib/libunwind-nto.so.0
+lib/libunwind-x86_64.so.8=usr/lib/libunwind-x86_64.so.8
 lib/libm.so.3=lib/libm.so.3

 #############################################
@@ -61,10 +63,9 @@ lib/libasound.so.5=lib/libasound.so.5
 # for fontconfig
 lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17
 xbin/fc-cache=bin/fc-cache
-xbin/fc-match=local/misc_files/fc-match
+xbin/fc-match=local/misc_files/x86_64/fc-match

 # network
 lib/libssl.so=usr/lib/libssl.so
-xbin/nslookup=usr/bin/nslookup
 xbin/unbound=sbin/unbound
 xbin/curl=usr/bin/curl
@@ -22,12 +22,12 @@ SetEnvVar "VXWORKS_HOME" "/opt/vxworks"
 SetEnvVar "VXWORKS_SSH" "WindRiver@172.31.1.10"

 # IMX 6
-VXWORKS_BUILD_VER="12-05-2026_2"
+VXWORKS_BUILD_VER="20-08-2026"
 ######### VXworks toolchain #########
 # Installs to /opt/fsl_imx6_2_0_6_3_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="a1553f377ae84a722c8ad258fccb684f9198717c"
+sha1="cb40acde7227aaefe8397e3472318fe09af2d9d0"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_3_VSB"
@@ -36,7 +36,7 @@ SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_3_VSB"
 # Installs to /opt/fsl_imx6_2_0_6_3_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="487a056d389a764717142100fb408e65ea720f92"
+sha1="4209a8c2724fccfec9d30a22e53ca6598ef83b57"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

@@ -44,20 +44,20 @@ InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder"
 # Installs to /opt/nxp_imx8_1_0_7_1_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_imx8_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="b312f38a7ca670398c940c25d20ed2a26155160d"
+sha1="20c1c31fc8ddc5356566a717a913e51bef42d41f"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

 # Installs to /opt/itl_generic_skylake_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="9fddd5aa0b9599113c22670fcc1221004978ee8a"
+sha1="dae9280a45f0ece5a2adc3bc6182ff0b675f4389"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 # Installs to /opt/itl_generic_skylake_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="cb366addbea7a1fd34aa49b739dcc0b480350fce"
+sha1="264b3280e6fa89c8c8a2b1cdc8cb29bd3f1bb621"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

@@ -35,21 +35,38 @@ fi
 exec 9>"/tmp/vxworks_qemu_host_setup.lock"
 flock 9
 NFS_CONF_MARKER="# VxWorks QEMU NFS settings (added by vxworks_qemu_launcher.sh)"
+# Persist the sysctl settings so they survive the reboot between the build
+# and test phases, then apply them to the running kernel as well.
+SYSCTL_CONF="/etc/sysctl.d/90-vxworks-qemu.conf"
+if [ ! -f "$SYSCTL_CONF" ]; then
+    sudo tee "$SYSCTL_CONF" >/dev/null <<'EOF'
+# VxWorks QEMU network settings (added by vxworks_qemu_launcher.sh)
+net.core.rmem_max=8388608
+net.core.rmem_default=8388608
+net.core.wmem_max=8388608
+net.core.wmem_default=8388608
+net.ipv4.ipfrag_high_thresh=16777216
+net.ipv4.ipfrag_low_thresh=12582912
+EOF
+fi
+sudo sysctl -q -p "$SYSCTL_CONF"
+
 if ! grep -qF "$NFS_CONF_MARKER" /etc/nfs.conf; then
    # Configure NFS for UDP traffic
    sudo bash -c "echo -e '\n${NFS_CONF_MARKER}\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e '[nfsd]\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e 'threads=32\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'udp=y\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'tcp=n\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'vers2=n\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'vers3=y\n' >> /etc/nfs.conf"
    sudo bash -c "echo -e 'vers4=n\n' >> /etc/nfs.conf"
    # Setup NFS exports that are needed by VxWorks qemu
-    sudo bash -c "echo '/home/qt/work 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-    sudo bash -c "echo '/opt/fsl_imx6_2_0_6_3_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-    sudo bash -c "echo '/opt/itl_generic_skylake_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/home/qt/work 172.31.1.10/24(rw,async,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/opt/fsl_imx6_2_0_6_3_VSB 172.31.1.10/24(rw,async,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/opt/itl_generic_skylake_VSB 172.31.1.10/24(rw,async,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
    # Restart NFS server
-    sudo exportfs -a
+    sudo exportfs -ra
    sudo systemctl restart nfs-server
 fi

@@ -70,7 +87,7 @@ if [ "$TYPE" = "arm" ] || [ "$TYPE" = "" ]; then
    $VXWORKS_QEMU/bin/qemu-system-arm \
        -machine sabrelite \
        -smp 2 \
-        -m 2G \
+        -m 3G \
        -nographic \
        -monitor none \
        -serial null \
@@ -85,7 +102,7 @@ elif [ "$TYPE" = "intel" ]; then
    $VXWORKS_QEMU/bin/qemu-system-x86_64 \
        -M q35 \
        -smp 4 \
-        -m 8G \
+        -m 15G \
        -cpu "Skylake-Client" \
        -enable-kvm \
        -monitor none \
@@ -96,15 +113,49 @@ elif [ "$TYPE" = "intel" ]; then
        -append "sysbootline:gei(0,0)host:vxWorks h=172.31.1.1 g=172.31.1.1 e=${GUEST_IP} u=target pw=vxTarget s=/romfs/startup_script.txt" \
        -nic "tap,ifname=${TAP},script=no,downscript=no,mac=${MAC}" >"${QEMU_LOG_PATH}" 2>&1 &
 fi
+QEMU_PID=$!

-for _ in $(seq 30)
+# The launcher is also re-invoked from inside the ctest environment when
+# coin_vxworks_qemu_runner.sh restarts a wedged emulator. That environment
+# carries a library path with the provisioned OpenSSL, which the system ssh
+# (linked against the distro OpenSSL) refuses to load ("OpenSSL version
+# mismatch"), so run ssh with a clean library path. Bound each probe with a
+# hard timeout as well: ConnectTimeout only limits TCP connect, and a
+# half-booted guest that accepts the connection but never answers would
+# otherwise stall the loop.
+#
+# Boot-to-ssh takes seconds on KVM x86 but 15-60s+ on TCG ARM, with a long
+# tail when several instances boot in parallel (a fixed 30-try budget killed
+# healthy relaunches mid-boot on qemu_armv7), so wait on a wall-clock
+# deadline rather than a retry count, and give up early only when the QEMU
+# process itself has died.
+SSH_WAIT_SECS=${VXWORKS_SSH_WAIT_SECS:-300}
+SSH_UP=0
+deadline=$((SECONDS + SSH_WAIT_SECS))
+while (( SECONDS < deadline ))
 do
-    status=$(ssh -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa -o ConnectTimeout=1 "${SSH_TARGET}" echo emulator up) || true
+    if [[ -n "$QEMU_PID" ]] && ! kill -0 "$QEMU_PID" 2>/dev/null; then
+        echo "QEMU process for instance ${INSTANCE} exited during boot"
+        break
+    fi
+    status=$(env -u LD_LIBRARY_PATH timeout -k 5 15 \
+        ssh -n -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa \
+            -o ConnectTimeout=1 "${SSH_TARGET}" echo emulator up) || true
    if [[ $status == *"emulator up"* ]] ; then
        echo "VXWORKS QEMU SSH server up (instance ${INSTANCE} @ ${GUEST_IP})"
+        SSH_UP=1
        break
    else
        echo "Waiting VXWORKS QEMU SSH server (instance ${INSTANCE} @ ${GUEST_IP})"
        sleep 1
    fi
 done
+
+# Do not report success for an instance whose SSH server never came up: the
+# caller would go on to source the test script on a guest in an unknown
+# state. Exit non-zero so the testrunner's restart path can fail the attempt
+# and let qt-testrunner retry with a clean slot.
+if [[ $SSH_UP -ne 1 ]]; then
+    echo "VXWORKS QEMU SSH server did not come up (instance ${INSTANCE} @ ${GUEST_IP})"
+    exit 1
+fi
@@ -58,7 +58,12 @@ function InstallXCode() {
    # Xcode 26 ships a more minimal base install
    if ((majorVersion >= 26)); then
        xcodebuild -downloadComponent MetalToolchain
-        xcodebuild -downloadPlatform iOS
+        if ((majorVersion >= 27)); then
+            # No more universal iOS simulator in Xcode 27
+            xcodebuild -downloadPlatform iOS
+        else
+            xcodebuild -downloadPlatform iOS -architectureVariant universal
+        fi
        if [[ $(uname -m) == "arm64" ]]; then
            xcodebuild -downloadPlatform visionOS
        fi
@@ -3,7 +3,7 @@
  "default-registry": {
    "kind": "git",
    "repository": "https://git.qt.io/qtbuildsystem/vcpkg",
-    "baseline": "93580fc29654eec8d22804a01d7191284d65f28e"
+    "baseline": "73c16d68a4d5889bee3c64fe3534b8fee35baabd"
  },
  "overlay-triplets": [ "./../triplets" ]
 }
@@ -1 +1 @@
-vcpkg_version=2026.06.01-qt
+vcpkg_version=2026.06.24-qt
@@ -2,25 +2,38 @@
 # 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

-download_ffmpeg() {
-    local version="${1:-"n8.1.2"}"
-    local sha1="${2:-a7f4ce77209afdadca9f371db261e8d69903dc85}"
+download_ffmpeg() (
+    local version="${1:-"9.0.1"}"
+    local sha1="${2:-89c318905212e6b67e10e42ab10ab8007e0aefda}"

-    local ffmpeg_name="FFmpeg-$version"
+    local ffmpeg_name="FFmpeg-n$version"
    local target_dir="$HOME"
    local ffmpeg_source_dir="$target_dir/$ffmpeg_name"

    if [ ! -d "$ffmpeg_source_dir" ]; then
-        local url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-        local url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/FFmpeg-$version.tar.gz"
+        local url_public="https://ffmpeg.org/releases/ffmpeg-$version.tar.gz"
+        local url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/ffmpeg-$version.tar.gz"
        local app_prefix=""

+        local temp_dir
+        temp_dir=$(mktemp -d)
+        trap 'rm -rf "$temp_dir"' EXIT
+
        source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-        InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" > /dev/null
+        InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$temp_dir" "$app_prefix" > /dev/null
+
+        local extracted_dirs=("$temp_dir"/*/)
+        if [ "${#extracted_dirs[@]}" -ne 1 ] || [ ! -d "${extracted_dirs[0]}" ]; then
+            >&2 echo "Expected exactly one directory in the FFmpeg archive, got: ${extracted_dirs[*]}"
+            exit 1
+        fi
+
+        mkdir -p "$target_dir"
+        mv "${extracted_dirs[0]%/}" "$ffmpeg_source_dir"
    fi

    echo "$ffmpeg_source_dir"
-}
+)

 get_ffmpeg_config_options() {
    local build_type="$1"
@@ -20,11 +20,22 @@ function Verify-Checksum
    }
 }

+function Run-Executable-With-Timeout
+{
+    Param (
+        [int]$TimeoutSeconds=$(throw("You must specify a timeout.")),
+        [string]$Executable=$(throw("You must specify a program to run.")),
+        [string[]]$Arguments
+    )
+    Run-Executable -Executable $Executable -Arguments $Arguments -TimeoutSeconds $TimeoutSeconds
+}
+
 function Run-Executable
 {
    Param (
        [string]$Executable=$(throw("You must specify a program to run.")),
-        [string[]]$Arguments
+        [string[]]$Arguments,
+        [int]$TimeoutSeconds = 0
    )

    $stdoutFile = [System.IO.Path]::GetTempFileName()
@@ -32,13 +43,32 @@ function Run-Executable

    if ([string]::IsNullOrEmpty($Arguments)) {
        Write-Host "Running `"$Executable`""
-        $p = Start-Process -FilePath "$Executable" -Wait -PassThru `
-            -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile
    } else {
        Write-Host "Running `"$Executable`" with arguments `"$Arguments`""
-        $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru `
-            -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile
-        Wait-Process -InputObject $p
+    }
+
+    $startArgs = @{
+        FilePath               = $Executable
+        PassThru               = $true
+        RedirectStandardOutput = $stdoutFile
+        RedirectStandardError  = $stderrFile
+    }
+    if (-not [string]::IsNullOrEmpty($Arguments)) {
+        $startArgs.ArgumentList = $Arguments
+    }
+    $p = Start-Process @startArgs
+    # Force PowerShell to cache the process handle. Without this, $p.ExitCode
+    # can read back as $null after the process exits.
+    # See https://github.com/PowerShell/PowerShell/issues/5421
+    $null = $p.Handle
+
+    if ($TimeoutSeconds -gt 0) {
+        if (-not $p.WaitForExit($TimeoutSeconds * 1000)) {
+            $p.Kill()
+            throw "Process $($Executable) timed out after $TimeoutSeconds seconds"
+        }
+    } else {
+        $p.WaitForExit()
    }

    $stdoutContent = [System.IO.File]::ReadAllText($stdoutFile)
@@ -7,21 +7,38 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"

-$version="n8.1.2"
-$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="a7f4ce77209afdadca9f371db261e8d69903dc85"
-$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/FFmpeg-$version.tar.gz"
-$ffmpeg_name="FFmpeg-$version"
+$version="9.0.1"
+$url_public="https://ffmpeg.org/releases/ffmpeg-$version.tar.gz"
+$sha1="89c318905212e6b67e10e42ab10ab8007e0aefda"
+$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/ffmpeg-$version.tar.gz"
+$ffmpeg_name="FFmpeg-n$version"

 $download_location = "C:\Windows\Temp\$ffmpeg_name.tar.gz"
 $unzip_location = "C:\"
+$ffmpeg_source_dir = "C:\$ffmpeg_name"

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

-Download $url_public $url_cached $download_location
-Verify-Checksum $download_location $sha1
-Extract-tar_gz $download_location $unzip_location
-Remove $download_location
+$extract_temp_dir = "C:\Windows\Temp\FFmpeg-extract-$([System.Guid]::NewGuid().ToString('N'))"
+
+try {
+    New-Item -ItemType Directory -Path $extract_temp_dir -Force | Out-Null
+
+    Download $url_public $url_cached $download_location
+    Verify-Checksum $download_location $sha1
+    Extract-tar_gz $download_location $extract_temp_dir
+
+    $extracted_dirs = @(Get-ChildItem -Path $extract_temp_dir -Directory)
+    if ($extracted_dirs.Count -ne 1) {
+        throw "Expected exactly one directory in the FFmpeg archive, got: $($extracted_dirs.Name -join ', ')"
+    }
+
+    Remove $ffmpeg_source_dir
+    Move-Item -Path $extracted_dirs[0].FullName -Destination $ffmpeg_source_dir
+} finally {
+    Remove $download_location
+    Remove $extract_temp_dir
+}

 function GetFfmpegDefaultConfiguration {
    $defaultConfiguration = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
@@ -36,7 +36,7 @@ $nppPackage = "C:\Windows\Temp\npp-$version.exe"

 Download $url_official $url_cache $nppPackage
 Verify-Checksum $nppPackage $sha1
-Run-Executable "$nppPackage" "/S"
+Run-Executable-With-Timeout 1800 "$nppPackage" "/S"

 Write-Host "Cleaning $nppPackage.."
 Remove "$nppPackage"
@@ -28,10 +28,10 @@ $folderName = "qnx710"
 $targetPath = "$targetFolder$folderName"

 # QNX SDP
-$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20260422.tar.xz"
-$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
+$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20260828.tar.xz"
+$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
 $targetFile = "qnx710.tar.xz"
-$sha1 = "98b24df7e8c53a104aee76e769011396fa4bdafd"
+$sha1 = "c37e6f3a49a259d450b601843a9af2818b6feb96"
 DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl

 Copy-Item $aarch64le_toolchain $targetPath
@@ -28,10 +28,10 @@ $folderName = "qnx800"
 $targetPath = "$targetFolder$folderName"

 # QNX SDP
-$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx800-windows-linux-20260410.tar.xz"
-$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
+$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx800-windows-linux-20260828.tar.xz"
+$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260828.tar.xz"
 $targetFile = "qnx800.tar.xz"
-$sha1 = "a3fdcd98e12bc5054d00f18e4088af26288fd020"
+$sha1 = "f44b66d91625ab33e367cfb62a2950a041607caa"
 DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl

 # IANA timezone database overlay. Packaged separately from the SDP so it can be
@@ -7,6 +7,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
@@ -5,11 +5,7 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

-name="p7zip"
-version="7-11"
-sudo yum -y install "$name"
+# p7zip has a pathing bug in rhel-10, install 7zip-standalone-all instead
+sudo dnf install -y 7zip-standalone-all

-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
-
-echo "$name = $version" >> ~/versions.txt
+sudo ln -s /usr/bin/7zz /usr/bin/7z
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 source "${BASH_SOURCE%/*}/../common/linux/verify-release-packages.sh"

@@ -8,6 +8,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
@@ -9,9 +9,6 @@ set -ex

 name="p7zip"
 version="7-11"
-sudo yum -y install "$name"
-
-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo dnf -y install "$name" "$name-plugins"

 echo "$name = $version" >> ~/versions.txt
@@ -9,6 +9,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -7,9 +7,6 @@ set -ex

 name="p7zip"
 version="7-11"
-sudo yum -y install "$name"
-
-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo dnf -y install "$name" "$name-plugins"

 echo "$name = $version" >> ~/versions.txt
@@ -7,9 +7,6 @@ set -ex

 name="p7zip"
 version="7-11"
-sudo yum -y install "$name"
-
-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo dnf -y install "$name" "$name-plugins"

 echo "$name = $version" >> ~/versions.txt
@@ -9,9 +9,6 @@ set -ex

 name="p7zip"
 version="7-11"
-sudo yum -y install "$name"
-
-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo dnf -y install "$name" "$name-plugins"

 echo "$name = $version" >> ~/versions.txt
@@ -9,9 +9,6 @@ set -ex

 name="p7zip"
 version="7-11"
-sudo yum -y install "$name"
-
-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo dnf -y install "$name" "$name-plugins"

 echo "$name = $version" >> ~/versions.txt
@@ -5,11 +5,7 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

-name="p7zip"
-version="7-11"
-sudo yum -y install "$name"
+sudo dnf install -y 7zip-standalone-all

-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo ln -s /usr/bin/7zz /usr/bin/7z

-echo "$name = $version" >> ~/versions.txt
@@ -5,11 +5,7 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

-name="p7zip"
-version="7-11"
-sudo yum -y install "$name"
+sudo dnf install -y 7zip-standalone-all

-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo ln -s /usr/bin/7zz /usr/bin/7z

-echo "$name = $version" >> ~/versions.txt
@@ -7,6 +7,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
@@ -5,11 +5,7 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

-name="p7zip"
-version="7-11"
-sudo yum -y install "$name"
+sudo dnf install -y 7zip-standalone-all

-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo ln -s /usr/bin/7zz /usr/bin/7z

-echo "$name = $version" >> ~/versions.txt
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -7,6 +7,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/shared/network_test_server_ip.txt
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
@@ -5,11 +5,7 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

-name="p7zip"
-version="7-11"
-sudo yum -y install "$name"
+sudo dnf install -y 7zip-standalone-all

-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
+sudo ln -s /usr/bin/7zz /usr/bin/7z

-echo "$name = $version" >> ~/versions.txt
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -9,6 +9,11 @@ BASEDIR=$(dirname "$0")
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -11,6 +11,11 @@ source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 echo "Set timezone to UTC."
 sudo timedatectl set-timezone Etc/UTC
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -29,6 +29,11 @@ EOC

 (ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."

+# Disable proposed repos because it causes Py mismatches
+# python3.10       3.10.12-1~22.04.17  (proposed)
+# python3.10-venv  3.10.12-1~22.04.16  (mirror)
+sudo mv /etc/apt/sources.list.d/proposed.list /etc/apt/sources.list.d/proposed.list.disabled
+
 # Make sure needed ca-certificates are available
 installPackages+=(ca-certificates)

@@ -44,7 +49,7 @@ installPackages+=(p7zip-full)
 installPackages+=(openjdk-21-jdk)
 installPackages+=(gcc)
 installPackages+=(curl)
-installPackages+=(libicu-dev)
+# installPackages+=(libicu-dev)
 installPackages+=(python3-dev)
 installPackages+=(python3-pip)
 installPackages+=(python3-venv)
@@ -64,6 +69,10 @@ echo "Installing packages"
 waitLoop
 sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 install "${installPackages[@]}"

+# libicu70 (libicu-dev) has 70.1-2ubuntu1 vs 70.1-2 apt sync issues
+# Allow 70.1-2ubuntu1 -> 70.1-2 downgrade
+sudo apt install -y --allow-downgrades libicu70=70.1-2 libicu-dev
+
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

@@ -9,6 +9,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 NTS_IP=10.212.2.216

@@ -2,5 +2,12 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 BASEDIR=$(dirname "$0")
 "$BASEDIR/../common/linux/ubuntu-version.sh"
@@ -9,6 +9,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 NTS_IP=10.212.2.216

@@ -2,5 +2,12 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 BASEDIR=$(dirname "$0")
 "$BASEDIR/../common/linux/ubuntu-version.sh"
@@ -9,6 +9,11 @@ set -ex
 BASEDIR=$(dirname "$0")
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 NTS_IP=10.212.2.216

@@ -2,8 +2,8 @@
 # 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

-# Install lcov 2.0 from 24.04/noble numbat
+# Install lcov 2.4 from 26.04/resolute raccoon

 echo "Installing lcov"
-wget https://ci-files01-hki.ci.qt.io/input/lcov/lcov_2.0-4ubuntu1_all.deb
-sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 install -f ./lcov_2.0-4ubuntu1_all.deb
+wget https://ci-files01-hki.ci.qt.io/input/lcov/lcov_2.4-3_all.deb
+sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 install -f ./lcov_2.4-3_all.deb
@@ -2,5 +2,12 @@
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 BASEDIR=$(dirname "$0")
 "$BASEDIR/../common/linux/ubuntu-version.sh"
@@ -8,6 +8,11 @@ BASEDIR=$(dirname "$0")
 source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 # shellcheck source=../common/unix/check_and_set_proxy.sh
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 # https://bugzilla.opensuse.org/show_bug.cgi?id=1032027
 sudo btrfs quota disable /
@@ -8,6 +8,12 @@

 set -ex

+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -10,6 +10,11 @@ source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 # https://bugzilla.opensuse.org/show_bug.cgi?id=1032027
 sudo btrfs quota disable /
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
@@ -10,6 +10,11 @@ source "$BASEDIR/../common/shared/network_test_server_ip.txt"
 source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Get distro version to later check if version has changed at the end of the provisioning
+record_os_version

 # https://bugzilla.opensuse.org/show_bug.cgi?id=1032027
 sudo btrfs quota disable /
@@ -8,6 +8,13 @@

 set -ex

+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/distro_version_check.sh
+source "$BASEDIR/../common/linux/distro_version_check.sh"
+
+# Check distro version if it has changed
+verify_os_version_unchanged
+
 # shellcheck disable=SC2129
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
--- a/Show More
+++ b/Show More