summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-07-09 14:40:50 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-29 12:44:14 +0200
commite4b2a0b4bab2a17a65fedafe9bae50af1fe019f6 (patch)
treec738929615b85c44df3414177cd54dbf4fe041aa /src/plugins
parent1e14762b8d79118540bd09a84dd3e48f4f5e113e (diff)
Make Qt process native and timer events on Cocoa applications
Since we don't spin any QEventLoop, we need to make sure events posted by the window system interface are processed. Change-Id: I0e7b541d86a7a14f2ecd3702e7cbdbdee9920859 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index 5f268dbf35..c236243438 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -111,11 +111,6 @@ static Boolean runLoopSourceEqualCallback(const void *info1, const void *info2)
void QCocoaEventDispatcherPrivate::runLoopTimerCallback(CFRunLoopTimerRef, void *info)
{
QCocoaEventDispatcherPrivate *d = static_cast<QCocoaEventDispatcherPrivate *>(info);
- if ((d->processEventsFlags & QEventLoop::EventLoopExec) == 0) {
- // processEvents() was called "manually," ignore this source for now
- d->maybeCancelWaitForMoreEvents();
- return;
- }
CFRunLoopSourceSignal(d->activateTimersSourceRef);
}
@@ -810,11 +805,6 @@ void QCocoaEventDispatcherPrivate::firstLoopEntry(CFRunLoopObserverRef ref,
void QCocoaEventDispatcherPrivate::postedEventsSourceCallback(void *info)
{
QCocoaEventDispatcherPrivate *d = static_cast<QCocoaEventDispatcherPrivate *>(info);
- if ((d->processEventsFlags & QEventLoop::EventLoopExec) == 0) {
- // processEvents() was called "manually," ignore this source for now
- d->maybeCancelWaitForMoreEvents();
- return;
- }
d->processPostedEvents();
d->maybeCancelWaitForMoreEvents();
}