summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorJohn Stanley <jpsinthemix@verizon.net>2012-01-30 07:27:49 -0500
committerQt by Nokia <qt-info@nokia.com>2012-02-10 16:11:54 +0100
commit6bab6fccd2d8ee8e83e968864d729c1bbee39a66 (patch)
tree570406d5cfa34e47c95359a402b296ce36af3286 /src/corelib/kernel
parent69ada23a75bb51b4efc90c6128cce22d5ee6a779 (diff)
Raise loopLevel for deleteLater in event filters
Change-Id: I163f510f6e99d86a35cc78965fa383e7f4618f42 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qabstracteventdispatcher.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index 3f73e61e82..3b0a258955 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -532,8 +532,12 @@ QAbstractEventDispatcher::EventFilter QAbstractEventDispatcher::setEventFilter(E
bool QAbstractEventDispatcher::filterEvent(void *message)
{
Q_D(QAbstractEventDispatcher);
- if (d->event_filter)
+ if (d->event_filter) {
+ // Raise the loopLevel so that deleteLater() calls in or triggered
+ // by event_filter() will be processed from the main event loop.
+ QScopedLoopLevelCounter loopLevelCounter(d->threadData);
return d->event_filter(message);
+ }
return false;
}