diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-12-18 12:59:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-18 16:20:28 +0100 |
| commit | 5e4cc79e0669b76f8f5bf5192a0b7001ff8f4d58 (patch) | |
| tree | e9a84aaab741650c0a2412a5fa3a4bf2a19943f9 | |
| parent | 260898f36d039dd2aaa3e627e4985d52f50ca448 (diff) | |
Fix tst_qqmllanguage for MSVC.
Do not use \u.
Task-number: QTBUG-28611
Change-Id: I85fce2f945c97421b8b35fb8276cd4ee3cc19d38
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| -rw-r--r-- | tests/auto/qml/qqmllanguage/data/literals.qml | 5 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/qml/qqmllanguage/data/literals.qml b/tests/auto/qml/qqmllanguage/data/literals.qml index 3a3e8461e4..ffef050438 100644 --- a/tests/auto/qml/qqmllanguage/data/literals.qml +++ b/tests/auto/qml/qqmllanguage/data/literals.qml @@ -18,7 +18,6 @@ QtObject { property variant c7: "\'" property variant c8: "\"" property variant c9: "\\" - property variant c10: "\251" - property variant c11: "\xA9" - property variant c12: "\u00A9" // unicode + property variant c10: "\xA9" + property variant c11: "\u00A9" // unicode } diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 6b4830f11d..3f5f5f2785 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -3065,9 +3065,8 @@ void tst_qqmllanguage::literals_data() QTest::newRow("special8") << "c8" << QVariant(QString("\"")); QTest::newRow("special9") << "c9" << QVariant(QString("\\")); // We don't handle octal escape sequences -// QTest::newRow("special10") << "c10" << QVariant(QString("\251")); - QTest::newRow("special11") << "c11" << QVariant(QString::fromLatin1("\xa9")); - QTest::newRow("special12") << "c12" << QVariant(QString::fromUtf8("\u00A9")); + QTest::newRow("special11") << "c10" << QVariant(QString(1, QChar(0xa9))); + QTest::newRow("special12") << "c11" << QVariant(QString(1, QChar(0x00A9))); } void tst_qqmllanguage::literals() |