1 files changed, 32 insertions, 2 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index c1d15c75054..7274b51cc0a 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -605,6 +605,31 @@ int main(void)
 "
 )
 
+qt_config_compile_test(windows_ioring
+    LABEL "Windows SDK: IORing"
+    CODE
+"#include <windows.h>
+#include <ioringapi.h>
+
+int main(void)
+{
+    /* BEGIN TEST: */
+    IORING_CREATE_FLAGS flags;
+    memset(&flags, 0, sizeof(flags));
+    HIORING ioRingHandle = nullptr;
+    HRESULT hr = CreateIoRing(IORING_VERSION_3, flags, 1, 1, &ioRingHandle);
+    if (hr == IORING_E_SUBMISSION_QUEUE_FULL) // not valid, but test that this #define exists
+        return 0;
+    IORING_HANDLE_REF ref(HANDLE(nullptr));
+    IORING_BUFFER_REF bufRef(nullptr);
+    // The newest API addition that we require:
+    BuildIoRingWriteFile(ioRingHandle, ref, bufRef, -1, 0, FILE_WRITE_FLAGS_NONE, 0, IOSQE_FLAGS_NONE);
+    /* END TEST: */
+    return 0;
+}
+"
+)
+
 # cpp_winrt
 qt_config_compile_test(cpp_winrt
     LABEL "cpp/winrt"
@@ -785,6 +810,11 @@ qt_feature("winsdkicu" PRIVATE
     CONDITION TEST_winsdkicu
     DISABLE QT_FEATURE_icu
 )
+qt_feature("windows-ioring" PRIVATE
+    LABEL "Windows I/O Ring"
+    AUTODETECT WIN32 AND CMAKE_HOST_SYSTEM_VERSION VERSION_GREATER_EQUAL 10.0.22000
+    CONDITION TEST_windows_ioring
+)
 qt_feature("inotify" PUBLIC PRIVATE
     LABEL "inotify"
     CONDITION TEST_inotify OR TEST_fsnotify
@@ -1252,14 +1282,13 @@ qt_feature("permissions" PUBLIC
 )
 qt_feature("openssl-hash" PRIVATE
     LABEL "OpenSSL based cryptographic hash"
-    AUTODETECT OFF
     CONDITION QT_FEATURE_openssl_linked AND QT_FEATURE_opensslv30
     PURPOSE "Uses OpenSSL based implementation of cryptographic hash algorithms."
 )
 qt_feature("async-io" PRIVATE
     LABEL "Async File I/O"
     PURPOSE "Provides support for asynchronous file I/O."
-    CONDITION (QT_FEATURE_thread AND QT_FEATURE_future) OR APPLE
+    CONDITION QT_FEATURE_thread AND QT_FEATURE_future
 )
 
 qt_configure_add_summary_section(NAME "Qt Core")
@@ -1272,6 +1301,7 @@ qt_configure_add_summary_entry(ARGS "glib")
 qt_configure_add_summary_entry(ARGS "icu")
 qt_configure_add_summary_entry(ARGS "jemalloc")
 qt_configure_add_summary_entry(ARGS "liburing")
+qt_configure_add_summary_entry(ARGS "windows-ioring")
 qt_configure_add_summary_entry(ARGS "timezone_tzdb")
 qt_configure_add_summary_entry(ARGS "system-libb2")
 qt_configure_add_summary_entry(ARGS "mimetype-database")