summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-02-12 10:43:17 (GMT)
committerKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-02-12 10:44:45 (GMT)
commitf42ad9029816891fd5c603b0fa6259e758db0e07 (patch)
tree468536892304c7bdecef87e6be6a5b776f116731 /src/opengl
parent5f4a12e33e1b05923b0ec5f6718e52c76a052d9e (diff)
downloadQt-f42ad9029816891fd5c603b0fa6259e758db0e07.zip
Qt-f42ad9029816891fd5c603b0fa6259e758db0e07.tar.gz
Qt-f42ad9029816891fd5c603b0fa6259e758db0e07.tar.bz2
Compile fix for OpenGL ES.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 1263a56..143b2e9 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1536,7 +1536,11 @@ bool QGL2PaintEngineEx::begin(QPaintDevice *pdev)
case QInternal::FramebufferObject:
{
GLenum f = static_cast<QGLFramebufferObject *>(pdev)->format().internalTextureFormat();
- d->deviceHasAlpha = (f != GL_RGB && f != GL_RGB5 && f != GL_RGB8);
+ d->deviceHasAlpha = (f != GL_RGB
+#ifndef QT_OPENGL_ES
+ && f != GL_RGB5 && f != GL_RGB8
+#endif
+ );
}
break;
default: