You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.4 KiB
40 lines
1.4 KiB
--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200
|
|
+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200
|
|
@@ -966,20 +966,22 @@
|
|
|
|
#ifdef Q_WS_X11
|
|
if (script == QFont::Han) {
|
|
- // modify script according to locale
|
|
- static QFont::Script defaultHan = QFont::UnknownScript;
|
|
- if (defaultHan == QFont::UnknownScript) {
|
|
- QCString locale = setlocale(LC_ALL, NULL);
|
|
- if (locale.contains("ko"))
|
|
- defaultHan = QFont::Han_Korean;
|
|
- else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
|
|
- defaultHan = QFont::Han_TraditionalChinese;
|
|
- else if (locale.contains("zh"))
|
|
- defaultHan = QFont::Han_SimplifiedChinese;
|
|
- else
|
|
- defaultHan = QFont::Han_Japanese;
|
|
- }
|
|
- script = defaultHan;
|
|
+ // modify script according to locale
|
|
+ static QFont::Script defaultHan;
|
|
+ QCString locale = setlocale(LC_ALL, NULL);
|
|
+
|
|
+ if (locale.contains("ko"))
|
|
+ defaultHan = QFont::Han_Korean;
|
|
+ else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
|
|
+ defaultHan = QFont::Han_TraditionalChinese;
|
|
+ else if (locale.contains("zh"))
|
|
+ defaultHan = QFont::Han_SimplifiedChinese;
|
|
+ else if (locale.contains("ja"))
|
|
+ defaultHan = QFont::Han_Japanese;
|
|
+ else
|
|
+ defaultHan = QFont::Han; // don't change
|
|
+
|
|
+ script = defaultHan;
|
|
}
|
|
#endif
|
|
|