Make QGLPixmapData work with the new QGLPaintDevice API

This patch changes the ordering of QGL2PaintEngine::begin a bit because
QGLPixmapData needs to use the paint engine's drawTexture method within
beginPaint().

Also, this initialises needsSync to true and removes the setState call.
So now all the state initialisation is done in ensureActive rather than
begin.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
index 65fcf540c7..58e6505bb7 100644
--- a/src/opengl/qglframebufferobject_p.h
+++ b/src/opengl/qglframebufferobject_p.h
@@ -110,11 +110,12 @@ public:
     virtual QPaintEngine* paintEngine() const {return fbo->paintEngine();}
     virtual QSize size() const {return fbo->size();}
     virtual QGLContext* context() const {return const_cast<QGLContext *>(QGLContext::currentContext());}
-    void setFBO(QGLFramebufferObject* f) {fbo = f; }
     virtual void ensureActiveTarget();
     virtual void beginPaint();
     virtual void endPaint();
 
+    void setFBO(QGLFramebufferObject* f);
+
 private:
     bool wasBound;
     QGLFramebufferObject* fbo;