Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
index ad75a0bd54..795554698c 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
@@ -661,9 +661,7 @@ QFontEngine *QWindowsFontDatabaseFT::fontEngine(const QByteArray &fontData, qrea
 
 QStringList QWindowsFontDatabaseFT::fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const
 {
-    QStringList result = QPlatformFontDatabase::fallbacksForFamily(family, style, styleHint, script);
-    if (!result.isEmpty())
-        return result;
+    QStringList result;
 
     result.append(QWindowsFontDatabase::familyForStyleHint(styleHint));
 
@@ -679,6 +677,8 @@ QStringList QWindowsFontDatabaseFT::fallbacksForFamily(const QString &family, QF
 
     result.append(QWindowsFontDatabase::extraTryFontsForFamily(family));
 
+    result.append(QPlatformFontDatabase::fallbacksForFamily(family, style, styleHint, script));
+
     qCDebug(lcQpaFonts) << __FUNCTION__ << family << style << styleHint
         << script << result;