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

1 files changed, 12 insertions, 1 deletions

diff --git a/src/gui/painting/qpaintbuffer_p.h b/src/gui/painting/qpaintbuffer_p.h
index 79d7b35..4576947 100644
--- a/src/gui/painting/qpaintbuffer_p.h
+++ b/src/gui/painting/qpaintbuffer_p.h
@@ -78,6 +78,12 @@ public:
     int numFrames() const;
 
     void draw(QPainter *painter, int frame = 0) const;
+
+    int frameStartIndex(int frame) const;
+    int frameEndIndex(int frame) const;
+    int processCommands(QPainter *painter, int begin, int end) const;
+    QString commandDescription(int command) const;
+
     void setBoundingRect(const QRectF &rect);
     QRectF boundingRect() const;
 
@@ -183,6 +189,10 @@ public:
         Cmd_DrawTiledPixmap,
 
         Cmd_SystemStateChanged,
+        Cmd_Translate,
+        Cmd_DrawStaticText,
+
+        // new commands must be added above this line
 
         Cmd_LastCommand
     };
@@ -313,7 +323,7 @@ public:
 
     void setupTransform(QPainter *painter);
     virtual void process(const QPaintBufferCommand &cmd);
-    void draw(const QPaintBuffer &buffer, QPainter *painter, int frame);
+    void processCommands(const QPaintBuffer &buffer, QPainter *painter, int begin, int end);
 
 protected:
     QPaintBufferPrivate *d;
@@ -394,6 +404,7 @@ public:
     virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s);
 
     virtual void drawTextItem(const QPointF &pos, const QTextItem &ti);
+    virtual void drawStaticTextItem(QStaticTextItem *staticTextItem);
 
     virtual void setState(QPainterState *s);
     virtual uint flags() const {return QPaintEngineEx::DoNotEmulate;}