Blame SOURCES/qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch

402b94
Author: Jan-Marek Glogowski <glogow@fbihome.de>
402b94
Date:   Thu Mar 06 18:44:43 2014 +0100
402b94
402b94
    Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
402b94
    
402b94
    Implements QEventLoop::ExcludeSocketNotifiers in the same way 
402b94
    QEventLoop::X11ExcludeTimers is already implemented for the glib
402b94
    event loop.
402b94
402b94
--- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp
402b94
+++ qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp
402b94
@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
402b94
 struct GSocketNotifierSource
402b94
 {
402b94
     GSource source;
402b94
+    QEventLoop::ProcessEventsFlags processEventsFlags;
402b94
     QList<GPollFDWithQSocketNotifier *> pollfds;
402b94
 };
402b94
 
402b94
@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceChec
402b94
     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
402b94
 
402b94
     bool pending = false;
402b94
+    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
402b94
+        return pending;
402b94
+
402b94
     for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
402b94
         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
402b94
 
402b94
@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDisp
402b94
     QEvent event(QEvent::SockAct);
402b94
 
402b94
     GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
402b94
+    if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
402b94
+        return true;
402b94
+
402b94
     for (int i = 0; i < src->pollfds.count(); ++i) {
402b94
         GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
402b94
 
402b94
@@ -330,6 +337,7 @@ QEventDispatcherGlibPrivate::QEventDispa
402b94
         reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
402b94
                                                                sizeof(GSocketNotifierSource)));
402b94
     (void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
402b94
+    socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
402b94
     g_source_set_can_recurse(&socketNotifierSource->source, true);
402b94
     g_source_attach(&socketNotifierSource->source, mainContext);
402b94
 
402b94
@@ -415,6 +423,7 @@ bool QEventDispatcherGlib::processEvents
402b94
     // tell postEventSourcePrepare() and timerSource about any new flags
402b94
     QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
402b94
     d->timerSource->processEventsFlags = flags;
402b94
+    d->socketNotifierSource->processEventsFlags = flags;
402b94
 
402b94
     if (!(flags & QEventLoop::EventLoopExec)) {
402b94
         // force timers to be sent at normal priority
402b94
@@ -426,6 +435,7 @@ bool QEventDispatcherGlib::processEvents
402b94
         result = g_main_context_iteration(d->mainContext, canWait);
402b94
 
402b94
     d->timerSource->processEventsFlags = savedFlags;
402b94
+    d->socketNotifierSource->processEventsFlags = savedFlags;
402b94
 
402b94
     if (canWait)
402b94
         emit awake();