From 0e0464c50d96dcf576e525f750cd96f8afa7784b Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Mon, 24 Nov 2014 11:34:00 +0400 Subject: [PATCH] [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 --- src/gui/painting/qpainter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index f151463e303..d40a2b94568 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();