diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 11:49:35 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-09-13 11:54:30 (GMT) |
| commit | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (patch) | |
| tree | 72031d16ebed89a60590ce2392803888f99369f7 /src/gui/text/qfontengine_ft.cpp | |
| parent | 06dc8791a70329dc8e985a0eed7e434d1f762ec5 (diff) | |
| parent | 8f9d38ed63a2c568596febe5ea59a55fe03d7ba9 (diff) | |
| download | Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.zip Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.gz Qt-33e7ee9d1866f12a9b92fe4b5549c31e30974d8e.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Conflicts:
src/gui/text/text.pri
src/plugins/generic/linuxinput/qlinuxinput.cpp
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 4bbb977..67bad7b 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -724,7 +724,7 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format) metrics = face->size->metrics; -#if defined(Q_WS_QWS) +#if defined(Q_WS_QWS) || defined(Q_WS_QPA) /* TrueType fonts with embedded bitmaps may have a bitmap font specific ascent/descent in the EBLC table. There is no direct public API @@ -756,6 +756,11 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format) return true; } +void QFontEngineFT::setDefaultHintStyle(HintStyle style) +{ + default_hint_style = style; +} + QFontEngineFT::Glyph *QFontEngineFT::loadGlyphMetrics(QGlyphSet *set, uint glyph) const { Glyph *g = set->getGlyph(glyph); |