2 files changed, 27 insertions, 5 deletions
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
index fed7f447d0..1f9cfb9449 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
+++ b/tests/auto/corelib/kernel/qeventdispatcher/CMakeLists.txt
@@ -11,7 +11,23 @@ if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
     find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
 endif()
 
-qt_internal_add_test(tst_qeventdispatcher
-    SOURCES
-        tst_qeventdispatcher.cpp
-)
+set(test_names "tst_qeventdispatcher")
+if(QT_FEATURE_glib AND UNIX)
+    list(APPEND test_names "tst_qeventdispatcher_no_glib")
+endif()
+
+foreach(test ${test_names})
+    qt_internal_add_test(${test}
+        NO_BATCH
+        SOURCES
+            tst_qeventdispatcher.cpp
+    )
+endforeach()
+
+if (TARGET tst_qeventdispatcher_no_glib)
+    qt_internal_extend_target(tst_qeventdispatcher_no_glib
+        DEFINES
+            DISABLE_GLIB
+            tst_QEventDispatcher=tst_QEventDispatcher_no_glib
+    )
+endif()
diff --git a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
index fe78d0002f..a14cd7141d 100644
--- a/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
+++ b/tests/auto/corelib/kernel/qeventdispatcher/tst_qeventdispatcher.cpp
@@ -3,7 +3,6 @@
 
 #ifdef QT_GUI_LIB
 #  include <QtGui/QGuiApplication>
-#  define tst_QEventDispatcher tst_QGuiEventDispatcher
 #else
 #  include <QtCore/QCoreApplication>
 #endif
@@ -12,6 +11,13 @@
 #include <QTimer>
 #include <QThreadPool>
 
+#ifdef DISABLE_GLIB
+static bool glibDisabled = []() {
+    qputenv("QT_NO_GLIB", "1");
+    return true;
+}();
+#endif
+
 enum {
     PreciseTimerInterval    =   10,
     CoarseTimerInterval     =  200,