diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-24 19:57:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-24 20:01:42 +0100 |
| commit | de49839df8abfba1f3ed3c36ef3177e4a9d6ef00 (patch) | |
| tree | 71e777ca1e33c58edd9149821e970495ef4b75b2 /src/corelib/kernel/qeventdispatcher_cf.mm | |
| parent | e6234535929c67e7fbfa1ad7ce88f37df0b68d45 (diff) | |
| parent | 4d3781b640e8fb0a04e96b2d05199247556b8d86 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
mkspecs/features/moc.prf
Change-Id: Ia71c8e3b3185f7c999bf226d0675051b10b8740b
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_cf.mm')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 27eb3d0337..608dea5426 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -44,7 +44,6 @@ #include <QtCore/qthread.h> #include <QtCore/private/qcoreapplication_p.h> #include <QtCore/private/qcore_unix_p.h> -#include <QtCore/private/qcore_mac_p.h> #include <QtCore/private/qthread_p.h> #include <limits> @@ -59,11 +58,13 @@ QT_USE_NAMESPACE -@interface RunLoopModeTracker : NSObject { +@interface QT_MANGLE_NAMESPACE(RunLoopModeTracker) : NSObject { QStack<CFStringRef> m_runLoopModes; } @end +QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker); + @implementation RunLoopModeTracker - (id) init |