diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-07-17 14:43:34 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-17 14:43:34 +0000 |
commit | dcc301abfa7b6535199d028ad1afc15daa2d1200 (patch) | |
tree | 44a4688bc490f0d57d31a361455b8bde1ffd3dbf /src/gui/text/qtextengine.cpp | |
parent | 5443da6c2795255db55697471190b3eba16b28dc (diff) | |
parent | b2603b76655ac819e43c063bb6f16bc95f358083 (diff) |
Merge "Merge remote-tracking branch 'origin/5.5' into HEAD" into refs/staging/dev
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
-rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index e87711ef99..d2174c5e06 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1256,7 +1256,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *st // scaling the advances for this particular version if (actualFontEngine->fontDef.stretch != 100 && QSysInfo::MacintoshVersion != QSysInfo::MV_10_6) { - QFixed stretch = QFixed(actualFontEngine->fontDef.stretch) / QFixed(100); + QFixed stretch = QFixed(int(actualFontEngine->fontDef.stretch)) / QFixed(100); for (uint i = 0; i < num_glyphs; ++i) g.advances[i] *= stretch; } |