rpms
/
qt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
qt/qt-everywhere-opensource-sr...

22 lines
1.4 KiB
Diff
Raw Normal View History

better version of the patch
2010-06-29 17:38:28 +00:00
diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck 2010-06-01 21:03:15.000000000 -0500
respin glib_eventloop_nullcheck.patch
2010-06-29 22:03:56 +00:00
+++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp 2010-06-29 14:58:12.299073784 -0500
better version of the patch
2010-06-29 17:38:28 +00:00
@@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS
GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
return (XEventsQueued(X11->display, QueuedAfterFlush)
|| (!(source->flags & QEventLoop::ExcludeUserInputEvents)
- && !source->d->queuedUserInputEvents.isEmpty()));
+ && source->d && !source->d->queuedUserInputEvents.isEmpty()));
}
- workaround glib_eventloop crasher induced by gdal/grass (bug #498111)
2010-06-29 17:18:06 +00:00
better version of the patch
2010-06-29 17:38:28 +00:00
static gboolean x11EventSourceCheck(GSource *s)
respin glib_eventloop_nullcheck.patch
2010-06-29 22:03:56 +00:00
@@ -84,7 +84,7 @@ static gboolean x11EventSourceCheck(GSou
GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
return (XEventsQueued(X11->display, QueuedAfterFlush)
|| (!(source->flags & QEventLoop::ExcludeUserInputEvents)
- && !source->d->queuedUserInputEvents.isEmpty()));
+ && source->d && !source->d->queuedUserInputEvents.isEmpty()));
}
static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)