aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-08-30 11:01:12 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-09-01 08:20:33 +0000
commit10453490629859a01048d0b21688d6617279eeaf (patch)
treede349f8049ec273742d33a8970a61d478c66ce12 /sources/pyside2/PySide2
parenteef8c43b22b7aa0269dad42cb2406777148c121b (diff)
global.h.in: Remove include of gl.h and related workarounds for Windows
The include causes clang parse errors due to redefinition of APIENTRY on Windows 32bit. It seems it is no longer required after the fixes to the Clang include handling. Task-number: PYSIDE-528 Change-Id: Ie182e0cac4e0310b31c45ee68e2148500a6e9e34 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/PySide2')
-rw-r--r--sources/pyside2/PySide2/global.h.in14
1 files changed, 0 insertions, 14 deletions
diff --git a/sources/pyside2/PySide2/global.h.in b/sources/pyside2/PySide2/global.h.in
index b8ac01bb..1d04efe9 100644
--- a/sources/pyside2/PySide2/global.h.in
+++ b/sources/pyside2/PySide2/global.h.in
@@ -70,18 +70,4 @@
# include "pysideqtesttouch.h"
#endif
-#ifndef QT_NO_OPENGL
-// Define export macros for Windows' gl.h
-# ifdef Q_OS_WIN
-# define NOMINMAX // windows.h is pulled, sanitize
-# ifndef APIENTRY
-# define APIENTRY
-# endif
-# ifndef WINGDIAPI
-# define WINGDIAPI
-# endif
-# endif // Q_OS_WIN
-# include <@GL_H@>
-#endif // QT_NO_OPENGL
-
// Here are now all configured modules appended: