diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2011-06-14 19:24:19 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2011-06-14 20:59:55 +0200 |
| commit | fcfc19878a0a1a48194a786bba64da11606077d2 (patch) | |
| tree | 8eb329cb2c22dbc2164601805d0337ae3c528fb3 /src/gui/text/qfontdatabase_s60.cpp | |
| parent | a0af3a2d12828e69a23d3697a4a6c8c03d9bd92f (diff) | |
Symbian: Fix QFontInfo::pixelSize()
Unlike QFont::pixelSize(), which may return -1 if the font size was
defined in points, QFontInfo::pixelSize() always needs to return a
valid value.
c4ef479906f073fa84999eb950f00e264ebd4e8e which was a fix for
QTBUG-13009 tried to fix a similar issue, but failed to do that
properly, which resulted in QTBUG-15513 and QTBUG-17844.
This commit is supposed to fix all three bugs.
Task-Number: QTBUG-13009
Task-Number: QTBUG-15513
Task-Number: QTBUG-17844
Diffstat (limited to 'src/gui/text/qfontdatabase_s60.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase_s60.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp index f73abcf7c0..3514fd334b 100644 --- a/src/gui/text/qfontdatabase_s60.cpp +++ b/src/gui/text/qfontdatabase_s60.cpp @@ -1014,10 +1014,6 @@ QFontEngine *QFontDatabase::findFont(int script, const QFontPrivate *d, const QF const QSymbianTypeFaceExtras *typeFaceExtras = dbExtras->extras(fontFamily, request.weight > QFont::Normal, request.style != QFont::StyleNormal); - // We need a valid pixelSize, e.g. for lineThickness() - if (request.pixelSize < 0) - request.pixelSize = request.pointSize * d->dpi / 72; - fe = new QFontEngineS60(request, typeFaceExtras); #else // QT_NO_FREETYPE Q_UNUSED(d) |