[qtbase] Fix toolchain fixup#46314
Merged
Merged
Conversation
BillyONeal
approved these changes
Jul 7, 2025
Member
|
Thanks for the fixup! |
talregev
pushed a commit
to talregev/vcpkg
that referenced
this pull request
Aug 11, 2025
7 tasks
boardend
added a commit
to boardend/vcpkg
that referenced
this pull request
Feb 27, 2026
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 microsoft#46314
boardend
added a commit
to boardend/vcpkg
that referenced
this pull request
Feb 27, 2026
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 microsoft#46314
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picked from #46162.
Fixes
share/Qt6/qt.toolchain.cmake:if(NOT "${QT_CHAINLOAD_TOOLCHAIN_FILE}" STREQUAL "") - set(__qt_chainload_toolchain_file "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}")endif() + set(__qt_chainload_toolchain_file "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") +endif()