Undefine "slots" before including cocoa headers to make it compile

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>

diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
index cfb6995..22fe8b2 100644 (file)
--- 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 9af931b..786db32 100644 (file)
--- 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