diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
| commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
| tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp | |
| parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
| parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp')
| -rw-r--r-- | src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp index 4c8a82470b..dc4785071f 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp +++ b/src/platformsupport/eventdispatchers/qeventdispatcher_glib.cpp @@ -46,8 +46,6 @@ #include <glib.h> #include "private/qguiapplication_p.h" -#include <qdebug.h> - QT_BEGIN_NAMESPACE struct GUserEventSource @@ -56,12 +54,15 @@ struct GUserEventSource QPAEventDispatcherGlib *q; }; -static gboolean userEventSourcePrepare(GSource *s, gint *timeout) +static gboolean userEventSourcePrepare(GSource *source, gint *timeout) { - Q_UNUSED(s) Q_UNUSED(timeout) - - return QWindowSystemInterface::windowSystemEventsQueued() > 0; + GUserEventSource *userEventSource = reinterpret_cast<GUserEventSource *>(source); + QPAEventDispatcherGlib *dispatcher = userEventSource->q; + if (dispatcher->m_flags & QEventLoop::ExcludeUserInputEvents) + return QWindowSystemInterface::nonUserInputEventsQueued(); + else + return QWindowSystemInterface::windowSystemEventsQueued() > 0; } static gboolean userEventSourceCheck(GSource *source) |