From c2c163a7d8cb95a4901b742a72184975e791635a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 2 Dec 2020 14:18:10 +0100 Subject: [PATCH] macOS: Add missing QT_MANGLE_NAMESPACE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Pick-to: 6.0 5.15 Reviewed-by: Tor Arne Vestbø --- src/corelib/kernel/qcore_mac.mm | 2 +- 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 *)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 m_runLoopModes; }