diff options
| author | albator <albator@arcadia.vtf> | 2011-09-11 10:36:04 +0200 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-09-11 10:36:04 +0200 |
| commit | 61ee6f2a0fc6bce6878b11ef12abe2f1039409bb (patch) | |
| tree | 09b24caafe596742b9b197a4a4287bc9649ec442 /arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff | |
| parent | 74a4ecd04931504e3c42aa2c79381e2b3edf8c36 (diff) | |
| parent | d9301c40726753022b70cf647f716a71b62f0196 (diff) | |
| download | tde-packaging-61ee6f2a0fc6bce6878b11ef12abe2f1039409bb.tar.gz tde-packaging-61ee6f2a0fc6bce6878b11ef12abe2f1039409bb.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff')
| -rw-r--r-- | arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff b/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff new file mode 100644 index 000000000..7c25eef7d --- /dev/null +++ b/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff @@ -0,0 +1,39 @@ +--- 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 + |