diff options
Diffstat (limited to '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch')
| -rw-r--r-- | 0015-Link-corelib-correctly-against-runtimeobject-when-co.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch b/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch new file mode 100644 index 000000000000..2e0dba6786a5 --- /dev/null +++ b/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch @@ -0,0 +1,45 @@ +From 7ac1996bcf302e058b3537c1fa09b443523fe4e3 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sat, 17 Feb 2024 21:39:39 +0100 +Subject: [PATCH 15/17] Link corelib correctly against runtimeobject when + compiling for Windows + +This library is included by mingw-w64 and also needs to be linked against +for code in `qlocale_win.cpp` enabled via the `cpp_winrt` feature flag. + +Change-Id: I9f06f3845165afaf305a0fc7771a1093cba08811 +--- + src/corelib/CMakeLists.txt | 3 +-- + .../networkinformation/networklistmanager/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt +index bf24eec2cfb..7816b9e37b0 100644 +--- a/src/corelib/CMakeLists.txt ++++ b/src/corelib/CMakeLists.txt +@@ -819,8 +819,7 @@ qt_internal_extend_target(Core CONDITION WASM + text/qlocale_wasm.cpp + ) + +-# On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it) +-qt_internal_extend_target(Core CONDITION MSVC ++qt_internal_extend_target(Core CONDITION WIN32 + LIBRARIES + runtimeobject + ) +diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +index f15eedf866b..acd3754f4e5 100644 +--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt ++++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +@@ -14,7 +14,7 @@ qt_internal_add_plugin(QNLMNIPlugin + Qt::NetworkPrivate + ) + +-qt_internal_extend_target(QNLMNIPlugin CONDITION MSVC ++qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 + LIBRARIES + runtimeobject + oleaut32 +-- +2.44.0 + |