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>

4 files changed, 24 insertions, 5 deletions

diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index 32580ada7a..62b99968bc 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -101,6 +101,17 @@ Q_GUI_EXPORT void qt_registerAliasToFontFamily(const QString &familyName, const
     f->aliases.push_back(alias);
 }
 
+QString qt_resolveFontFamilyAlias(const QString &alias)
+{
+    if (!alias.isEmpty()) {
+        const QFontDatabasePrivate *d = privateDb();
+        for (int i = 0; i < d->count; ++i)
+            if (d->families[i]->matchesFamilyName(alias))
+                return d->families[i]->name;
+    }
+    return alias;
+}
+
 static QStringList fallbackFamilies(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script)
 {
     QStringList retList = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(family,style,styleHint,script);
diff --git a/src/gui/text/qplatformfontdatabase.cpp b/src/gui/text/qplatformfontdatabase.cpp
index 4e2a2df66a..4399aff9da 100644
--- a/src/gui/text/qplatformfontdatabase.cpp
+++ b/src/gui/text/qplatformfontdatabase.cpp
@@ -379,9 +379,11 @@ QFont QPlatformFontDatabase::defaultFont() const
     \since 5.0
  */
 
+QString qt_resolveFontFamilyAlias(const QString &alias);
+
 QString QPlatformFontDatabase::resolveFontFamilyAlias(const QString &family) const
 {
-    return family;
+    return qt_resolveFontFamilyAlias(family);
 }
 
 /*!
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index 1cc85bd0dc..afe634dc4b 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -768,6 +768,9 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData,
 
 QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
 {
+    QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family);
+    if (!resolved.isEmpty() && resolved != family)
+        return resolved;
     FcPattern *pattern = FcPatternCreate();
     if (!pattern)
         return family;
@@ -781,7 +784,7 @@ QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
 
     FcChar8 *familyAfterSubstitution = 0;
     FcPatternGetString(pattern, FC_FAMILY, 0, &familyAfterSubstitution);
-    QString resolved = QString::fromUtf8((const char *) familyAfterSubstitution);
+    resolved = QString::fromUtf8((const char *) familyAfterSubstitution);
     FcPatternDestroy(pattern);
 
     return resolved;
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;
         }
     }