diff -r b72c6db6890b -r 5dc02b23752f src/gui/text/qfontdatabase_qws.cpp --- a/src/gui/text/qfontdatabase_qws.cpp Wed Jun 23 19:07:03 2010 +0300 +++ b/src/gui/text/qfontdatabase_qws.cpp Tue Jul 06 15:10:48 2010 +0300 @@ -632,8 +632,9 @@ #ifndef QT_NO_FREETYPE QScopedPointer 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 @@ " 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(),