From fa6bad3c703fdb2d0218972c5774ed0a61948f84 Mon Sep 17 00:00:00 2001
From: Michael Dominic K <mdk@codethink.co.uk>
Date: Wed, 13 Oct 2010 11:40:51 +0200
Subject: Correctly remove the egl alpha surface flags in meego graphics
 system.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge-request: 856
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
-- 
cgit v0.12