1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QOpenGL: Fix GLhandleARB redefinition on OS X

Browse Source 
Some Qt users include non-system OpenGL headers, resulting
in a possible mismatched redefinition of GLhandleARB.

Ideally, we'd like to skip the whole glext.h inlined portion
and rely on qopenglext.h. However, some issues remain such
as GLDEBUGPROC not being defined on OS X.

Change-Id: Ie551cf0be309234b22cd615cc3703980f48298b9
Task-number: QTBUG-46149
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
This commit is contained in:
Gabriel de Dietrich 2016-03-01 14:07:06 -08:00
parent 005a8bfbf0
commit f319b9b43c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/opengl/qopengl.h
View File

@ -181,7 +181,11 @@ typedef ptrdiff_t GLsizeiptrARB;
#ifndef GL_ARB_shader_objects #ifndef GL_ARB_shader_objects
/* GL types for program/shader text and shader object handles */ /* GL types for program/shader text and shader object handles */
typedef char GLcharARB; typedef char GLcharARB;
# ifdef Q_OS_DARWIN
typedef void *GLhandleARB;
# else
typedef unsigned int GLhandleARB; typedef unsigned int GLhandleARB;
# endif // Q_OS_DARWIN
#endif #endif
/* GL type for "half" precision (s10e5) float data in host memory */ /* GL type for "half" precision (s10e5) float data in host memory */