Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
0ca2b761c6
1 changed files with 0 additions and 11 deletions
|
|
@ -261,17 +261,6 @@ void StartFonts() {
|
||||||
}
|
}
|
||||||
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
|
#endif // !DESKTOP_APP_USE_PACKAGED_FONTS
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
auto list = QStringList();
|
|
||||||
list.append("Microsoft YaHei");
|
|
||||||
list.append("Microsoft JhengHei UI");
|
|
||||||
list.append("Yu Gothic UI");
|
|
||||||
list.append("\xEB\xA7\x91\xEC\x9D\x80 \xEA\xB3\xA0\xEB\x94\x95");
|
|
||||||
for (const auto &name : FontTypeNames) {
|
|
||||||
QFont::insertSubstitutions(name, list);
|
|
||||||
}
|
|
||||||
#endif // Q_OS_WIN
|
|
||||||
|
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
auto list = QStringList();
|
auto list = QStringList();
|
||||||
list.append("STIXGeneral");
|
list.append("STIXGeneral");
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue