diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-11 12:53:43 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-11 14:03:20 (GMT) |
| commit | c5cb91a714f3fa38aeab41c6e793a5a3d071dcef (patch) | |
| tree | f9b798e1086dba437c22b1d37cd4ff15770c2d16 /src/gui/text | |
| parent | 5f5c9ba6810071bc7bb369afd2aac99064177ce7 (diff) | |
| download | Qt-c5cb91a714f3fa38aeab41c6e793a5a3d071dcef.zip Qt-c5cb91a714f3fa38aeab41c6e793a5a3d071dcef.tar.gz Qt-c5cb91a714f3fa38aeab41c6e793a5a3d071dcef.tar.bz2 | |
Add support for QFont::NoAntialias on QWS
Task-number: QTBUG-5936
Reviewed-by: Eskil
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfontdatabase_qws.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp index 62d7793..a3d8d65 100644 --- a/src/gui/text/qfontdatabase_qws.cpp +++ b/src/gui/text/qfontdatabase_qws.cpp @@ -632,8 +632,9 @@ QFontEngine *loadSingleEngine(int script, const QFontPrivate *fp, #ifndef QT_NO_FREETYPE QScopedPointer<QFontEngineFT> fte(new QFontEngineFT(def)); - if (fte->init(faceId, style->antialiased, - style->antialiased ? QFontEngineFT::Format_A8 : QFontEngineFT::Format_Mono)) { + bool antialias = style->antialiased && !(request.styleStrategy & QFont::NoAntialias); + if (fte->init(faceId, antialias, + antialias ? QFontEngineFT::Format_A8 : QFontEngineFT::Format_Mono)) { #ifdef QT_NO_QWS_QPF2 return fte.take(); #else @@ -793,7 +794,7 @@ QFontDatabase::findFont(int script, const QFontPrivate *fp, " family: %s [%s], script: %d\n" " weight: %d, style: %d\n" " stretch: %d\n" - " pixelSize: %d\n" + " pixelSize: %g\n" " pitch: %c", family_name.isEmpty() ? "-- first in script --" : family_name.toLatin1().constData(), foundry_name.isEmpty() ? "-- any --" : foundry_name.toLatin1().constData(), |