diff options
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.h | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.h b/src/plugins/platforms/cocoa/qnsview.h index 5387f2a825..cbeecb987f 100644 --- a/src/plugins/platforms/cocoa/qnsview.h +++ b/src/plugins/platforms/cocoa/qnsview.h @@ -48,6 +48,8 @@ #include <QtGui/QImage> #include <QtGui/QAccessible> +#include "private/qcore_mac_p.h" + QT_BEGIN_NAMESPACE class QCocoaWindow; class QCocoaBackingStore; @@ -56,7 +58,7 @@ QT_END_NAMESPACE Q_FORWARD_DECLARE_OBJC_CLASS(QNSViewMouseMoveHelper); -@interface QNSView : NSView <NSTextInputClient> { +@interface QT_MANGLE_NAMESPACE(QNSView) : NSView <NSTextInputClient> { QCocoaBackingStore* m_backingStore; QPoint m_backingStoreOffset; CGImageRef m_maskImage; @@ -134,4 +136,6 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QNSViewMouseMoveHelper); @end +QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView); + #endif //QNSVIEW_H diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index a18ee7ff71..7ece5dcdf8 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -122,7 +122,7 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil; @end -@implementation QNSView +@implementation QT_MANGLE_NAMESPACE(QNSView) + (void)initialize { |