diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2015-10-03 17:02:36 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-10-06 08:32:58 +0000 |
| commit | da104e7db04a5aeafb99a7b0ef3ab3cdd08da272 (patch) | |
| tree | 9883b3f5f6aa80f0d6ff02ae8d473bc6d9b11b38 /src/plugins/platforms | |
| parent | 44f323e5007a389c4103bfc6ca577d26078ce92b (diff) | |
Revert "Fix the spurious socket notifications on OS X"
This reverts commit b8e0f7cfc638a71770f44ada828ff2cf6d2ee201.
Needs a more testing.
Change-Id: Iff0b2741922cfa8f16fbc3f4ce0f83869d6cd8b6
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm index b443233d15..52b2e23345 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm @@ -845,13 +845,10 @@ QCocoaEventDispatcher::QCocoaEventDispatcher(QObject *parent) void QCocoaEventDispatcherPrivate::waitingObserverCallback(CFRunLoopObserverRef, CFRunLoopActivity activity, void *info) { - QCocoaEventDispatcher *dispatcher = static_cast<QCocoaEventDispatcher *>(info); - if (activity == kCFRunLoopBeforeWaiting) { - dispatcher->d_func()->cfSocketNotifier.enableSocketNotifiers(); - emit dispatcher->aboutToBlock(); - } else { - emit dispatcher->awake(); - } + if (activity == kCFRunLoopBeforeWaiting) + emit static_cast<QCocoaEventDispatcher*>(info)->aboutToBlock(); + else + emit static_cast<QCocoaEventDispatcher*>(info)->awake(); } void QCocoaEventDispatcherPrivate::processPostedEvents() |