1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_qtextscriptengine: make it compilable under MSVC2010

Browse Source 
Source files which contain UTF-8 literals can not be compiled
by MSVC with Chinese/Japanese locale.

Change-Id: I5daa2e45c5e1ceb86da91e72288c24018c49c0f6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
This commit is contained in:
Debao Zhang 2012-06-05 23:44:56 -07:00 committed by Qt by Nokia
parent 5211f45d58
commit 744a31fe2a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
View File

@ -1289,7 +1289,11 @@ void tst_QTextScriptEngine::thaiWithZWJ()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QSKIP("This test currently fails on Windows - QTBUG-24565"); QSKIP("This test currently fails on Windows - QTBUG-24565");
#endif #endif
QString s(QString::fromUtf8("ร‍ร‌.ร.“ร…ร”ร\xA0ร本ร") + QChar(0x0363)/*superscript 'a', for testing Inherited class*/); QString s(QString::fromUtf8("\xe0\xb8\xa3\xe2\x80\x8d\xe0\xb8\xa3\xe2\x80"
"\x8c\x2e\xe0\xb8\xa3\x2e\xe2\x80\x9c\xe0\xb8"
"\xa3\xe2\x80\xa6\xe0\xb8\xa3\xe2\x80\x9d\xe0"
"\xb8\xa3\xa0\xe0\xb8\xa3\xe6\x9c\xac\xe0\xb8\xa3")
+ QChar(0x0363)/*superscript 'a', for testing Inherited class*/);
QTextLayout layout(s); QTextLayout layout(s);
layout.setCacheEnabled(true); layout.setCacheEnabled(true);
layout.beginLayout(); layout.beginLayout();
@ -1334,7 +1338,7 @@ void tst_QTextScriptEngine::thaiWithZWJ()
void tst_QTextScriptEngine::thaiMultipleVowels() void tst_QTextScriptEngine::thaiMultipleVowels()
{ {
QString s(QString::fromUtf8("ส")); QString s(QString::fromUtf8("\xe0\xb8\xaa"));
for (int i = 0; i < 100; i++) for (int i = 0; i < 100; i++)
s += QChar(0x0E47); // Add lots of "VOWEL SIGN MAI TAI KHU N/S-T" stacked on top of the character s += QChar(0x0E47); // Add lots of "VOWEL SIGN MAI TAI KHU N/S-T" stacked on top of the character
s += QChar(0x200D); // Now add a zero width joiner (which adds a circle which is hidden) s += QChar(0x200D); // Now add a zero width joiner (which adds a circle which is hidden)