summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2010-03-01 13:12:23 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2010-03-02 08:24:26 (GMT)
commitb2cbb880273ae6516d68be5b5f3f9b614c31ca79 (patch)
tree9d151f0821186a7ee6855911992d712cac21397d /src/gui/image
parentf936cc4e2a7b377981a626b1d45dbbb1c1df1cb8 (diff)
downloadQt-b2cbb880273ae6516d68be5b5f3f9b614c31ca79.zip
Qt-b2cbb880273ae6516d68be5b5f3f9b614c31ca79.tar.gz
Qt-b2cbb880273ae6516d68be5b5f3f9b614c31ca79.tar.bz2
Move QGLWidget::setContext logic into QEgl & QGLContext
QEgl::createSurface() on X11 will now check to see if the device's X11 Visual is compatible with the EGLConfig passed in. If it is not compatible, the function will re-create the QPaintDevice's native drawable with a different Visual (one which is compatable with the EGLConfig). This represented the bulk of the QGLWidget::setContext method which is now much simpler. As a consequense of this change, QWidgets with graphicssystem opengl will behave much more like QGLWidget as most of the code is re-used. So things like WA_TranslucentBackground should now work with opengl graphicssystem too. Reviewed-By: TrustMe
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmap_x11_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h
index 0c0a9bd..7bc586d 100644
--- a/src/gui/image/qpixmap_x11_p.h
+++ b/src/gui/image/qpixmap_x11_p.h
@@ -105,6 +105,7 @@ private:
friend class QRasterWindowSurface;
friend class QGLContextPrivate; // Needs to access xinfo, gl_surface & flags
friend class QEglContext; // Needs gl_surface
+ friend class QGLContext; // Needs gl_surface
friend class QX11GLPixmapData; // Needs gl_surface
friend bool qt_createEGLSurfaceForPixmap(QPixmapData*, bool); // Needs gl_surface