diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-10-13 09:40:51 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-10-13 09:40:51 (GMT) |
| commit | fa6bad3c703fdb2d0218972c5774ed0a61948f84 (patch) | |
| tree | 690c78cd3c5f8e03d3ae1ba6e3892c57f48cc0a4 | |
| parent | 1af2d09523e3808e4589f05a4b8d42c308eb0841 (diff) | |
| download | Qt-fa6bad3c703fdb2d0218972c5774ed0a61948f84.zip Qt-fa6bad3c703fdb2d0218972c5774ed0a61948f84.tar.gz Qt-fa6bad3c703fdb2d0218972c5774ed0a61948f84.tar.bz2 | |
Correctly remove the egl alpha surface flags in meego graphics system.
Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index f8b228c..b378b13 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -363,7 +363,9 @@ EGLSurface QMeeGoGraphicsSystem::getSurfaceForLiveTexturePixmap(QPixmap *pixmap) pixmapData->gl_surface = (void*)QEgl::createSurface(pixmap, config); if (hasAlpha) - pixmapData->flags = pixmapData->flags | QX11PixmapData::GlSurfaceCreatedWithAlpha; + pixmapData->flags |= QX11PixmapData::GlSurfaceCreatedWithAlpha; + else + pixmapData->flags &= ~QX11PixmapData::GlSurfaceCreatedWithAlpha; if (pixmapData->gl_surface == (void*)EGL_NO_SURFACE) return NULL; |