diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-23 06:51:56 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-23 06:51:56 (GMT) |
| commit | 369afa4bcee7addbf1a7e8556cf0b521bb75c57d (patch) | |
| tree | 11fc05b6aa85397d0384a14917c07bb3c0d964cf /src/gui/text/qfontengine_ft.cpp | |
| parent | 91c1ec98c10d8ce89932f7df69e3de33d80beeff (diff) | |
| parent | 0873efff5197cb92bce378c67cd744753f809bae (diff) | |
| download | Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.zip Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.tar.gz Qt-369afa4bcee7addbf1a7e8556cf0b521bb75c57d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index a4b2e7e..788417a 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -647,8 +647,14 @@ bool QFontEngineFT::init(FaceId faceId, bool antialias, GlyphFormat format) { defaultFormat = format; this->antialias = antialias; + if (!antialias) glyphFormat = QFontEngineGlyphCache::Raster_Mono; + else if (format == Format_A8) + glyphFormat = QFontEngineGlyphCache::Raster_A8; + else if (format == Format_A32) + glyphFormat = QFontEngineGlyphCache::Raster_RGBMask; + face_id = faceId; freetype = QFreetypeFace::getFace(face_id); if (!freetype) { |