diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-02-02 12:20:10 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-02-10 12:42:53 (GMT) |
| commit | 0fe100ddd40580f7295611628b319768fa4883d7 (patch) | |
| tree | abf909d3c3c106f6efcdd30a75750990e98b180f | |
| parent | 290f002186497e3061a973c094e3f2aba6bd6aef (diff) | |
| download | Qt-0fe100ddd40580f7295611628b319768fa4883d7.zip Qt-0fe100ddd40580f7295611628b319768fa4883d7.tar.gz Qt-0fe100ddd40580f7295611628b319768fa4883d7.tar.bz2 | |
Fixed compilation of the GL2 engine for OpenGL ES 2.
glColor4f is not defined in OpenGL ES 2.
Reviewed-by: Trond
(cherry picked from commit 88c4000c21be7af37bc490a2edd9d1f481b3a862)
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 6d003c7..fc2dfa2 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -561,7 +561,9 @@ void QGL2PaintEngineExPrivate::resetGLState() glDisableVertexAttribArray(QT_TEXTURE_COORDS_ATTR); glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR); glDisableVertexAttribArray(QT_OPACITY_ATTR); +#ifndef QT_OPENGL_ES_2 glColor4f(1.0f, 1.0f, 1.0f, 1.0f); // color may have been changed by glVertexAttrib() +#endif } void QGL2PaintEngineEx::endNativePainting() |