From 3904950af44b7f062cf5ea5c782d197cb9b3cd30 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 4 Feb 2016 14:37:03 +0100 Subject: [PATCH] If the font is not being found then get the English name regardless In a case of having a non English system locale, then the face and name of the font may be localized but will not match up what is in the registry. Therefore we need to try with the English name if is possible that there is one, so in the case of when registerAlias is false we should try to get the English name if necessary. Change-Id: Id1064b6f5263677320374dbddfad852f30f041c5 Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Liang Qi --- src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp index 684c44acf2..88ceb37693 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp @@ -454,6 +454,8 @@ static bool addFontToDatabase(const QString &faceName, const FontKey *key = findFontKey(faceName, &index); if (!key) { key = findFontKey(fullName, &index); + if (!key && !registerAlias && englishName.isEmpty() && localizedName(faceName)) + englishName = getEnglishName(faceName); if (!key && !englishName.isEmpty()) key = findFontKey(englishName, &index); if (!key)