Adjust submodule branches

Change-Id: I0878d33c66c7bad6187adddfce63ef33b4b4f9f4
Provisioning: Fix for missing Debian security packages
2026-09-09 18:47:56 +08:00 · 2026-09-09 07:57:46 +03:00 · 2026-09-08 15:02:08 +00:00 · 2026-09-08 12:39:29 +00:00 · 2026-09-08 10:56:04 +00:00 · 2026-09-05 10:52:40 +00:00
81 changed files with 213 additions and 261 deletions
@@ -1,46 +1,46 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.12.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.12.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.12.0
 	status = essential
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.12.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -48,7 +48,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.12.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.12.0
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,234 +69,234 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.12.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.12.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.12.0
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.12.0
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative qtquicktimeline
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.12.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.12.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.12.0
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.12.0
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.12.0
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
-	status = preview
+	branch = 6.12.0
+	status = addon
@@ -181,7 +181,6 @@ function(qt_ir_clone_one_submodule submodule_name)
    set(oneValueArgs
        ALTERNATES
        BASE_URL
-        DEPTH
        WORKING_DIRECTORY
    )
    set(multiValueArgs "")
@@ -264,9 +263,6 @@ 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}"
@@ -1067,7 +1063,6 @@ function(qt_ir_handle_init_submodules prefix)
    set(oneValueArgs
        ALTERNATES
        BASE_URL
-        DEPTH
        PARENT_REPO_BASE_GIT_PATH
        WORKING_DIRECTORY
    )
@@ -1128,7 +1123,6 @@ 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}
@@ -1169,7 +1163,6 @@ 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,16 +122,6 @@ 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,7 +312,6 @@ 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")
@@ -322,7 +321,6 @@ 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,7 +16,6 @@ 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,6 +30,3 @@ 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', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', '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',
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []
@@ -1,24 +0,0 @@
-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']
@@ -1,14 +0,0 @@
-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'
-    ]
-
@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-]
-Configurations: []
@@ -7,7 +7,6 @@ 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,37 @@
+Version: 2
+Include: [
+  cmake_platforms.yaml: [
+    'ubuntu-22.04',
+    'ubuntu-24.04-x64',
+    'ubuntu-24.04-arm64',
+    'jammy-arm64-debian-pkg-packaging',
+    'jammy-amd64-debian-pkg-packaging'
+  ],
+  cmake_platforms_qemu.yaml: [
+    'qemu-arm64-developer-build'
+  ]
+]
+Configurations: []
+Overrides:
+# Set pch off due to stale pch file causing false positive sccache hit
+-
+    Id: 'ubuntu-22.04'
+    -Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE']
+    +Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE -DQT_FEATURE_gstreamer_qt_api=ON -DBUILD_WITH_PCH=OFF']
+-
+    Id: 'ubuntu-24.04-x64'
+    -Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON']
+    +Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_gstreamer_qt_api=ON -DBUILD_WITH_PCH=OFF']
+-
+    Id: 'ubuntu-24.04-arm64'
+    -Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt']
+    +Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt -DQT_FEATURE_gstreamer_qt_api=ON -DBUILD_WITH_PCH=OFF']
+-
+    Id: 'jammy-arm64-debian-pkg-packaging'
+    +Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DQT_FEATURE_gstreamer_qt_api=ON -DBUILD_WITH_PCH=OFF']
+-
+    Id: 'jammy-amd64-debian-pkg-packaging'
+    +Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DQT_FEATURE_gstreamer_qt_api=ON -DBUILD_WITH_PCH=OFF']
+-
+    Id: 'qemu-arm64-developer-build'
+    +Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DQT_FEATURE_gstreamer_qt_api=ON -DBUILD_WITH_PCH=OFF']
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="c37e6f3a49a259d450b601843a9af2818b6feb96"
+sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
 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-20260828.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="f44b66d91625ab33e367cfb62a2950a041607caa"
+sha1="a3fdcd98e12bc5054d00f18e4088af26288fd020"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 # IANA timezone database overlay. Packaged separately from the SDP so it can be
@@ -60,17 +60,14 @@ sudo cp "$aarch64le_toolchain" "$targetPath"
 sudo cp "$armv7le_toolchain" "$targetPath"
 sudo cp "$x8664_toolchain" "$targetPath"
 cp -R "$QNX_qemu_bld_files_dir" "$qemuTargetPath"
-# 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"
+# 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"
 targetFile="qnx_qemu_utils.tar.xz"
 targetFolder="$qemuTargetPath/local/misc_files"
-sha1="965b957c76d4bc59c010bb0908d1fea8975179c1"
+sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"

 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/dhcpcd/resolv.conf=local/misc_files/etc/resolv.conf
+var/etc/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,8 +28,6 @@ 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

 #############################################
@@ -63,9 +61,10 @@ 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/x86_64/fc-match
+xbin/fc-match=local/misc_files/fc-match

 # network
 lib/libssl.so=usr/lib/libssl.so
+xbin/nslookup=usr/bin/nslookup
 xbin/unbound=sbin/unbound
 xbin/curl=usr/bin/curl
@@ -58,12 +58,7 @@ function InstallXCode() {
    # Xcode 26 ships a more minimal base install
    if ((majorVersion >= 26)); then
        xcodebuild -downloadComponent MetalToolchain
-        if ((majorVersion >= 27)); then
-            # No more universal iOS simulator in Xcode 27
-            xcodebuild -downloadPlatform iOS
-        else
-            xcodebuild -downloadPlatform iOS -architectureVariant universal
-        fi
+        xcodebuild -downloadPlatform iOS
        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": "73c16d68a4d5889bee3c64fe3534b8fee35baabd"
+    "baseline": "93580fc29654eec8d22804a01d7191284d65f28e"
  },
  "overlay-triplets": [ "./../triplets" ]
 }
@@ -1 +1 @@
-vcpkg_version=2026.06.24-qt
+vcpkg_version=2026.06.01-qt
@@ -20,22 +20,11 @@ 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,
-        [int]$TimeoutSeconds = 0
+        [string[]]$Arguments
    )

    $stdoutFile = [System.IO.Path]::GetTempFileName()
@@ -43,32 +32,13 @@ 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`""
-    }
-
-    $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()
+        $p = Start-Process -FilePath "$Executable" -ArgumentList $Arguments -PassThru `
+            -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile
+        Wait-Process -InputObject $p
    }

    $stdoutContent = [System.IO.File]::ReadAllText($stdoutFile)
@@ -36,7 +36,7 @@ $nppPackage = "C:\Windows\Temp\npp-$version.exe"

 Download $url_official $url_cache $nppPackage
 Verify-Checksum $nppPackage $sha1
-Run-Executable-With-Timeout 1800 "$nppPackage" "/S"
+Run-Executable "$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-20260828.tar.xz"
-$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260828.tar.xz"
+$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"
 $targetFile = "qnx710.tar.xz"
-$sha1 = "c37e6f3a49a259d450b601843a9af2818b6feb96"
+$sha1 = "98b24df7e8c53a104aee76e769011396fa4bdafd"
 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-20260828.tar.xz"
-$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260828.tar.xz"
+$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"
 $targetFile = "qnx800.tar.xz"
-$sha1 = "f44b66d91625ab33e367cfb62a2950a041607caa"
+$sha1 = "a3fdcd98e12bc5054d00f18e4088af26288fd020"
 DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl

 # IANA timezone database overlay. Packaged separately from the SDP so it can be
@@ -5,7 +5,11 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

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

-sudo ln -s /usr/bin/7zz /usr/bin/7z
+# 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
@@ -9,6 +9,9 @@ set -ex

 name="p7zip"
 version="7-11"
-sudo dnf -y install "$name" "$name-plugins"
+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

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

 name="p7zip"
 version="7-11"
-sudo dnf -y install "$name" "$name-plugins"
+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

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

 name="p7zip"
 version="7-11"
-sudo dnf -y install "$name" "$name-plugins"
+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

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

 name="p7zip"
 version="7-11"
-sudo dnf -y install "$name" "$name-plugins"
+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

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

 name="p7zip"
 version="7-11"
-sudo dnf -y install "$name" "$name-plugins"
+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

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

 set -ex

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

-sudo ln -s /usr/bin/7zz /usr/bin/7z
+# 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
@@ -5,7 +5,11 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

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

-sudo ln -s /usr/bin/7zz /usr/bin/7z
+# 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
@@ -5,7 +5,11 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

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

-sudo ln -s /usr/bin/7zz /usr/bin/7z
+# 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
@@ -5,7 +5,11 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

 set -ex

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

-sudo ln -s /usr/bin/7zz /usr/bin/7z
+# 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
@@ -29,11 +29,6 @@ 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)

@@ -49,7 +44,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)
@@ -69,10 +64,6 @@ 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"

@@ -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.4 from 26.04/resolute raccoon
+# Install lcov 2.0 from 24.04/noble numbat

 echo "Installing lcov"
-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
+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