Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

Conflicts:
	src/opengl/qgl.cpp
	src/opengl/qgl_p.h
	src/opengl/qpaintengine_opengl.cpp

1 files changed, 19 insertions, 4 deletions

diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
index 74cb330..7fde802 100644
--- a/src/opengl/qglpixelbuffer_p.h
+++ b/src/opengl/qglpixelbuffer_p.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
@@ -20,10 +21,9 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
@@ -58,6 +58,7 @@ QT_BEGIN_NAMESPACE
 QT_BEGIN_INCLUDE_NAMESPACE
 #include "QtOpenGL/qglpixelbuffer.h"
 #include <private/qgl_p.h>
+#include <private/qglpaintdevice_p.h>
 
 #if defined(Q_WS_X11) && !defined(QT_OPENGL_ES)
 #include <GL/glx.h>
@@ -135,6 +136,19 @@ QT_END_INCLUDE_NAMESPACE
 
 class QEglContext;
 
+
+class QGLPBufferGLPaintDevice : public QGLPaintDevice
+{
+public:
+    virtual QPaintEngine* paintEngine() const {return pbuf->paintEngine();}
+    virtual QSize size() const {return pbuf->size();}
+    virtual QGLContext* context() const;
+    virtual void endPaint();
+    void setPBuffer(QGLPixelBuffer* pb);
+private:
+    QGLPixelBuffer* pbuf;
+};
+
 class QGLPixelBufferPrivate {
     Q_DECLARE_PUBLIC(QGLPixelBuffer)
 public:
@@ -154,6 +168,7 @@ public:
     QGLPixelBuffer *q_ptr;
     bool invalid;
     QGLContext *qctx;
+    QGLPBufferGLPaintDevice glDevice;
     QGLFormat format;
 
     QGLFormat req_format;