diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
| commit | 87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3 (patch) | |
| tree | f8b8c24056d54e19937dea1b0301af558597726a /src/opengl/qpixmapdata_x11gl_p.h | |
| parent | 09ce407aaa4a00013a606bf0011faf6cbc654c72 (diff) | |
| parent | 00f7426f3906361fb5addb36e428648eee5e2983 (diff) | |
| download | Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.zip Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.gz Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/opengl/qpixmapdata_x11gl_p.h')
| -rw-r--r-- | src/opengl/qpixmapdata_x11gl_p.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/opengl/qpixmapdata_x11gl_p.h b/src/opengl/qpixmapdata_x11gl_p.h index c9f4f56..8681336 100644 --- a/src/opengl/qpixmapdata_x11gl_p.h +++ b/src/opengl/qpixmapdata_x11gl_p.h @@ -59,6 +59,10 @@ #include <qgl.h> +#ifndef QT_NO_EGL +#include <QtGui/private/qeglcontext_p.h> +#endif + QT_BEGIN_NAMESPACE class QX11GLPixmapData : public QX11PixmapData, public QGLPaintDevice @@ -67,6 +71,11 @@ 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(); @@ -76,6 +85,11 @@ public: static bool hasX11GLPixmaps(); static QGLFormat glFormat(); + +#ifndef QT_NO_EGL + static QEglContext* rgbContext; + static QEglContext* argbContext; +#endif private: mutable QGLContext* ctx; }; |