summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2012-11-01 12:42:42 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-01 19:47:28 (GMT)
commit58c69289f2800ee9fbd3964b25f3b6cd0e103c6a (patch)
tree71f398e352fa50f60910df99a35e783f27b7f065 /src/gui/text
parent3de5c8c3c3a1d22a565b2fefd0c11cd71df2bbf1 (diff)
downloadQt-58c69289f2800ee9fbd3964b25f3b6cd0e103c6a.zip
Qt-58c69289f2800ee9fbd3964b25f3b6cd0e103c6a.tar.gz
Qt-58c69289f2800ee9fbd3964b25f3b6cd0e103c6a.tar.bz2
Mac: Correct writingSystem check value for Chinese
For simplified and traditional Chinese. Based on the Apple doc: Internationalization Programming Topics - Language and Locale Designations. (backport of commit edfb24009cf22a0f0277be5d595b48ef9af9c3bf from qt5/qtbase) Task-number: QTBUG-27130 Change-Id: I08969bfba17b6a2589dca5da83b668bb2d8f3e31 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase_mac.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp
index e247521..4e56138 100644
--- a/src/gui/text/qfontdatabase_mac.cpp
+++ b/src/gui/text/qfontdatabase_mac.cpp
@@ -113,8 +113,8 @@ static const char *languageForWritingSystem[] = {
"my", // Myanmar
"ka", // Georgian
"km", // Khmer
- "zh-cn", // SimplifiedChinese
- "zh-tw", // TraditionalChinese
+ "zh-Hans", // SimplifiedChinese
+ "zh-Hant", // TraditionalChinese
"ja", // Japanese
"ko", // Korean
"vi", // Vietnamese