summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraavit <qt_aavit@ovi.com>2012-03-19 13:46:47 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-20 11:44:09 +0100
commit6c98fd2e6ce572e66f38ef1857250347f137eda6 (patch)
tree990aa933baadfa2dfa6962f05ccb9affb39818c9 /tests
parent9f4d567f4357392f1a7cfdb7408dec2fc2793b41 (diff)
Fix raster autotest: consistently assume scripts in UTF8, not latin1
The Lancelot raster painting autotest assumed latin1 encoding of the QPS scripts files, while the script engine would import subscripts as UTF8. This fix standardizes on UTF8. Change-Id: I9e7c1ee7b6ffe77ff68edc8423f00dfb9ab3e95b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/other/lancelot/scripts/paths.qps2
-rw-r--r--tests/auto/other/lancelot/tst_lancelot.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/other/lancelot/scripts/paths.qps b/tests/auto/other/lancelot/scripts/paths.qps
index 083026ee17..555390de45 100644
--- a/tests/auto/other/lancelot/scripts/paths.qps
+++ b/tests/auto/other/lancelot/scripts/paths.qps
@@ -10,7 +10,7 @@ path_lineTo star 0 20
path_lineTo star 80 100
setFont "times" 50
-path_addText text 0 50 "ABCD, 1234, abcd, #¤%&"
+path_addText text 0 50 "ABCD, 1234, abcd, #¤%&"
path_addRect rectncircle 0 0 75 75
path_addEllipse rectncircle 25 25 75 75
diff --git a/tests/auto/other/lancelot/tst_lancelot.cpp b/tests/auto/other/lancelot/tst_lancelot.cpp
index 05623f9f5c..4bb0bae243 100644
--- a/tests/auto/other/lancelot/tst_lancelot.cpp
+++ b/tests/auto/other/lancelot/tst_lancelot.cpp
@@ -125,7 +125,7 @@ void tst_Lancelot::initTestCase()
QFile file(scriptsDir + fileName);
file.open(QFile::ReadOnly);
QByteArray cont = file.readAll();
- scripts.insert(fileName, QString::fromLatin1(cont).split(QLatin1Char('\n'), QString::SkipEmptyParts));
+ scripts.insert(fileName, QString::fromUtf8(cont).split(QLatin1Char('\n'), QString::SkipEmptyParts));
it->itemName = fileName;
it->itemChecksum = qChecksum(cont.constData(), cont.size());
it++;