diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-23 08:29:43 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-03-23 08:29:43 +0100 |
| commit | 8e2d3e3b90d7d35d2c91fc09ab5a9cccac0823e8 (patch) | |
| tree | fe20315ed91d4babd73df69ece0af1d1550cb40c /src/gui/opengl/qopengl.h | |
| parent | bf17e30c8e98b311cdee397f1272e70863247ebc (diff) | |
| parent | f319b9b43c313dfa306a62c391e767bc6f14bdee (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9a10e1f3c9506ec8554d8f59b6300825ac730939
Diffstat (limited to 'src/gui/opengl/qopengl.h')
| -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 5543ac4a16..745adda969 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -187,7 +187,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 */ |