Skip to content

Commit 6a3c262

Browse files
authored
[qtwebengine] allow building with MSVC 14.5 / Visual Studio 2026 (#48582)
1 parent 2c9fdb8 commit 6a3c262

File tree

5 files changed

+21
-1
lines changed

5 files changed

+21
-1
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/configure.cmake b/configure.cmake
2+
index 6b3b5f770..70a867bdb 100644
3+
--- a/configure.cmake
4+
+++ b/configure.cmake
5+
@@ -473,7 +473,7 @@ qt_webengine_configure_check("compiler"
6+
)
7+
qt_webengine_configure_check("visual-studio"
8+
MODULES QtWebEngine QtPdf
9+
- CONDITION NOT WIN32 OR NOT MSVC OR MSVC_TOOLSET_VERSION EQUAL 142 OR MSVC_TOOLSET_VERSION EQUAL 143
10+
+ CONDITION NOT WIN32 OR NOT MSVC OR MSVC_TOOLSET_VERSION EQUAL 142 OR MSVC_TOOLSET_VERSION EQUAL 143 OR MSVC_TOOLSET_VERSION EQUAL 145
11+
MESSAGE "Build requires Visual Studio 2019 or higher."
12+
DOCUMENTATION "Visual Studio 2019 or higher."
13+
TAGS WINDOWS_PLATFORM

ports/qtwebengine/portfile.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ set(${PORT}_PATCHES
1212
"pkg-config.diff"
1313
"rpath.diff"
1414
"include-dir-order.diff"
15+
"allow-msvc-145.diff"
1516
)
1617

1718
set(qtwebengine_target "${VCPKG_TARGET_TRIPLET}-${VCPKG_CMAKE_SYSTEM_NAME}")

ports/qtwebengine/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
33
"name": "qtwebengine",
44
"version": "6.9.3",
5+
"port-version": 1,
56
"description": "Qt modules for rendering web and PDF content.",
67
"homepage": "https://www.qt.io/",
78
"license": null,

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8306,7 +8306,7 @@
83068306
},
83078307
"qtwebengine": {
83088308
"baseline": "6.9.3",
8309-
"port-version": 0
8309+
"port-version": 1
83108310
},
83118311
"qtwebsockets": {
83128312
"baseline": "6.9.3",

versions/q-/qtwebengine.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "66da6c7157c61ce4a7d775d64b4d38c28a27989b",
5+
"version": "6.9.3",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "a586f13b83645b55a6c47b32354abc3b0031826c",
510
"version": "6.9.3",

0 commit comments

Comments
 (0)