Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[qtbase] Fix toolchain fixup (#46314)

This commit is contained in:
Kai Pastor 2025-07-08 02:09:35 +02:00 committed by GitHub
parent d82f6a365f
commit bffcbb75f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qtbase/portfile.cmake
View File

@ -422,7 +422,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}\")" 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}")

2
ports/qtbase/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.8.3",
"port-version": 3,
"port-version": 4,
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,

2
versions/baseline.json
View File

@ -7894,7 +7894,7 @@
},
"qtbase": {
"baseline": "6.8.3",
"port-version": 3
"port-version": 4
},
"qtcharts": {
"baseline": "6.8.3",

5
versions/q-/qtbase.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4826cea955a38c53fd0ec9fbda9371270a1a7c65",
"version": "6.8.3",
"port-version": 4
},
{
"git-tree": "0310ceff18ae3cc39de1f5f492a2b7ba88bae639",
"version": "6.8.3",