summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2014-11-24 11:34:00 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2014-11-25 22:18:19 +0100
commit0e0464c50d96dcf576e525f750cd96f8afa7784b (patch)
tree71c3a2d96383c42642d52d92271afc70cc5e9076 /src/gui
parent02e20f772d4e07c0eed80d1aa11938787b763eca (diff)
[QPainter] Fix QTextItem painting with extended paint engine
Multi QFontEngine should be handled just like all other cases covered several lines below. Change-Id: If3dd9a2e38a5f6f61b113576cb188da378fc9efb Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qpainter.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index f151463e30..d40a2b9456 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -6432,7 +6432,10 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText
if (rtl)
x -= ti2.width.toReal();
- engine->drawTextItem(QPointF(x, y), ti2);
+ if (extended)
+ extended->drawTextItem(QPointF(x, y), ti2);
+ else
+ engine->drawTextItem(QPointF(x, y), ti2);
if (!rtl)
x += ti2.width.toReal();