3 files changed, 6 insertions, 7 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp
index 4c780a9294..45c6e29e4b 100644
--- a/src/corelib/kernel/qeventdispatcher_glib.cpp
+++ b/src/corelib/kernel/qeventdispatcher_glib.cpp
@@ -260,8 +260,8 @@ static gboolean postEventSourcePrepare(GSource *s, gint *timeout)
     *timeout = canWait ? -1 : 0;
 
     GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);
-    return (!canWait
-            || (source->serialNumber.load() != source->lastSerialNumber));
+    source->d->wakeUpCalled = source->serialNumber.load() != source->lastSerialNumber;
+    return !canWait || source->d->wakeUpCalled;
 }
 
 static gboolean postEventSourceCheck(GSource *source)
diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h
index 799f23b14a..88ff316ee5 100644
--- a/src/corelib/kernel/qeventdispatcher_glib_p.h
+++ b/src/corelib/kernel/qeventdispatcher_glib_p.h
@@ -108,6 +108,7 @@ public:
     GSocketNotifierSource *socketNotifierSource;
     GTimerSource *timerSource;
     GIdleTimerSource *idleTimerSource;
+    bool wakeUpCalled = true;
 
     void runTimersOnceWithNormalPriority();
 };
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp
index dc4785071f..0ccbf01e80 100644
--- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp
+++ b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp
@@ -52,17 +52,14 @@ struct GUserEventSource
 {
     GSource source;
     QPAEventDispatcherGlib *q;
+    QPAEventDispatcherGlibPrivate *d;
 };
 
 static gboolean userEventSourcePrepare(GSource *source, gint *timeout)
 {
     Q_UNUSED(timeout)
     GUserEventSource *userEventSource = reinterpret_cast<GUserEventSource *>(source);
-    QPAEventDispatcherGlib *dispatcher = userEventSource->q;
-    if (dispatcher->m_flags & QEventLoop::ExcludeUserInputEvents)
-        return QWindowSystemInterface::nonUserInputEventsQueued();
-    else
-        return QWindowSystemInterface::windowSystemEventsQueued() > 0;
+    return userEventSource->d->wakeUpCalled;
 }
 
 static gboolean userEventSourceCheck(GSource *source)
@@ -94,6 +91,7 @@ QPAEventDispatcherGlibPrivate::QPAEventDispatcherGlibPrivate(GMainContext *conte
     userEventSource = reinterpret_cast<GUserEventSource *>(g_source_new(&userEventSourceFuncs,
                                                                        sizeof(GUserEventSource)));
     userEventSource->q = q;
+    userEventSource->d = this;
     g_source_set_can_recurse(&userEventSource->source, true);
     g_source_attach(&userEventSource->source, mainContext);
 }