summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakumi ASAKI <takumi.asaki@nokia.com>2011-09-07 14:39:46 +0200
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2011-09-08 08:44:15 +0200
commit2b1b51b558d30a519b107038659d25eb6cdd5bf4 (patch)
tree64a87b152a826591545cbdb605cca9822c21c601
parenta30d4162ddb30b62b8d003b099d3ca8ae0b0ed0b (diff)
Fix compile error on Mac.
Change-Id: I88123bc741303ff440f628f752f39486da81e426 Reviewed-on: http://codereview.qt-project.org/4358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
-rw-r--r--src/plugins/platforms/cocoa/qcocoaautoreleasepool.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaautoreleasepool.h b/src/plugins/platforms/cocoa/qcocoaautoreleasepool.h
index 862bc27f9d..359b5d34d0 100644
--- a/src/plugins/platforms/cocoa/qcocoaautoreleasepool.h
+++ b/src/plugins/platforms/cocoa/qcocoaautoreleasepool.h
@@ -42,6 +42,8 @@
#ifndef QCOCOAAUTORELEASEPOOL_H
#define QCOCOAAUTORELEASEPOOL_H
+#undef slots
+
#include <Cocoa/Cocoa.h>
class QCocoaAutoReleasePool