diff options
| author | Sergei Kulik <sergey@neatvideo.com> | 2015-03-10 15:12:00 +1100 |
|---|---|---|
| committer | Timur Pocheptsov <Timur.Pocheptsov@digia.com> | 2015-03-20 07:05:03 +0000 |
| commit | 97edc8ede23f0e81c7b58f0613c4f67def1e8a3c (patch) | |
| tree | cb69468767b7f1a5c869fda800678f4a7a61af9b /src/plugins/platforms/cocoa/qcocoamenu.mm | |
| parent | 282ba9a1802526ecdfbec512ac452e767608f8e3 (diff) | |
Fixed compilation on Mac OS X (qt namespace and preprocessor issues))
Configured with -qtnamespace <...> -no-opengl -D QT_NO_PRINTER
Change-Id: I1c959a89afda08d29a854f21e6e51732d136753c
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index 4fadc2f60a..867526ff52 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -45,6 +45,8 @@ #include "qcocoawindow.h" #import "qnsview.h" +QT_BEGIN_NAMESPACE + NSString *qt_mac_removePrivateUnicode(NSString* string) { int len = [string length]; @@ -71,6 +73,8 @@ static inline QCocoaMenuLoader *getMenuLoader() return [NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)]; } +QT_END_NAMESPACE + @interface QT_MANGLE_NAMESPACE(QCocoaMenuDelegate) : NSObject <NSMenuDelegate> { QCocoaMenu *m_menu; } |