summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-09 21:27:29 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-09 21:27:30 +0100
commit9bee6712fc7fd4c8083b4c2c9b1eb0c54d4725dd (patch)
tree91c2306fc1c8b90fe81f678bbf3618084641c9e3 /src/platformsupport
parent50deb8cf70f61e21fb0c35182341477af11adbc1 (diff)
parenta5ad605dfec2ab4e921d5c5843b23916ed5ae3bf (diff)
Merge remote-tracking branch 'origin/5.9' into 5.10
Diffstat (limited to 'src/platformsupport')
-rw-r--r--src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
index 237e8a89a5..7397312820 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
@@ -544,6 +544,9 @@ QStringList QCoreTextFontDatabase::fallbacksForFamily(const QString &family, QFo
fallbackList.append(QStringLiteral("Arial Unicode MS"));
#endif
+ extern QStringList qt_sort_families_by_writing_system(QChar::Script, const QStringList &);
+ fallbackList = qt_sort_families_by_writing_system(script, fallbackList);
+
return fallbackList;
}
}