From 7d07ca24882ec49045c33d3cc67457bba6f5f73d Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Thu, 28 Jul 2011 10:15:18 +0200
Subject: Undefine "slots" before including cocoa headers to make it compile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f
Reviewed-on: http://codereview.qt.nokia.com/2328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 1 +
 src/plugins/platforms/cocoa/qcocoaglcontext.h        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index cfb6995f57..22fe8b2e33 100644
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@@ -86,6 +86,7 @@
 
 //#include <private/qcocoaapplication_mac_p.h>
 //#include "private/qt_cocoa_helpers_mac_p.h"
+#undef slots
 #include <Cocoa/Cocoa.h>
 #include <Carbon/Carbon.h>
 
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index 9af931bf6c..786db322c1 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -6,6 +6,7 @@
 #include <QtGui/QGuiGLContext>
 #include <QtGui/QWindow>
 
+#undef slots
 #include <Cocoa/Cocoa.h>
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3