diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-05 15:24:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-05 15:24:53 +0000 |
| commit | df5159a8a6b6bf585feb1473054dec2ed5ddb11a (patch) | |
| tree | a56ad5c69e735eeeb1e93e01330ec2498f5ba497 /src/gui/opengl/qopengl.h | |
| parent | 0683c9291f9c1ffe0625fdadee198840047f0e92 (diff) | |
| parent | f2856875843efce9a00e90dad05bde358ab82197 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
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 5543ac4a166..745adda969a 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 */ |