summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorMarko Kenttala <ext-marko.r.kenttala@nokia.com>2012-02-08 13:35:47 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-02-08 15:49:13 (GMT)
commit0983a18a29903ecac6dc870ffbde519db1b65e20 (patch)
treea6d3dd603276c13392882ae7c35d215af3b132be /src/gui/text
parentfd97c5a83f2baf9186fea39f000492099cba7644 (diff)
downloadQt-0983a18a29903ecac6dc870ffbde519db1b65e20.zip
Qt-0983a18a29903ecac6dc870ffbde519db1b65e20.tar.gz
Qt-0983a18a29903ecac6dc870ffbde519db1b65e20.tar.bz2
Fix Qt to use font with simplified chinese characters as default if needed
Qt defaulted to use a font with traditional chinese characters even if system language was set as ELangPrcChinese. Fixed qfont_s60 to use a font with simplified chinese characters in this case. Task-Number: ou1cimx1#915614 Change-Id: I0258a95f6630b4fa07acc9340bb38fc67bea7b1d Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfont_s60.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp
index de7316b..3bb8a42 100644
--- a/src/gui/text/qfont_s60.cpp
+++ b/src/gui/text/qfont_s60.cpp
@@ -62,6 +62,14 @@ static QString classicalSymbianSystemFont()
{
static QString font;
if (font.isEmpty()) {
+ if (User::Language() == ELangPrcChinese) {
+ // Use font with simplified Chinese characters as default
+ QString scfont("MHeiM-C-GB18030-S60");
+ if (fontFamiliesOnFontServer()->contains(scfont)) {
+ font = scfont;
+ return font;
+ }
+ }
static const char* const classicSymbianSystemFonts[] = { "Nokia Sans S60", "Series 60 Sans" };
for (int i = 0; i < sizeof classicSymbianSystemFonts / sizeof classicSymbianSystemFonts[0]; ++i) {
const QString classicFont = QLatin1String(classicSymbianSystemFonts[i]);