diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-21 06:30:41 +0400 |
---|---|---|
committer | Konstantin Ritt <ritt.ks@gmail.com> | 2014-11-25 22:18:06 +0100 |
commit | 1992e206f65400c95611d2110035dc1c310b8ea2 (patch) | |
tree | 573f4fe7930cfd3df57fc1d03d93abdfa4b29548 /src | |
parent | d911f1dd429328f2046b416fe6190a859db80013 (diff) |
Don't assemble QRawFont from QFont manually
Always prefer QRawFont::fromFont(..)
Change-Id: Ic33f7d3a468f926418b39887f572829af93f8c1d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/painting/qpaintbuffer.cpp | 9 |
1 files changed, 1 insertions, 8 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); |