From 040aef5b2ffebb0b154d9b6d893424688b0ebdef Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Wed, 23 Nov 2022 09:33:00 +0800 Subject: Cleanup qtbase to allow LLVM-MinGW use WinRT Both clang-cl and clang-mingw supports WinRT facilities now, so there's no need to limit WinRT usages to MSVC only. Change-Id: Ib3019db62a038f0ebb5f20210c0a12ee296e7f71 Reviewed-by: Cristian Adam Reviewed-by: Qt CI Bot Reviewed-by: Oliver Wolff --- src/corelib/configure.cmake | 2 +- src/corelib/platform/windows/qfactorycacheregistration_p.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 2461603a20..112e9ec203 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -1012,5 +1012,5 @@ qt_configure_add_report_entry( qt_configure_add_report_entry( TYPE WARNING MESSAGE "Basic cpp/winrt support missing. Some features might not be available." - CONDITION MSVC AND NOT QT_FEATURE_cpp_winrt + CONDITION NOT QT_FEATURE_cpp_winrt ) diff --git a/src/corelib/platform/windows/qfactorycacheregistration_p.h b/src/corelib/platform/windows/qfactorycacheregistration_p.h index db1582e94b..6a80ce63fa 100644 --- a/src/corelib/platform/windows/qfactorycacheregistration_p.h +++ b/src/corelib/platform/windows/qfactorycacheregistration_p.h @@ -17,7 +17,7 @@ #include -#if !defined(QT_BOOTSTRAPPED) && defined(Q_OS_WIN) && !defined(Q_CC_CLANG) && QT_CONFIG(cpp_winrt) +#if !defined(QT_BOOTSTRAPPED) && QT_CONFIG(cpp_winrt) # define QT_USE_FACTORY_CACHE_REGISTRATION #endif -- cgit v1.2.3