Merge remote-tracking branch 'origin/4.0'

Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa

1 files changed, 39 insertions, 0 deletions

diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 8d93f50e3b4..fff61bb3535 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -185,6 +185,9 @@ void dummyStatement(...) {}
 #include <QXmlAttributes>
 
 #include <QHostAddress>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonValue>
 #include <QNetworkRequest>
 
 #include <array>
@@ -6014,6 +6017,41 @@ namespace qscript {
 } // namespace script
 
 
+namespace qjson {
+
+    void testQJson()
+    {
+        QJsonObject obj {
+            {"-1", -1},
+            {"3", 3},
+            {"0x3fffff (4194303)", 4194303},
+            {"0x400000 (4194304)", 4194304},
+            {"0x800000 (8388608)", 8388608},
+            {"0x1000000 (16777216)", 16777216},
+            {"-0x3fffff (-4194303)", -4194303},
+            {"-0x400000 (-4194304)", -4194304},
+            {"-0x800000 (-8388608)", -8388608}
+        };
+         QJsonArray arr;
+         for (unsigned int i = 0; i < 32; ++i) {
+             arr.append(QJsonValue(qint64(1u << i) - 1));
+             arr.append(QJsonValue(qint64(1u << i)));
+             arr.append(QJsonValue(qint64(1u << i) + 1));
+         }
+         for (unsigned int i = 0; i < 32; ++i) {
+             arr.append(QJsonValue(-qint64(1u << i) + 1));
+             arr.append(QJsonValue(-qint64(1u << i)));
+             arr.append(QJsonValue(-qint64(1u << i) - 1));
+         }
+        BREAK_HERE;
+        // Check v -1 QJsonValue.
+        // Check obj "foo" -1 QJsonValue.
+        // Continue.
+    }
+
+} // namespace json
+
+
 namespace webkit {
 
     void testWTFString()
@@ -7187,6 +7225,7 @@ int main(int argc, char *argv[])
     qregexp::testQRegExp();
     qregion::testQRegion();
     qscript::testQScript();
+    qjson::testQJson();
     qset::testQSet();
     qsharedpointer::testQSharedPointer();
     qstack::testQStack();