diff -r 93b982ccede2 -r 5daf16870df6 src/opengl/qpixmapdata_x11gl_p.h --- a/src/opengl/qpixmapdata_x11gl_p.h Mon Jun 21 22:38:13 2010 +0100 +++ b/src/opengl/qpixmapdata_x11gl_p.h Thu Jul 22 16:41:55 2010 +0100 @@ -59,23 +59,35 @@ #include +#ifndef QT_NO_EGL +#include +#endif + QT_BEGIN_NAMESPACE +class QX11GLSharedContexts; + class QX11GLPixmapData : public QX11PixmapData, public QGLPaintDevice { public: QX11GLPixmapData(); virtual ~QX11GLPixmapData(); + // Re-implemented from QX11PixmapData: + void fill(const QColor &color); + void copy(const QPixmapData *data, const QRect &rect); + bool scroll(int dx, int dy, const QRect &rect); + // Re-implemented from QGLPaintDevice QPaintEngine* paintEngine() const; // Also re-implements QX11PixmapData::paintEngine void beginPaint(); - void endPaint(); QGLContext* context() const; QSize size() const; static bool hasX11GLPixmaps(); static QGLFormat glFormat(); + static QX11GLSharedContexts* sharedContexts(); + private: mutable QGLContext* ctx; };