diff options
Diffstat (limited to 'src/corelib/kernel/qcore_mac_p.h')
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index cbbbc18814..4211a23e0f 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -57,12 +57,14 @@ # define __IMAGECAPTURE__ #endif -#if defined(QT_BUILD_QMAKE) || defined(QT_BOOTSTRAPPED) +#if defined(QT_BOOTSTRAPPED) #include <ApplicationServices/ApplicationServices.h> #else #include <CoreFoundation/CoreFoundation.h> #endif +#include "qglobal.h" + #ifndef Q_OS_IOS #include <CoreServices/CoreServices.h> #endif @@ -137,14 +139,4 @@ private: QT_END_NAMESPACE -#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) -#ifndef __LP64__ - typedef float CGFloat; - typedef int NSInteger; - typedef unsigned int NSUInteger; - #define SRefCon SInt32 - #define URefCon UInt32 -#endif -#endif - #endif // QCORE_MAC_P_H |