Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95

2 files changed, 6 insertions, 10 deletions

diff --git a/src/gui/painting/qpaintbuffer.cpp b/src/gui/painting/qpaintbuffer.cpp
index a9a2c91fd6..be147ec842 100644
--- a/src/gui/painting/qpaintbuffer.cpp
+++ b/src/gui/painting/qpaintbuffer.cpp
@@ -39,7 +39,6 @@
 #include <private/qimage_p.h>
 #include <qstatictext.h>
 #include <private/qstatictext_p.h>
-#include <private/qrawfont_p.h>
 
 #include <QDebug>
 
@@ -1744,14 +1743,8 @@ void QPainterReplayer::process(const QPaintBufferCommand &cmd)
 
             painter->setFont(font);
 
-            QRawFont rawFont;
-            QRawFontPrivate *rawFontD = QRawFontPrivate::get(rawFont);
-            QFontPrivate *fontD = QFontPrivate::get(font);
-            rawFontD->fontEngine = fontD->engineForScript(QChar::Script_Common);
-            rawFontD->fontEngine->ref.ref();
-
             QGlyphRun glyphs;
-            glyphs.setRawFont(rawFont);
+            glyphs.setRawFont(QRawFont::fromFont(font, QFontDatabase::Any));
             glyphs.setGlyphIndexes(glyphIndexes);
             glyphs.setPositions(positions);
 
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index eeebfde98c..b99a32df27 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -6358,7 +6358,7 @@ void QPainterPrivate::drawTextItem(const QPointF &p, const QTextItem &_ti, QText
         return;
 
     const QPainter::RenderHints oldRenderHints = state->renderHints;
-    if (!state->renderHints & QPainter::Antialiasing && state->matrix.type() >= QTransform::TxScale) {
+    if (!(state->renderHints & QPainter::Antialiasing) && state->matrix.type() >= QTransform::TxScale) {
         // draw antialias decoration (underline/overline/strikeout) with
         // transformed text
 
@@ -6428,7 +6428,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();