diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-05-09 15:30:32 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-05-09 14:15:49 +0000 |
| commit | a7d7534ae64ec9ab198a5364aa5a7aed577bec6a (patch) | |
| tree | e33ce5cd24a7e096307bc05889e796c0954594a1 /PySide2 | |
| parent | a2f4356a8009d9d4ad4aeafd0ac50e1b6241b2fe (diff) | |
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>
Diffstat (limited to 'PySide2')
| -rw-r--r-- | PySide2/global.h.in | 10 |
1 files changed, 0 insertions, 10 deletions
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. |