diff options
author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-07-08 16:50:31 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-11 17:29:39 +0200 |
commit | bf42eacc7fb283d123f9bdf9ebc19c16dd7035e4 (patch) | |
tree | 64513d8fd13bb6e1beaa275706d10508bec12590 /src/plugins | |
parent | 30f19d904fb3b93f4bb9a17646748b1fca4f286a (diff) |
Windows font database: Resolve aliases for extra fonts.
Ensure QFontDataBase::hasFamily() deals with aliases.
Task-number: QTBUG-31689
Change-Id: Ia59bfcb93362ac9343c6d30dab1091a4db482dfa
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp index 7fedc27951..b7ccb5767e 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp @@ -1586,11 +1586,14 @@ static QStringList extraTryFontsForFamily(const QString& family) break; } } - QStringList fm = QFontDatabase().families(); + QFontDatabase db; + const QStringList families = db.families(); const char **tf = tryFonts; while (tf && *tf) { - if (fm.contains(QLatin1String(*tf))) - result << QLatin1String(*tf); + // QTBUG-31689, family might be an English alias for a localized font name. + const QString family = QString::fromLatin1(*tf); + if (families.contains(family) || db.hasFamily(family)) + result << family; ++tf; } } |