diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-07-28 10:15:18 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-05 10:38:17 +0200 |
| commit | 7d07ca24882ec49045c33d3cc67457bba6f5f73d (patch) | |
| tree | 479f2ab1b1608af3bf305b4f880bb6ed6dd53b44 /src | |
| parent | 0d9cac597e7a3f0a4ca1b41f9f92bfc81ebe509a (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaglcontext.h | 1 |
2 files changed, 2 insertions, 0 deletions
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 |