diff options
| author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2020-12-02 14:18:10 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-08 20:54:59 +0000 |
| commit | 15d497c38d1f1a482553f5f3db852d9dfcd78c24 (patch) | |
| tree | 84cadd21ffa4c772448e9e3854996a7db8f919bd /src/corelib/kernel | |
| parent | 7072ce90901d0720ae6281de62be7533dba24005 (diff) | |
macOS: Add missing QT_MANGLE_NAMESPACE
KeyValueObserver and RunLoopModeTracker were causing
“Class is implemented in both...” messages when loading
multiple namespaced Qt versions into the same process.
Change-Id: Idbd2229c61cde6fba2c12b35d045390a371dee68
Fixes: QTBUG-89059
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit c2c163a7d8cb95a4901b742a72184975e791635a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_mac.mm | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm index f0e4ecc6e2..a3d1669b81 100644 --- a/src/corelib/kernel/qcore_mac.mm +++ b/src/corelib/kernel/qcore_mac.mm @@ -526,7 +526,7 @@ void QMacKeyValueObserver::removeObserver() { KeyValueObserver *QMacKeyValueObserver::observer = [[KeyValueObserver alloc] init]; QT_END_NAMESPACE -@implementation KeyValueObserver +@implementation QT_MANGLE_NAMESPACE(KeyValueObserver) - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey, id> *)change context:(void *)context { diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 0227778cee..2d2a7ee864 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -89,7 +89,7 @@ QT_USE_NAMESPACE QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker); -@implementation RunLoopModeTracker { +@implementation QT_MANGLE_NAMESPACE(RunLoopModeTracker) { QStack<CFStringRef> m_runLoopModes; } |