From 1992e206f65400c95611d2110035dc1c310b8ea2 Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Fri, 21 Nov 2014 06:30:41 +0400
Subject: Don't assemble QRawFont from QFont manually

Always prefer QRawFont::fromFont(..)

Change-Id: Ic33f7d3a468f926418b39887f572829af93f8c1d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
---
 src/gui/painting/qpaintbuffer.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src')

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);
 
-- 
cgit v1.2.3