From a7d7534ae64ec9ab198a5364aa5a7aed577bec6a Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 9 May 2017 15:30:32 +0200
Subject: Remove qmacstyle_mac.h and duplicate includes in global.h.in file

qmacstyle_mac.h sneaked in through a 5.6 -> 5.9 merge, which broke
builds on macOS. Remove the include, as well as remove other
duplicate includes which are now handled by the cmake global.h.in
append mechanism.

Change-Id: I333f897ff5f128f7b373ee03be6228915e5e5cd3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 PySide2/global.h.in | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'PySide2')

diff --git a/PySide2/global.h.in b/PySide2/global.h.in
index 40b107ee..0c7e2114 100644
--- a/PySide2/global.h.in
+++ b/PySide2/global.h.in
@@ -54,22 +54,12 @@
 // Make "signals:", "slots:" visible as access specifiers
 #define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
 
-#include <QtCore/QtCore>
-#if @Qt5Gui_FOUND@
-#  include <QtGui/QtGui>
-#endif
-#if @Qt5Widgets_FOUND@
-#  include <QtWidgets/QtWidgets>
-#endif
-
 #include "qpytextobject.h"  // PySide class
 
 #if @ENABLE_X11@
 #  if @Qt5X11Extras_FOUND@
 #    include <QtX11Extras/QX11Info>
 #  endif
-#elif @ENABLE_MAC@
-#  include <QtGui/qmacstyle_mac.h>
 #endif
 
 // QT_WIDGETS_LIB must be defined to QSqlRelationalDelegate become visible.
-- 
cgit v1.2.3