2 files changed, 20 insertions, 5 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index 9f2d0c8a33..04b9530890 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -908,7 +908,7 @@ static FontNames getCanonicalFontNames(const uchar *table, quint32 bytes)
 
 } // namespace
 
-QString getEnglishName(const QString &familyName)
+QString getEnglishName(const QString &familyName, bool includeStyle = false)
 {
     QString i18n_name;
     QString faceName = familyName;
@@ -946,7 +946,12 @@ QString getEnglishName(const QString &familyName)
     if ( bytes == GDI_ERROR )
         goto error;
 
-    i18n_name = getCanonicalFontNames(table, bytes).name;
+    {
+        const FontNames names = getCanonicalFontNames(table, bytes);
+        i18n_name = names.name;
+        if (includeStyle)
+            i18n_name += QLatin1Char(' ') + names.style;
+    }
 error:
     delete [] table;
     SelectObject( hdc, oldobj );
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
index 4d8966f934..f7c8dbdf23 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
@@ -102,7 +102,7 @@ static FontFile * createFontFile(const QString &fileName, int index)
 }
 
 extern bool localizedName(const QString &name);
-extern QString getEnglishName(const QString &familyName);
+extern QString getEnglishName(const QString &familyName, bool includeStyle = false);
 
 namespace {
 struct FontKey
@@ -235,9 +235,19 @@ static bool addFontToDatabase(const QString &faceName,
     }
 
     int index = 0;
-    const FontKey *key = findFontKey(faceName, &index);
+    const FontKey *key = findFontKey(fullName, &index);
     if (!key) {
-        key = findFontKey(fullName, &index);
+        // On non-English locales, the styles of the font may be localized in enumeration, but
+        // not in the registry.
+        QLocale systemLocale = QLocale::system();
+        if (systemLocale.language() != QLocale::C
+                && systemLocale.language() != QLocale::English
+                && styleName != QLatin1String("Italic")
+                && styleName != QLatin1String("Bold")) {
+            key = findFontKey(getEnglishName(fullName, true), &index);
+        }
+        if (!key)
+            key = findFontKey(faceName, &index);
         if (!key && !registerAlias && englishName.isEmpty() && localizedName(faceName))
             englishName = getEnglishName(faceName);
         if (!key && !englishName.isEmpty())