summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-24 16:33:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-24 16:33:33 (GMT)
commit1b301d60ae7ad6c9fbbb04d7dbb80217c61d6cc2 (patch)
tree740b6987d701e59d160fc15dbaa45af542bbc3b1
parenta6023cc80d3d10b186717d5e896a0bf4e2e6251a (diff)
parent7a5960b2991e9ac33bec0bb359ba825d0c4889af (diff)
downloadQt-1b301d60ae7ad6c9fbbb04d7dbb80217c61d6cc2.zip
Qt-1b301d60ae7ad6c9fbbb04d7dbb80217c61d6cc2.tar.gz
Qt-1b301d60ae7ad6c9fbbb04d7dbb80217c61d6cc2.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed UTF-8 application names in device application menu in Symbian
-rw-r--r--qmake/generators/symbian/symbiancommon.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index 1f4a852..2270c2e 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -629,6 +629,7 @@ void SymbianCommonGenerator::writeRssFile(QString &numberOfIcons, QString &iconF
t << "// * user." << endl;
t << "// ============================================================================" << endl;
t << endl;
+ t << "CHARACTER_SET UTF8" << endl;
t << "#include <appinfo.rh>" << endl;
t << "#include \"" << fixedTarget << ".loc\"" << endl;
t << endl;