From 1a1c8dfbf4e8bbaf125417904c7624c229fd70df Mon Sep 17 00:00:00 2001 From: Michael Schmuki Date: Fri, 27 Feb 2026 14:19:41 +0100 Subject: [PATCH 1/2] [qtbase] Fix qt.toolchain.cmake corruption for Emscripten builds The regex replacement for __qt_chainload_toolchain_file placed the newline inside the closing quote instead of after the closing paren, causing a literal line break in the filepath. This broke toolchain chaining for Emscripten/WebAssembly builds where vcpkg chainloads Qt's toolchain. Follow up on #46314 --- ports/qtbase/portfile.cmake | 2 +- ports/qtbase/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index f54b35c5590ab1..67dd30301d895a 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -434,7 +434,7 @@ endforeach() set(qttoolchain "${CURRENT_PACKAGES_DIR}/share/Qt6/qt.toolchain.cmake") file(READ "${qttoolchain}" toolchain_contents) string(REGEX REPLACE "set\\\(__qt_initially_configured_toolchain_file [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") -string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__qt_chainload_toolchain_file \"\${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}\n\")" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__qt_chainload_toolchain_file \"\${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}\")\n" toolchain_contents "${toolchain_contents}") string(REGEX REPLACE "set\\\(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 098090b9c192e0..1ec890c3a2b70d 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.10.0", - "port-version": 1, + "port-version": 2, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, From 660013daeb3cbe92fcd28e611a44a7137d35992a Mon Sep 17 00:00:00 2001 From: Michael Schmuki Date: Fri, 27 Feb 2026 14:19:41 +0100 Subject: [PATCH 2/2] [qtbase] Update version database --- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index fefadf740aeb19..c91749872e90a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8198,7 +8198,7 @@ }, "qtbase": { "baseline": "6.10.0", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.10.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 1f6c68af5177eb..276b5a8afc55d4 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eb3ac9082926e0f4ed4a185be0f10cd81047665", + "version": "6.10.0", + "port-version": 2 + }, { "git-tree": "1ab7c7c7654ecd1fa22b8c05c9cfc3c3e91aadc8", "version": "6.10.0",