From e4b2a0b4bab2a17a65fedafe9bae50af1fe019f6 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Tue, 9 Jul 2013 14:40:50 +0200 Subject: [PATCH] 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 --- src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index 5f268dbf353..c236243438f 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(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(info); - if ((d->processEventsFlags & QEventLoop::EventLoopExec) == 0) { - // processEvents() was called "manually," ignore this source for now - d->maybeCancelWaitForMoreEvents(); - return; - } d->processPostedEvents(); d->maybeCancelWaitForMoreEvents(); }