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 Pick-to: 6.0 5.15 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
parent
e26d2865a7
commit
c2c163a7d8
@ -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
|
||||
{
|
||||
|
@ -89,7 +89,7 @@ QT_USE_NAMESPACE
|
||||
|
||||
QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker);
|
||||
|
||||
@implementation RunLoopModeTracker {
|
||||
@implementation QT_MANGLE_NAMESPACE(RunLoopModeTracker) {
|
||||
QStack<CFStringRef> m_runLoopModes;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user