From 5fb239e8a3117341fa1b0fe4749dbe14e51c2028 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno@webkit.org>
Date: Tue, 29 Nov 2011 18:30:34 +0100
Subject: 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>
---
 src/plugins/platforms/cocoa/qmultitouch_mac_p.h | 2 ++
 src/plugins/platforms/cocoa/qnsview.mm          | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/plugins/platforms')

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"
-- 
cgit v1.2.3