diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /src/gui | |
parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 5550dc21db..112dda0d75 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -1901,7 +1901,7 @@ void QFontEngineFT::unlockAlphaMapForGlyph() static inline bool is2dRotation(const QTransform &t) { return qFuzzyCompare(t.m11(), t.m22()) && qFuzzyCompare(t.m12(), -t.m21()) - && qFuzzyCompare(t.m11()*t.m22() - t.m12()*t.m21(), 1.0); + && qFuzzyCompare(t.m11()*t.m22() - t.m12()*t.m21(), qreal(1.0)); } QFontEngineFT::Glyph *QFontEngineFT::loadGlyphFor(glyph_t g, |