diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-18 12:54:24 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-04-18 13:15:06 (GMT) |
| commit | 518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3 (patch) | |
| tree | c3c026d87b690391cff97aa6b4c4d6b868674ba2 /src/declarative/graphicsitems/qdeclarativetextlayout_p.h | |
| parent | 54bc4f3562bd81fa7e52e7d2d47b697d01c5b4b3 (diff) | |
| download | Qt-518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3.zip Qt-518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3.tar.gz Qt-518c2a58ed6fdfd7449cb4476aa8ea0d32ad16e3.tar.bz2 | |
Fix missing color in text when using static text back-end in QML
Using QStaticTextItem as a back-end for QML text on GL caused a
regression where parts of a text element would get the wrong color.
This was because the color set on the painter which was passed into
draw() was never transferred to the painter used to record the draw
text calls issued by the underlying QTextLayout::draw()-function.
Task-number: QTBUG-18428
Reviewed-by: Jiang Jiang
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextlayout_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextlayout_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
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: |