diff options
| author | Zeno Albisser <zeno@webkit.org> | 2011-11-29 18:30:34 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-30 13:53:24 +0100 |
| commit | 5fb239e8a3117341fa1b0fe4749dbe14e51c2028 (patch) | |
| tree | 9ccd47084f23f0cd718b827508930a982cf0f060 /src/plugins | |
| parent | 84e66f69ae2a2e0b70c8e51c93b6991bf3437e6d (diff) | |
Include qglobal.h first in qnsview.mm compilation unit.
If cocoa headers are being included first, this messes up
the defines MAC_OS_X_VERSION_MAX_ALLOWED and MAC_OS_X_VERSION_MIN_REQUIRED
when compiling with clang.
Change-Id: I07177d07a0ac7c5f7e72b04f42d6343e689e0d33
Reviewed-by: Ali Akhtarzada <ali.akhtarzada@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/qmultitouch_mac_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h index 02bbc6da21..811813c963 100644 --- a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h +++ b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h @@ -53,6 +53,8 @@ #ifndef QMULTITOUCH_MAC_P_H #define QMULTITOUCH_MAC_P_H +#include <QtCore/qglobal.h> + #import <Cocoa/Cocoa.h> #include <QtGui/QWindowSystemInterface> diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 73e3115acf..7c9873a908 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include <QtCore/qglobal.h> + #include <Carbon/Carbon.h> #include "qnsview.h" |