diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2022-11-23 09:33:00 +0800 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2022-12-03 03:33:22 +0100 |
| commit | 040aef5b2ffebb0b154d9b6d893424688b0ebdef (patch) | |
| tree | 8b36383706269c3a77c953fa2ce24d36fc184d5f | |
| parent | 7956d9e06032e5488d57cf1dc1c9aae0e7172a20 (diff) | |
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 <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/corelib/configure.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/platform/windows/qfactorycacheregistration_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
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 <QtCore/qglobal.h> -#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 |