diff options
Diffstat (limited to 'src/plugins/platforms')
| -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 |