diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h | 13 | ||||
| -rw-r--r-- | src/widgets/widgets/qmenu_mac.mm | 3 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h b/src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h index 070ecfb030..42f242276e 100644 --- a/src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h +++ b/src/widgets/platforms/mac/qt_cocoa_helpers_mac_p.h @@ -111,10 +111,17 @@ struct HIContentBorderMetrics; -#ifdef Q_WS_MAC32 -typedef struct _NSPoint NSPoint; // Just redefine here so I don't have to pull in all of Cocoa. +#ifdef __OBJC__ + // If the source file including this file also includes e.g. Cocoa/Cocoa.h, typedef-ing NSPoint will + // fail since NSPoint will already be a type. So we try to detect this. If the build fails, ensure + // that the inclusion of cocoa headers happends before the inclusion of this file. + #include <Foundation/NSGeometry.h> #else -typedef struct CGPoint NSPoint; + #ifdef Q_WS_MAC32 + typedef struct _NSPoint NSPoint; // Just redefine here so I don't have to pull in all of Cocoa. + #else + typedef struct CGPoint NSPoint; + #endif #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm index 7d3bd3939c..09c7af7749 100644 --- a/src/widgets/widgets/qmenu_mac.mm +++ b/src/widgets/widgets/qmenu_mac.mm @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include <Cocoa/Cocoa.h> + #include "qmenu.h" #include "qhash.h" #include <qdebug.h> @@ -60,7 +62,6 @@ #include <private/qcocoamenuloader_mac_p.h> #include <private/qcocoamenu_mac_p.h> #include <private/qt_cocoa_helpers_mac_p.h> -#include <Cocoa/Cocoa.h> QT_BEGIN_NAMESPACE |