Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Add new exported symbol to QtGuiu.def
  Handle uppercase 'E' when parsing numbers in SVGs.
  Let QTextLine decide its own x position in QPainter
  Support text decoration in QML when using static text back-end
  Fix missing color in text when using static text back-end in QML

2 files changed, 14 insertions, 3 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
index 31819f5..75d9f67 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp
@@ -299,7 +299,7 @@ void QDeclarativeTextLayout::clearLayout()
     QTextLayout::clearLayout();
 }
 
-void QDeclarativeTextLayout::prepare()
+void QDeclarativeTextLayout::prepare(QPainter *painter)
 {
     if (!d || !d->cached) {
 
@@ -308,6 +308,7 @@ void QDeclarativeTextLayout::prepare()
 
         InertTextPainter *itp = inertTextPainter();
         itp->device.begin(d);
+        itp->painter.setPen(painter->pen());
         QTextLayout::draw(&itp->painter, QPointF(0, 0));
 
         glyph_t *glyphPool = d->glyphs.data();
@@ -326,6 +327,12 @@ void QDeclarativeTextLayout::prepare()
     }
 }
 
+// Defined in qpainter.cpp
+extern Q_GUI_EXPORT void qt_draw_decoration_for_glyphs(QPainter *painter, const glyph_t *glyphArray,
+                                                       const QFixedPoint *positions, int glyphCount,
+                                                       QFontEngine *fontEngine, const QFont &font,
+                                                       const QTextCharFormat &charFormat);
+
 void QDeclarativeTextLayout::draw(QPainter *painter, const QPointF &p)
 {
     QPainterPrivate *priv = QPainterPrivate::get(painter);
@@ -340,7 +347,7 @@ void QDeclarativeTextLayout::draw(QPainter *painter, const QPointF &p)
         return;
     }
 
-    prepare();
+    prepare(painter);
 
     int itemCount = d->items.count();
 
@@ -371,6 +378,10 @@ void QDeclarativeTextLayout::draw(QPainter *painter, const QPointF &p)
             currentColor = item.color;
         }
         priv->extended->drawStaticTextItem(&item);
+
+        qt_draw_decoration_for_glyphs(painter, item.glyphs, item.glyphPositions,
+                                      item.numGlyphs, item.fontEngine(), painter->font(),
+                                      QTextCharFormat());
     }
     if (currentColor != oldPen.color())
         painter->setPen(oldPen);
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
index 2c9264e..23b22a6 100644
--- a/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextlayout_p.h
@@ -61,7 +61,7 @@ public:
     void beginLayout();
     void clearLayout();
 
-    void prepare();
+    void prepare(QPainter *);
     void draw(QPainter *, const QPointF & = QPointF());
 
 private: