From 542a76c490cee7359f9c5116248977cab72b7b63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 13 Oct 2016 12:57:28 +0200
Subject: macOS: Remove workaround for including AppKit.h with slots defined
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The workaround doesn't seem to be needed anymore, and wasn't applied
uniformly anyways. If it turns out AppKit still needs this workaround
we should add CONFIG += no_keywords to cocoa.pro, instead of trying to
wrap every single include of AppKit in a undef slots dance.

Change-Id: Ia1b15137c03abcc92f0dd246796622772e99ca68
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/plugins/platforms/cocoa/qt_mac_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/platforms/cocoa/qt_mac_p.h')

diff --git a/src/plugins/platforms/cocoa/qt_mac_p.h b/src/plugins/platforms/cocoa/qt_mac_p.h
index ce17919e8c..fdcf3bcdd3 100644
--- a/src/plugins/platforms/cocoa/qt_mac_p.h
+++ b/src/plugins/platforms/cocoa/qt_mac_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include "qmacdefines_mac.h"
-
 #ifdef __OBJC__
 #include <AppKit/AppKit.h>
 #include <objc/runtime.h>
 #endif
 
+#include "qmacdefines_mac.h"
+
 #include <CoreServices/CoreServices.h>
 
 #include "QtCore/qglobal.h"
-- 
cgit v1.2.3