tst_qtextscriptengine: make it compilable under MSVC2010
authorDebao Zhang <dbzhang800@gmail.com>
Wed, 6 Jun 2012 06:44:56 +0000 (23:44 -0700)
committerQt by Nokia <qt-info@nokia.com>
Tue, 26 Jun 2012 20:38:23 +0000 (22:38 +0200)
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>
tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp

index f0095c6..ae3765d 100644 (file)
@@ -1289,7 +1289,11 @@ void tst_QTextScriptEngine::thaiWithZWJ()
 #ifdef Q_OS_WIN
     QSKIP("This test currently fails on Windows - QTBUG-24565");
 #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);
     layout.setCacheEnabled(true);
     layout.beginLayout();
@@ -1334,7 +1338,7 @@ void tst_QTextScriptEngine::thaiWithZWJ()
 
 void tst_QTextScriptEngine::thaiMultipleVowels()
 {
-    QString s(QString::fromUtf8(""));
+    QString s(QString::fromUtf8("\xe0\xb8\xaa"));
     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(0x200D); // Now add a zero width joiner (which adds a circle which is hidden)