diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 18:56:33 +0100 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-01-25 18:56:33 +0100 |
commit | 5422e929cad04633a06c156cba96cfcd69262522 (patch) | |
tree | afb3c9b76c05d80238a1ff76f4e8f4019fac1651 /src/gui/text/qfontengine_s60.cpp | |
parent | ac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff) | |
parent | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff) |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/network/bearer/bearer.pri
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
-rw-r--r-- | src/gui/text/qfontengine_s60.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp index 4317ee6a3c..e9b54e350f 100644 --- a/src/gui/text/qfontengine_s60.cpp +++ b/src/gui/text/qfontengine_s60.cpp @@ -244,10 +244,13 @@ static inline unsigned int getChar(const QChar *str, int &i, const int len) return uc; } +extern QString qt_symbian_fontNameWithAppFontMarker(const QString &fontName); // qfontdatabase_s60.cpp + CFont *QFontEngineS60::fontWithSize(qreal size) const { CFont *result = 0; - TFontSpec fontSpec(qt_QString2TPtrC(QFontEngine::fontDef.family), TInt(size)); + const QString family = qt_symbian_fontNameWithAppFontMarker(QFontEngine::fontDef.family); + TFontSpec fontSpec(qt_QString2TPtrC(family), TInt(size)); fontSpec.iFontStyle.SetBitmapType(EAntiAliasedGlyphBitmap); fontSpec.iFontStyle.SetPosture(QFontEngine::fontDef.style == QFont::StyleNormal?EPostureUpright:EPostureItalic); fontSpec.iFontStyle.SetStrokeWeight(QFontEngine::fontDef.weight > QFont::Normal?EStrokeWeightBold:EStrokeWeightNormal); |