2024-05-21 17:02:41 +02:00
|
|
|
From ad906387f486d196bfe083bd98dcfe7b1359594c Mon Sep 17 00:00:00 2001
|
2024-02-17 20:34:14 +01:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Sat, 17 Feb 2024 21:39:39 +0100
|
2024-05-21 17:02:41 +02:00
|
|
|
Subject: [PATCH 15/16] Link corelib correctly against runtimeobject when
|
2024-02-17 20:34:14 +01:00
|
|
|
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.
|
|
|
|
|
|
2024-04-02 23:14:50 +02:00
|
|
|
Change-Id: I9f06f3845165afaf305a0fc7771a1093cba08811
|
2024-02-17 20:34:14 +01:00
|
|
|
---
|
2024-05-21 17:02:41 +02:00
|
|
|
src/corelib/CMakeLists.txt | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
2024-02-17 20:34:14 +01:00
|
|
|
|
|
|
|
|
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
|
2024-05-21 17:02:41 +02:00
|
|
|
index bbe8ba84890..06ede966852 100644
|
2024-02-17 20:34:14 +01:00
|
|
|
--- a/src/corelib/CMakeLists.txt
|
|
|
|
|
+++ b/src/corelib/CMakeLists.txt
|
2024-04-02 23:14:50 +02:00
|
|
|
@@ -819,8 +819,7 @@ qt_internal_extend_target(Core CONDITION WASM
|
|
|
|
|
text/qlocale_wasm.cpp
|
2024-02-17 20:34:14 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
-# On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it)
|
2024-04-02 23:14:50 +02:00
|
|
|
-qt_internal_extend_target(Core CONDITION MSVC
|
2024-02-17 20:34:14 +01:00
|
|
|
+qt_internal_extend_target(Core CONDITION WIN32
|
|
|
|
|
LIBRARIES
|
|
|
|
|
runtimeobject
|
|
|
|
|
)
|
|
|
|
|
--
|
2024-05-21 17:02:41 +02:00
|
|
|
2.45.1
|
2024-02-17 20:34:14 +01:00
|
|
|
|
