diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /src/gui/text | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qfont_qpa.cpp | 21 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_ft_p.h | 1 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp index 29ba7767bc..6576f237c4 100644 --- a/src/gui/text/qfont_qpa.cpp +++ b/src/gui/text/qfont_qpa.cpp @@ -77,28 +77,29 @@ QString QFont::defaultFamily() const { QString familyName; switch(d->request.styleHint) { - case QFont::Times: - familyName = QString::fromLatin1("Times"); + case QFont::SansSerif: + familyName = QString::fromLatin1("sans-serif"); break; - case QFont::Courier: - familyName = QString::fromLatin1("Courier"); + case QFont::Serif: + familyName = QString::fromLatin1("serif"); break; + case QFont::TypeWriter: case QFont::Monospace: - familyName = QString::fromLatin1("Courier New"); + familyName = QString::fromLatin1("monospace"); break; case QFont::Cursive: - familyName = QString::fromLatin1("Comic Sans MS"); + familyName = QString::fromLatin1("cursive"); break; case QFont::Fantasy: - familyName = QString::fromLatin1("Impact"); + familyName = QString::fromLatin1("fantasy"); break; case QFont::Decorative: - familyName = QString::fromLatin1("Old English"); + familyName = QString::fromLatin1("decorative"); break; - case QFont::Helvetica: case QFont::System: default: - familyName = QString::fromLatin1("Helvetica"); + familyName = QString(); + break; } return QGuiApplicationPrivate::platformIntegration()->fontDatabase()->resolveFontFamilyAlias(familyName); diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h index 83b51685c0..2add894c19 100644 --- a/src/gui/text/qfontengine_ft_p.h +++ b/src/gui/text/qfontengine_ft_p.h @@ -364,6 +364,7 @@ inline QFontEngineFT::Glyph *QFontEngineFT::QGlyphSet::getGlyph(glyph_t index, Q return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition)); } +extern Q_GUI_EXPORT FT_Library qt_getFreetype(); QT_END_NAMESPACE |