From ee8d5453e282d5e5b38047c77550a195df0d220f Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Sat, 17 Feb 2024 21:39:39 +0100 Subject: [PATCH] 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 Reviewed-by: Oliver Wolff Reviewed-by: Thiago Macieira --- src/corelib/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index c9599cb1bc0..342518cbf77 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -599,6 +599,7 @@ qt_internal_extend_target(Core CONDITION WIN32 netapi32 ntdll ole32 + runtimeobject shell32 user32 uuid @@ -890,11 +891,6 @@ qt_internal_extend_target(Core CONDITION WASM text/qlocale_wasm.cpp ) -qt_internal_extend_target(Core CONDITION MSVC - LIBRARIES - runtimeobject -) - qt_internal_extend_target(Core CONDITION MSVC AND CLANG LIBRARIES clang_rt.builtins-x86_64