whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compile fix: parse under C++11 

See d94ab97b77 for details.

Change-Id: Ifc015be6575bd8f469f257d71fbbf79e07226729
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
bb10
Marc Mutz 2012-02-23 12:24:49 +01:00 committed by Qt by Nokia
parent 88016d30a0
commit 77772f21de
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/json/tst_qtjson.cpp
View File

@ -1208,7 +1208,7 @@ void TestQtJson::fromJsonErrors()
}
{
QJsonParseError error;
QByteArray json = "[\n \"foo"INVALID_UNICODE"bar\"]";
QByteArray json = "[\n \"foo" INVALID_UNICODE "bar\"]";
QJsonDocument doc = QJsonDocument::fromJson(json, &error);
QVERIFY(doc.isEmpty());
QCOMPARE(error.error, QJsonParseError::StringUTF8Scan);
@ -1224,7 +1224,7 @@ void TestQtJson::fromJsonErrors()
}
{
QJsonParseError error;
QByteArray json = "[\n \"c"UNICODE_DJE"a\\u12\"]";
QByteArray json = "[\n \"c" UNICODE_DJE "a\\u12\"]";
QJsonDocument doc = QJsonDocument::fromJson(json, &error);
QVERIFY(doc.isEmpty());
QCOMPARE(error.error, QJsonParseError::StringEscapeSequence);
@ -1232,7 +1232,7 @@ void TestQtJson::fromJsonErrors()
}
{
QJsonParseError error;
QByteArray json = "[\n \"c"UNICODE_DJE"a"INVALID_UNICODE"bar\"]";
QByteArray json = "[\n \"c" UNICODE_DJE "a" INVALID_UNICODE "bar\"]";
QJsonDocument doc = QJsonDocument::fromJson(json, &error);
QVERIFY(doc.isEmpty());
QCOMPARE(error.error, QJsonParseError::StringUTF8Scan);
@ -1240,7 +1240,7 @@ void TestQtJson::fromJsonErrors()
}
{
QJsonParseError error;
QByteArray json = "[\n \"c"UNICODE_DJE"a ]";
QByteArray json = "[\n \"c" UNICODE_DJE "a ]";
QJsonDocument doc = QJsonDocument::fromJson(json, &error);
QVERIFY(doc.isEmpty());
QCOMPARE(error.error, QJsonParseError::EndOfString);
@ -1381,7 +1381,7 @@ void TestQtJson::parseStrings()
"abc\\rabc",
"abc\\tabc",
"abc\\u0019abc",
"abc"UNICODE_DJE"abc",
"abc" UNICODE_DJE "abc",
};
int size = sizeof(strings)/sizeof(const char *);
@ -1407,7 +1407,7 @@ void TestQtJson::parseStrings()
};
Pairs pairs [] = {
{ "abc\\/abc", "abc/abc" },
{ "abc\\u0402abc", "abc"UNICODE_DJE"abc" },
{ "abc\\u0402abc", "abc" UNICODE_DJE "abc" },
{ "abc\\u0065abc", "abceabc" }
};
size = sizeof(pairs)/sizeof(Pairs);