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