1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Add missing QT_MANGLE_NAMESPACE

Browse Source 
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>
This commit is contained in:
Morten Johan Sørvig 2020-12-02 14:18:10 +01:00 committed by Qt Cherry-pick Bot
parent 7072ce9090
commit 15d497c38d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qcore_mac.mm
View File

@ -526,7 +526,7 @@ void QMacKeyValueObserver::removeObserver() {
KeyValueObserver *QMacKeyValueObserver::observer = [[KeyValueObserver alloc] init]; KeyValueObserver *QMacKeyValueObserver::observer = [[KeyValueObserver alloc] init];
QT_END_NAMESPACE QT_END_NAMESPACE
@implementation KeyValueObserver @implementation QT_MANGLE_NAMESPACE(KeyValueObserver)
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object
change:(NSDictionary<NSKeyValueChangeKey, id> *)change context:(void *)context change:(NSDictionary<NSKeyValueChangeKey, id> *)change context:(void *)context
{ {

2
src/corelib/kernel/qeventdispatcher_cf.mm
View File

@ -89,7 +89,7 @@ QT_USE_NAMESPACE
QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker); QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker);
@implementation RunLoopModeTracker { @implementation QT_MANGLE_NAMESPACE(RunLoopModeTracker) {
QStack<CFStringRef> m_runLoopModes; QStack<CFStringRef> m_runLoopModes;
} }