diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2012-03-20 11:57:35 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-21 09:00:22 +0100 |
| commit | 2cc5442b0263a449f4f5eb0cbf99e419ee0d0d38 (patch) | |
| tree | 50104f6658f49a69cb71994132fdfb43792b8c76 /src | |
| parent | 7f18dbc30c86464f8b86d8ab82966a40f5834fcf (diff) | |
Remove hardcoded font names in QFont::defaultFamily()
QFont::defaultFamily() should not use any hardcoded font names like
"Helvetica" or "Times" as they might not be present in certain systems,
it should rather use abstract names like "sans-serif", "serif" and
"monospace" then let the platform plugin to decide which font map to
them.
Change-Id: I5aafb103a5238c17b10773711ad504806c6fc3ce
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfont_qpa.cpp | 21 |
1 files changed, 11 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); |