From bacc47f5a42f7da05ead35c4c4f2adf427ced786 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 23 Apr 2012 16:46:20 +0200 Subject: [PATCH] Mark all Latin 1 strings with QString::fromLatin1 or QLatin1String This is in preparation of QString's constructor using UTF-8 by default Change-Id: Ibd0a585342af572e3f74636deb97c1b6b3afeb9a Reviewed-by: Rohan McGovern Reviewed-by: Matthew Vogt Reviewed-by: Jason McDonald --- tests/auto/qml/qqmllocale/tst_qqmllocale.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp index 46435fb..e745702 100644 --- a/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp +++ b/tests/auto/qml/qqmllocale/tst_qqmllocale.cpp @@ -1188,14 +1188,14 @@ void tst_qqmllocale::stringLocaleCompare_data() // Copied from QString::localeAwareCompare tests // We don't actually change locale - we just care that String.localeCompare() // matches QString::localeAwareCompare(); - QTest::newRow("swedish1") << QString("\xe5") << QString("\xe4"); - QTest::newRow("swedish2") << QString("\xe4") << QString("\xf6"); - QTest::newRow("swedish3") << QString("\xe5") << QString("\xf6"); - QTest::newRow("swedish4") << QString("z") << QString("\xe5"); - - QTest::newRow("german1") << QString("z") << QString("\xe4"); - QTest::newRow("german2") << QString("\xe4") << QString("\xf6"); - QTest::newRow("german3") << QString("z") << QString("\xf6"); + QTest::newRow("swedish1") << QString::fromLatin1("\xe5") << QString::fromLatin1("\xe4"); + QTest::newRow("swedish2") << QString::fromLatin1("\xe4") << QString::fromLatin1("\xf6"); + QTest::newRow("swedish3") << QString::fromLatin1("\xe5") << QString::fromLatin1("\xf6"); + QTest::newRow("swedish4") << QString::fromLatin1("z") << QString::fromLatin1("\xe5"); + + QTest::newRow("german1") << QString::fromLatin1("z") << QString::fromLatin1("\xe4"); + QTest::newRow("german2") << QString::fromLatin1("\xe4") << QString::fromLatin1("\xf6"); + QTest::newRow("german3") << QString::fromLatin1("z") << QString::fromLatin1("\xf6"); } void tst_qqmllocale::stringLocaleCompare() -- 2.7.4