diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 820f588f3e9b69..f03ed99a492da0 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -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}") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index f06ebddcd505f6..15a08dbebdcdad 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -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, diff --git a/versions/baseline.json b/versions/baseline.json index 7adb62fa1bbf8a..ef41cfaf5a15fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7894,7 +7894,7 @@ }, "qtbase": { "baseline": "6.8.3", - "port-version": 3 + "port-version": 4 }, "qtcharts": { "baseline": "6.8.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 9d6188f96e658a..4a1aceb1ab0be7 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4826cea955a38c53fd0ec9fbda9371270a1a7c65", + "version": "6.8.3", + "port-version": 4 + }, { "git-tree": "0310ceff18ae3cc39de1f5f492a2b7ba88bae639", "version": "6.8.3",