Merge remote-tracking branch 'origin/master' into api_changes

Change-Id: I89dc2e193bd01624c1fb50484610d516e39b1538

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index f5b4f17732..f35831c900 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -115,6 +115,8 @@ private Q_SLOTS:
     void testCompaction();
     void testDebugStream();
     void testCompactionError();
+
+    void parseUnicodeEscapes();
 private:
     QString testDataDir;
 };
@@ -1758,5 +1760,19 @@ void TestQtJson::testCompactionError()
     }
 }
 
+void TestQtJson::parseUnicodeEscapes()
+{
+    const QByteArray json = "[ \"A\\u00e4\\u00C4\" ]";
+
+    QJsonDocument doc = QJsonDocument::fromJson(json);
+    QJsonArray array = doc.array();
+
+    QString result = QLatin1String("A");
+    result += QChar(0xe4);
+    result += QChar(0xc4);
+
+    QCOMPARE(array.first().toString(), result);
+}
+
 QTEST_MAIN(TestQtJson)
 #include "tst_qtjson.moc"