Made QPixmap autotest pass with -graphicssystem opengl

The window surface has been modified to track widget deletion to make
sure it doesn't try to access the widget's context data after deletion.

QGLPixmapData now also uses GL_RGB instead of GL_RGBA when appropriate,
and hasAlphaChannel() has been modified in view of this.

A number of other issues have been fixed in QGLPixmapData, and the
autotest has been modified to use a more lenient pixmap compare function
due to off-by-one pixel errors here and there.

Reviewed-by: Trond

1 files changed, 4 insertions, 0 deletions

diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index 1b6b7aee2d..af10f2cfe9 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -115,6 +115,8 @@ private:
 
     static bool useFramebufferObjects();
 
+    QImage fillImage(const QColor &color) const;
+
     int m_width;
     int m_height;
 
@@ -131,6 +133,8 @@ private:
     // represented by a single fill color
     mutable QColor m_fillColor;
     mutable bool m_hasFillColor;
+
+    mutable bool m_hasAlpha;
 };
 
 QT_END_NAMESPACE