diff options
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase.cpp')
-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; } } |