AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix raster autotest: consistently assume scripts in UTF8, not latin1

Browse Source 
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>
This commit is contained in:
aavit 2012-03-19 13:46:47 +01:00 committed by Qt by Nokia
parent 9f4d567f43
commit 6c98fd2e6c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/other/lancelot/scripts/paths.qps
View File

@ -10,7 +10,7 @@ path_lineTo star 0 20
path_lineTo star 80 100 path_lineTo star 80 100
setFont "times" 50 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_addRect rectncircle 0 0 75 75
path_addEllipse rectncircle 25 25 75 75 path_addEllipse rectncircle 25 25 75 75

2
tests/auto/other/lancelot/tst_lancelot.cpp
View File

@ -125,7 +125,7 @@ void tst_Lancelot::initTestCase()
QFile file(scriptsDir + fileName); QFile file(scriptsDir + fileName);
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QByteArray cont = file.readAll(); 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->itemName = fileName;
it->itemChecksum = qChecksum(cont.constData(), cont.size()); it->itemChecksum = qChecksum(cont.constData(), cont.size());
it++; it++;