diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm | |
parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
parent | 281121697340084f7d385eab530f41916789b94d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm')
-rw-r--r-- | src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm b/src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm index 13b7dc4358..0273fe5ed4 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm +++ b/src/platformsupport/eventdispatchers/qeventdispatcher_cf.mm @@ -41,8 +41,6 @@ #include <QtCore/private/qcore_mac_p.h> #include <QtCore/private/qthread_p.h> -#include <qpa/qwindowsysteminterface.h> - #include <limits> #include <UIKit/UIApplication.h> @@ -169,6 +167,7 @@ static const CFTimeInterval kCFTimeIntervalDistantFuture = std::numeric_limits<C QEventDispatcherCoreFoundation::QEventDispatcherCoreFoundation(QObject *parent) : QAbstractEventDispatcher(parent) + , m_processEvents(QEventLoop::EventLoopExec) , m_postedEventsRunLoopSource(this, &QEventDispatcherCoreFoundation::processPostedEvents) , m_runLoopActivityObserver(this, &QEventDispatcherCoreFoundation::handleRunLoopActivity, #if DEBUG_EVENT_DISPATCHER @@ -181,7 +180,6 @@ QEventDispatcherCoreFoundation::QEventDispatcherCoreFoundation(QObject *parent) , m_runLoopTimer(0) , m_blockedRunLoopTimer(0) , m_overdueTimerScheduled(false) - , m_processEvents(QEventLoop::EventLoopExec) { m_cfSocketNotifier.setHostEventDispatcher(this); @@ -371,11 +369,11 @@ bool QEventDispatcherCoreFoundation::processEvents(QEventLoop::ProcessEventsFlag return eventsProcessed; } -void QEventDispatcherCoreFoundation::processPostedEvents() +bool QEventDispatcherCoreFoundation::processPostedEvents() { if (m_processEvents.processedPostedEvents && !(m_processEvents.flags & QEventLoop::EventLoopExec)) { qEventDispatcherDebug() << "Already processed events this pass"; - return; + return false; } m_processEvents.processedPostedEvents = true; @@ -384,9 +382,7 @@ void QEventDispatcherCoreFoundation::processPostedEvents() QCoreApplication::sendPostedEvents(); qUnIndent(); - qEventDispatcherDebug() << "Sending window system events for " << m_processEvents.flags; qIndent(); - QWindowSystemInterface::sendWindowSystemEvents(m_processEvents.flags); - qUnIndent(); + return true; } void QEventDispatcherCoreFoundation::processTimers(CFRunLoopTimerRef timer) |