diff options
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_cf.mm')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index b7b379e2c1..177551467c 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -56,6 +56,14 @@ # include <UIKit/UIApplication.h> #endif +QT_BEGIN_NAMESPACE +namespace QtPrivate { +Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher"); +Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers"); +} +using namespace QtPrivate; +QT_END_NAMESPACE + QT_USE_NAMESPACE /* @@ -148,9 +156,6 @@ static CFStringRef runLoopMode(NSDictionary *dictionary) QT_BEGIN_NAMESPACE -Q_LOGGING_CATEGORY(lcEventDispatcher, "qt.eventdispatcher"); -Q_LOGGING_CATEGORY(lcEventDispatcherTimers, "qt.eventdispatcher.timers"); - class RunLoopDebugger : public QObject { Q_OBJECT @@ -190,7 +195,7 @@ Q_ENUM_PRINTER(Result); QDebug operator<<(QDebug s, timespec tv) { - s << tv.tv_sec << "." << qSetFieldWidth(9) << qSetPadChar(QChar(48)) << tv.tv_nsec << reset; + s << tv.tv_sec << "." << qSetFieldWidth(9) << qSetPadChar(QChar(48)) << tv.tv_nsec << Qt::reset; return s; } @@ -423,7 +428,7 @@ bool QEventDispatcherCoreFoundation::processPostedEvents() m_processEvents.processedPostedEvents = true; qCDebug(lcEventDispatcher) << "Sending posted events for" - << QEventLoop::ProcessEventsFlags(m_processEvents.flags.load()); + << QEventLoop::ProcessEventsFlags(m_processEvents.flags.loadRelaxed()); QCoreApplication::sendPostedEvents(); return true; |