diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-02 09:04:38 +0100 |
| commit | 71264bae08d81bdeceb96133fdb01c370504dfcc (patch) | |
| tree | d5dadaac8209d5ef1857a4d65197b9ee12b39848 /src/corelib/kernel | |
| parent | 5e785c0b83c9908c665f253c131629ac325a21f5 (diff) | |
| parent | 6d10f739cd750968d0dd0e9d8fa4b64353a86c6c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I84097f8e7b3b2128028bd7693c913d6968b82bfe
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf_p.h | 9 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 7e962f816e..ac974ba411 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -284,6 +284,8 @@ public: Pointer = 218, // QQuickPointerEvent; ### Qt 6: QPointerEvent + TabletTrackingChange = 219, // tablet tracking state has changed + // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event 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 diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h index e6581e2bac..8a234ebc40 100644 --- a/src/corelib/kernel/qeventdispatcher_cf_p.h +++ b/src/corelib/kernel/qeventdispatcher_cf_p.h @@ -90,14 +90,11 @@ #include <QtCore/qabstracteventdispatcher.h> #include <QtCore/private/qtimerinfo_unix_p.h> #include <QtCore/private/qcfsocketnotifier_p.h> +#include <QtCore/private/qcore_mac_p.h> #include <QtCore/qdebug.h> #include <CoreFoundation/CoreFoundation.h> -#ifdef __OBJC__ -@class RunLoopModeTracker; -#else -typedef struct objc_object RunLoopModeTracker; -#endif +Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(RunLoopModeTracker)); QT_BEGIN_NAMESPACE @@ -253,7 +250,7 @@ private: RunLoopSource<> m_postedEventsRunLoopSource; RunLoopObserver<> m_runLoopActivityObserver; - RunLoopModeTracker *m_runLoopModeTracker; + QT_MANGLE_NAMESPACE(RunLoopModeTracker) *m_runLoopModeTracker; QTimerInfoList m_timerInfoList; CFRunLoopTimerRef m_runLoopTimer; |