diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2016-03-01 14:07:06 -0800 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2016-03-22 23:04:17 +0000 |
| commit | f319b9b43c313dfa306a62c391e767bc6f14bdee (patch) | |
| tree | 015d597b96a309908fbe8c25998a32706fefafe5 | |
| parent | 005a8bfbf0022f03dafafcf2b5c438ccf0675a49 (diff) | |
QOpenGL: Fix GLhandleARB redefinition on OS X
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>
| -rw-r--r-- | src/gui/opengl/qopengl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 87dc2a830e..a060949c17 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -181,7 +181,11 @@ typedef ptrdiff_t GLsizeiptrARB; #ifndef GL_ARB_shader_objects /* GL types for program/shader text and shader object handles */ typedef char GLcharARB; +# ifdef Q_OS_DARWIN +typedef void *GLhandleARB; +# else typedef unsigned int GLhandleARB; +# endif // Q_OS_DARWIN #endif /* GL type for "half" precision (s10e5) float data in host memory */ |