Update submodules on '6.12 in qt/qt5'

Change-Id: I70bb76614052ea9fac60559f9d5e507a96bc60cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Provisioning: Run Python certificate installer synchronously
2026-09-07 17:47:56 +08:00 · 2026-08-31 21:16:32 +00:00 · 2026-08-30 17:33:30 +00:00 · 2026-08-29 05:43:12 +00:00 · 2026-08-28 10:01:13 +00:00 · 2026-08-28 01:38:15 +00:00
86 changed files with 271 additions and 126 deletions
@@ -45,7 +45,7 @@
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
+	recommends = qtmultimedia qtshadertools qttasktree
 	path = qtdoc
 	url = ../qtdoc.git
 	branch = 6.12
@@ -139,17 +139,8 @@
 	url = ../qtwebchannel.git
 	branch = 6.12
 	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtwebchannel qttools qtpositioning
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 6.12
-	status = addon
-	priority = 10
 [submodule "qtwebview"]
 	depends = qtdeclarative
-	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
 	branch = 6.12
@@ -269,7 +269,7 @@ Configurations:
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw15'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
        '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',
@@ -290,7 +290,7 @@ Configurations:
    Compiler: 'MSVC2026'
    Target arch: 'arm64'
    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw15'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
        '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',
@@ -420,7 +420,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
    ]
 -
-    Id: 'windows-11_24h2-mingw13'
+    Id: 'windows-11_24h2-mingw15'
    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -446,7 +446,7 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
    ]
 -
-    Id: 'windows-11_24H2-mingw13-developer-build'
+    Id: 'windows-11_24H2-mingw15-developer-build'
    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
@@ -22,7 +22,7 @@ Configurations:
    Target arch: 'armv7'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw15'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -63,9 +63,9 @@ Configurations:
        '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
+        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_ANDROID_GRADLE_MULTI_MODULE 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',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_ANDROID_GRADLE_MULTI_MODULE=ON',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_36'
    ]
@@ -82,9 +82,9 @@ Configurations:
        '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
+        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_ANDROID_GRADLE_MULTI_MODULE 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',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_ANDROID_GRADLE_MULTI_MODULE=ON',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_37'
    ]
@@ -32,3 +32,19 @@ Configurations:
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
    ]
+-
+    Id: 'harmonyos-23-arm64-on-macos'
+    Template: 'qtci-macos-26-arm-105'
+    Target os: 'HarmonyOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-arm64'
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-developer-build -debug -make examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
+        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
+    ]
@@ -19,7 +19,7 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw15'
    Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -2,7 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        'rhel-9.6',
-        'windows-11_24h2-mingw13'
+        'windows-11_24h2-mingw15'
    ],
    cmake_platforms_target_android.yaml: [
        'android-15-x86_64-on-linux',
@@ -2,7 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        'rhel-9.6',
-        'windows-11_24h2-mingw13'
+        'windows-11_24h2-mingw15'
    ],
    cmake_platforms_target_android.yaml: [
        'android-15-x86_64-on-linux',
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'windows-11_24h2-mingw13'
+        'windows-11_24h2-mingw15'
    ]
 ]
 Configurations:
@@ -12,7 +12,7 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Mingw'
    Target compiler: 'QCC'
-    Platform dependency: 'windows-11_24h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw15'
    Features: ['DisableTests', 'UseConfigure']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -3,7 +3,7 @@ Configurations: []
 Include: [
    cmake_platforms.yaml: [
        'windows-11_24H2-msvc2022-developer-build',
-        'windows-11_24H2-mingw13-developer-build',
+        'windows-11_24H2-mingw15-developer-build',
        'windows-11_24H2-llvm'
    ]
 ]
@@ -13,7 +13,7 @@ Overrides:
    Id: 'windows-11_24H2-msvc2022-developer-build'
    Configure arguments: '-qtnamespace TestNamespace -debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
 -
-    Id: 'windows-11_24H2-mingw13-developer-build'
+    Id: 'windows-11_24H2-mingw15-developer-build'
    Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
 -
    Id: 'windows-11_24H2-llvm'
@@ -11,8 +11,8 @@ Include: [
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-9.6",
-    "windows-11_24h2-mingw13",
-    "windows-11_24H2-mingw13-developer-build",
+    "windows-11_24h2-mingw15",
+    "windows-11_24H2-mingw15-developer-build",
    "windows-11_24H2-llvm",
    "windows-11_24H2-msvc2022",
    "windows-11_23h2-arm64-msvc2022"
@@ -13,8 +13,8 @@ Include: [
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-9.6",
-    "windows-11_24h2-mingw13",
-    "windows-11_24H2-mingw13-developer-build",
+    "windows-11_24h2-mingw15",
+    "windows-11_24H2-mingw15-developer-build",
    "windows-11_24H2-llvm",
    "windows-11_24H2-msvc2022",
    "windows-11_23h2-arm64-msvc2022"
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
+    address_sanitizer_platforms.yaml,
+    offline_documentation.yaml
 ]
 Configurations: []
@@ -3,7 +3,7 @@ Include: [
    cmake_platforms.yaml: [
        "documentation-warnings",
        "rhel-9.6",
-        'windows-11_24h2-mingw13',
+        'windows-11_24h2-mingw15',
    ],
    macos.yaml: [
        'macos-universal-on-arm64'
@@ -0,0 +1,25 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml: [
+        'ubuntu-22.04',
+        'ubuntu-22.04-x11-tests',
+        'ubuntu-24.04-x64',
+        'ubuntu-24.04-x64-x11-tests',
+        'rhel-9.6',
+        'rhel-10.0',
+        'windows-11_24H2-msvc2022',
+        'windows-11_24H2-msvc2026',
+        'windows-11_24h2-mingw15',
+        'windows-11_24H2-llvm'
+    ],
+    macos.yaml: [
+        'macos-universal-on-arm64',
+        'macos-14-x86_64-tests',
+        'macos-15-x86_64-tests',
+        'macos-26-x86_64-tests',
+        'macos-14-arm64-tests',
+        'macos-15-arm64-tests',
+        'macos-26-arm64-tests'
+    ]
+]
+Configurations: []
@@ -5,11 +5,21 @@ Include: [
        'ubuntu-22.04-x11-tests',
        'ubuntu-24.04-x64',
        'ubuntu-24.04-x64-x11-tests',
-        'windows-11_24H2-msvc2022'
+        'rhel-9.6',
+        'rhel-10.0',
+        'windows-11_24H2-msvc2022',
+        'windows-11_24H2-msvc2026',
+        'windows-11_24h2-mingw15',
+        'windows-11_24H2-llvm'
    ],
    macos.yaml: [
-        'macos-arm64-developer-build',
-        'macos-14-arm64-developer-build-tests'
+        'macos-universal-on-arm64',
+        'macos-14-x86_64-tests',
+        'macos-15-x86_64-tests',
+        'macos-26-x86_64-tests',
+        'macos-14-arm64-tests',
+        'macos-15-arm64-tests',
+        'macos-26-arm64-tests'
    ]
 ]
 Configurations: []
@@ -17,8 +17,8 @@ APPNAME="CiNetworkTest"
 EXECPATH="${ROOT}/${APPNAME}/bin"
 EXEC="${EXECPATH}/${APPNAME}"
 URL="https://ci-files01-hki.ci.qt.io/input/networktestapp"
-TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.1.tgz"
-sha256="3a23593f163ca2452546d20d56cabc81fed03c930d6d96334a22827da5a6840a"
+TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.2.tgz"
+sha256="2be05baebf48ff29ebcd06a0761b2a3d92ae5a66f78d0cd953513d8271eb7f83"
 SOURCE="$URL/$TARBALL"
 InstallFromCompressedFileFromURL "$SOURCE" "" "$sha256" "$ROOT" "$PREFIX"

@@ -48,6 +48,14 @@ targetFile="qnx710.tar.xz"
 sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
 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 usr/ so the same
+# archive suits both the 7.1 and 8.0 SDP layouts.
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a-usr.tar.xz"
+targetFile="zoneinfo.tar.xz"
+sha1="02deef2df3513d191ee3bb3a13fd61a814d7161a"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath/target/qnx7"
+
 sudo cp "$aarch64le_toolchain" "$targetPath"
 sudo cp "$armv7le_toolchain" "$targetPath"
 sudo cp "$x8664_toolchain" "$targetPath"
@@ -49,12 +49,12 @@ 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"
+# bumped without rebuilding the SDP tarball. Archive root is usr/ so the same
+# archive suits both the 7.1 and 8.0 SDP layouts.
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a-usr.tar.xz"
 targetFile="zoneinfo.tar.xz"
-sha1="8c1678ff673bb588f63fc9277497cd38e0ea2253"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
+sha1="02deef2df3513d191ee3bb3a13fd61a814d7161a"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath/target/qnx"

 sudo cp "$aarch64le_toolchain" "$targetPath"
 sudo cp "$armv7le_toolchain" "$targetPath"
@@ -53,6 +53,11 @@ xbin/fsevmgr=sbin/fsevmgr
 ##############################################
 lib/libscreen.so.1=usr/lib/libscreen.so.1

+##############################################
+### Audio support
+##############################################
+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
@@ -85,7 +85,7 @@ elif [ "$TYPE" = "intel" ]; then
    $VXWORKS_QEMU/bin/qemu-system-x86_64 \
        -M q35 \
        -smp 4 \
-        -m 4G \
+        -m 8G \
        -cpu "Skylake-Client" \
        -enable-kvm \
        -monitor none \
@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+# Copyright (C) 2025 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 HarmonyOS sdk and patches.
+
+set -e
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/check_and_set_proxy.sh
+source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+targetFolder="/opt/harmonyos"
+sdkTargetFolder="$targetFolder/command-line-tools"
+
+sudo mkdir -p "$sdkTargetFolder"
+
+basePath="http://ci-files01-hki.ci.qt.io/input/harmonyos"
+
+toolsVersion="6.1.0.860"
+toolsFile="commandline-tools-mac-arm64-6.1.0.860.zip"
+toolsSha1="4ba9df069fc5c651753c74297d723a2461be12e9"
+
+toolsTargetFile="/tmp/$toolsFile"
+toolsSourceFile="$basePath/$toolsFile"
+
+echo "Download and unzip HarmonyOS SDK"
+DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+echo "Unzipping HarmonyOS Tools to '$targetFolder'"
+sudo unzip -q "$toolsTargetFile" -d "$targetFolder"
+rm "$toolsTargetFile"
+
+patchFile="harmonyos_sdk_patches.zip"
+patchSha1="7f912104a5600bc176891bc6e9d97732f4266ad6"
+
+patchTargetFile="/tmp/$patchFile"
+patchSourceFile="$basePath/$patchFile"
+patchTargetFolder="$targetFolder/harmonyos_sdk_patches"
+
+echo "Download and unzip HarmonyOS SDK patches"
+DownloadURL "$patchSourceFile" "$patchSourceFile" "$patchSha1" "$patchTargetFile"
+echo "Unzipping HarmonyOS SDK patches to '$targetFolder'"
+sudo unzip -q "$patchTargetFile" -d "$targetFolder"
+rm "$patchTargetFile"
+
+echo "Changing ownership of HarmonyOS files."
+sudo chown -R qt:wheel "$sdkTargetFolder"
+sudo chmod -R 755 $sdkTargetFolder
+sudo chown -R qt:wheel "$patchTargetFolder"
+sudo chmod -R 755 $patchTargetFolder
+
+echo "Patching HarmonyOS SDK"
+
+sdkRootFolder="$sdkTargetFolder/sdk/default/openharmony"
+echo "Checking the contents of HarmonyOS SDK..."
+ls -l "$sdkRootFolder"
+
+SetEnvVar "HARMONYOS_SDK_ROOT" "$sdkRootFolder"
+export HARMONYOS_SDK_ROOT="$sdkRootFolder"
+
+echo "HarmonyOS SDK setup finished"
@@ -102,7 +102,6 @@ build_ffmpeg_ios() {
        --extra-ldflags="${common_arch_flags}"
        --target-os=darwin
        --install-name-dir="@rpath"
-        --disable-audiotoolbox

        # We perform manual stripping after generating dSYMs.
        # Make sure to skip it during FFmpeg compilation.
@@ -34,6 +34,6 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Library/Frameworks/Python.framework/Versions
 SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin/python3"

 # Install Python certificates. Required at least for emsdk installation
-open /Applications/Python\ 3.11/Install\ Certificates.command
+/Applications/Python\ 3.11/Install\ Certificates.command

 echo "python3 = 3.11.9" >> ~/versions.txt
@@ -3,8 +3,7 @@
  "default-registry": {
    "kind": "git",
    "repository": "https://git.qt.io/qtbuildsystem/vcpkg",
-    "reference": "refs/tags/2026.05.05-ohos",
-    "baseline": "e59d4f2aeeb7f21a7d22b078111223ef71a509f2"
+    "baseline": "93580fc29654eec8d22804a01d7191284d65f28e"
  },
  "overlay-triplets": [ "./../triplets" ]
 }
@@ -13,7 +13,8 @@
    },
    {
      "name": "protobuf",
-      "platform": "!osx & !ohos"
+      "platform": "!osx & !ohos",
+      "features": [ "libprotoc" ]
    },
    {
      "name": "protobuf",
@@ -1 +1 @@
-vcpkg_version=2026.05.05-ohos
+vcpkg_version=2026.06.01-qt
@@ -6,8 +6,8 @@
 . "$PSScriptRoot\helpers.ps1"

 $networkTestLocation = "C:\Program Files"
-$url_public="https://ci-files01-hki.ci.qt.io/input/networktestapp/CiNetworkTest-MSVC-2022-Windows.tgz"
-$sha1="543D4562159140D4E7223721AF15ED6E1998E5B5"
+$url_public="https://ci-files01-hki.ci.qt.io/input/networktestapp/CiNetworkTest-MSVC-2022-Windows-v1.2.tgz"
+$sha1="C1D8871E610CF281E74E009DBE1BE5DA84B49807"
 $download_location = "C:\Windows\Temp\network-test.tgz"

 Write-Host "Fetching CiNetworkTest.exe..."
@@ -4,5 +4,5 @@

 set -ex

-# shellcheck source=../common/linux/install-vcpkg-ports-ohos.sh
-source "${BASH_SOURCE%/*}/../common/linux/install-vcpkg-ports-ohos.sh"
+# shellcheck source=../common/unix/install-vcpkg-ports-ohos.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-vcpkg-ports-ohos.sh"
@@ -4,5 +4,5 @@

 set -ex

-# shellcheck source=../common/linux/install-openssl-headers-ohos.sh
-source "${BASH_SOURCE%/*}/../common/linux/install-openssl-headers-ohos.sh"
+# shellcheck source=../common/unix/install-openssl-headers-ohos.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl-headers-ohos.sh"
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Copyright (C) 2025 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# shellcheck source=../common/macos/harmonyos.sh
+source "${BASH_SOURCE%/*}/../common/macos/harmonyos.sh"
@@ -0,0 +1,10 @@
+#!/bin/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 -ex
+
+brew install autoconf autoconf-archive automake libtool
+
+# shellcheck source=../common/unix/install-vcpkg-ports-ohos.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-vcpkg-ports-ohos.sh"
@@ -0,0 +1,8 @@
+#!/bin/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 -ex
+
+# shellcheck source=../common/unix/install-openssl-headers-ohos.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl-headers-ohos.sh"
@@ -1,11 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install 64-bit MinGW 13.1.0
-# Note! MinGW version is 9.0.0 but the GCC version is 13.1 which is used with the naming of MinGW
-
-$release = "MinGW-w64-x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1"
-
-$sha1    = "561db0989c1b2cb73e0ceb27aed3b0ee8cb1db48"
-
-InstallMinGW $release $sha1
-
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install 64-bit MinGW 15.1.0
+# Note! MinGW version is 12.0.0 but the GCC version is 15.1 which is used with the naming of MinGW
+
+$release = "MinGW-w64-x86_64-15.1.0-release-posix-seh-msvcrt-rt_v12-rev0"
+
+$sha1    = "2fbec5f4a0e46099a850b11780500d0208b10591"
+
+InstallMinGW $release $sha1
+
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-network-test.ps1"
@@ -1,13 +0,0 @@
-# Copyright (C) 2025 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\..\common\windows\install-mingw.ps1"
-
-# This script will install 64-bit MinGW 13.1.0
-# Note! MinGW version is 9.0.0 but the GCC version is 13.1 which is used with the naming of MinGW
-
-$release = "MinGW-w64-x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1"
-
-$sha1    = "561db0989c1b2cb73e0ceb27aed3b0ee8cb1db48"
-
-InstallMinGW $release $sha1
@@ -0,0 +1,13 @@
+# Copyright (C) 2025 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\..\common\windows\install-mingw.ps1"
+
+# This script will install 64-bit MinGW 15.1.0
+# Note! MinGW version is 12.0.0 but the GCC version is 15.1 which is used with the naming of MinGW
+
+$release = "MinGW-w64-x86_64-15.1.0-release-posix-seh-msvcrt-rt_v12-rev0"
+
+$sha1    = "2fbec5f4a0e46099a850b11780500d0208b10591"
+
+InstallMinGW $release $sha1
Author	SHA1	Message	Date
Qt Submodule Update Bot	37a97fa211	Update submodules on '6.12 in qt/qt5' Change-Id: I70bb76614052ea9fac60559f9d5e507a96bc60cd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-08-31 21:16:32 +00:00
Simo Fält	c31f19bf62	Provisioning: Run Python certificate installer synchronously Pick-to: 6.11 Change-Id: I18e8b8256ad66313166dd6e01ea0a030fa81aee7 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `33df950977`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-30 17:33:30 +00:00
Assam Boudjelthia	e1f514bd3a	Android: use QT_ANDROID_GRADLE_MULTI_MODULE in target test args QT_USE_ANDROID_MODERN_BUNDLE is renamed in qtbase, so reflect that in qt5 as well. Task-number: QTBUG-145101 Change-Id: Ieae7c662b80b18f6b287bdd8c19e971932b0d171 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `6b51154f65`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-29 05:43:12 +00:00
Saman Hashemi	478db5551d	Add and update platforms for Qtmcp + QmlpreviewMcp - Create platform config file for the 6.12 branch in tqtc-qml-preview-mcp repo - Both QtMcp and QmlPreviewMcp have the same platforms supported Change-Id: I9dd65966e6319ca51e8dfd3a9ef43a4f6a3db7ac Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2026-08-28 10:01:13 +00:00
Tim Blechmann	7b72c15f61	FFmpeg: iOS - build with AudioToolbox It is typically hard to beat AudioToolbox. We may be better off not disabling them when building FFmpeg. Change-Id: Iba10fa3fe2f972e408017743a0db67d0e1a04a47 Reviewed-by: Nils Petter Skålerud <nils.petter.skalerud@qt.io> Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit `51aab48f53`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-28 01:38:15 +00:00
Tuomas Vaarala	f582feb449	Coin: QNX: share one IANA tzdata 2026a archive between 7.1 and 8.0 Both the 7.1 and 8.0 SDP ships pre-2022g zone info so they need to be updated with a newer one. Point both at zoneinfo-2026a-usr.tar.xz, which is rooted at usr/ and so suits either SDP layout, extracted into each SDP's own target directory. tst_QDateTime's expectation for the affected rows keys off the zone data rather than the OS as of I3103b98c, so no test-side coordination is needed when the new template rolls out. Change-Id: I75a2df6e0002886e3de91f0573f8083645307c39 Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `2b92278152`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-26 15:55:03 +00:00
Jani Heikkinen	9da885a19b	Qt 6.12: Add offline documentation build config for qtwebengine Pick-to: dev Change-Id: Ib5ac73f0de663d8a40349e5f79ffb74bc1ab3541 Reviewed-by: Antti Kokko <antti.kokko@qt.io>	2026-08-26 15:54:53 +00:00
Jukka Jokiniva	1e60576633	Update CINetworkTest application version Task-number: QTQAINFRA-8035 Change-Id: I5b7df957dd9688b4357426dd4996f6bd56d755b4 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit `092792a1f4`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-26 04:29:32 +00:00
Karim Pinter	58114728c5	[VxWorks] increase the memory for qemu for x86 tst_qbytearray_large autotest fails in CI on x86, because qemu is started with 4Gb of memory and this test needs 4,7 Gb. Fixes: QTBUG-149168 Change-Id: I0b6d753085c3e1f830cd705e6513003437909c64 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `e9ce684743`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-26 04:29:29 +00:00
Tero Heikkinen	9840747bd7	Update MinGW to v15.1.0 (x86_64) GCC = 15.1.0 MinGW = 12.0.0 Note: Win10 doesn't have MinGW targets anymore as those were moved recently into Win11 (`ddebcf8fd9`) But we still keep MinGW 15.1.0 installation as part of the Win10 provisioning as we did with Win11 before it had MinGW targets. Reason is to keep installation working for just in case it's needed. Task-number: QTQAINFRA-7483 Change-Id: I2cb2e2ef180b11cad61a5131ec47ea2ad207f338 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> Reviewed-by: Tim Blechmann <tim.blechmann@qt.io> (cherry picked from commit `295083dd9b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-26 04:29:26 +00:00
Liang Qi	8fb6ce2ecf	coin: also build HarmonyOS on macOS arm64 Change-Id: I35b04541f930745e4e10125582a8a810f3aaaaf5 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `3ed07a35b3`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-24 21:29:55 +00:00
Joerg Bornemann	d4abe79578	coin: Update vcpkg to 2026.06.01-qt This switches vcpkg back to a specific tag of the master branch of our fork. That's why we can remove the "reference" key from the configuration too, since master is the default branch. The updated protobuf port only builds the libprotoc compiler library when the target triplet equals the host triplet, or when the libprotoc or target-protoc feature is requested. Since we always build against our custom *-qt triplets, which never match the host triplet, request the libprotoc feature so that protobuf::libprotoc is available and qtgrpc can build qtprotobufgen. Change-Id: Ief4b12c57c082f94b2bcfae6fd02ebac7018a5c9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `dd170ab8a4`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-24 21:29:52 +00:00
Qt Submodule Update Bot	24f5a030f4	Update submodules on '6.12 in qt/qt5' Change-Id: Idc61374180f332f99740892dca925d1802a35688 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-08-23 08:13:07 +00:00
Tuomas Vaarala	29a3079d3d	Coin: QNX 8.0 QEMU: add libasound.so.5 to the system image Qt6Multimedia on QNX links libasound (QSA), but 8.0 mkqnximage ships no audio at all, so qtspeech's tst_qtexttospeech dies at load with "ldd:FATAL: Could not load library libasound.so.5". Add the library; without io-audio the device list just stays empty. Pick-to: 6.11 Change-Id: I467cb977313ce2496e2ab063c820929f2bfa591e Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `c899623a25`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2026-08-20 12:58:25 +00:00
Michal Klocek	3925e7d921	Drop qtwebengine from qt5 integrations The qtwebengine module is going to be released as separate component this implies also that qtwebview module should be split into two parts: * qtwebview-native one which implements qtwebview using platforms native apis, released together with qt installer * qtwebview-webengine one which compiles webengine backends (plugins) for different platforms, released together with webengine component Instead of really splinting the sources of webview the idea is to keep everything how it was. For Qt5 integration .gitmodule overrides dependency files for modules, webview builds now and tests without qtwebengine dependency meaning only native part is builds and tested. The outcome is used for installer packaging. However, module builds stay the same and qtwebview is still built and tested after qtwebengine, therefore there are no changes in development process. Change-Id: I7fe87f8464b07683ec41a76511e8eec45941376d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `8732522eea`) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>	2026-08-20 06:15:33 +00:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\windows\install-network-test.ps1"`