Merge remote-tracking branch 'origin/5.8' into 5.9

Change-Id: Icdd71e9713725bda9c305e338f5c8b41a92ed8e8

1 files changed, 29 insertions, 0 deletions

diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 6aa5165e24..b215364f0e 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -32,6 +32,7 @@
 #include "qjsonobject.h"
 #include "qjsonvalue.h"
 #include "qjsondocument.h"
+#include "qregularexpression.h"
 #include <limits>
 
 #define INVALID_UNICODE "\xCE\xBA\xE1"
@@ -49,6 +50,7 @@ private Q_SLOTS:
     void testNumbers();
     void testNumbers_2();
     void testNumbers_3();
+    void testNumbers_4();
 
     void testObjectSimple();
     void testObjectSmallKeys();
@@ -375,6 +377,33 @@ void tst_QtJson::testNumbers_3()
     QVERIFY(d1_1 != d2_1);
 }
 
+void tst_QtJson::testNumbers_4()
+{
+    // no exponent notation used to print numbers between -2^64 and 2^64
+    QJsonArray array;
+    array << QJsonValue(+1000000000000000.0);
+    array << QJsonValue(-1000000000000000.0);
+    array << QJsonValue(+9007199254740992.0);
+    array << QJsonValue(-9007199254740992.0);
+    array << QJsonValue(+9223372036854775808.0);
+    array << QJsonValue(-9223372036854775808.0);
+    array << QJsonValue(+18446744073709551616.0);
+    array << QJsonValue(-18446744073709551616.0);
+    const QByteArray json(QJsonDocument(array).toJson());
+    const QByteArray expected =
+            "[\n"
+            "    1000000000000000,\n"
+            "    -1000000000000000,\n"
+            "    9007199254740992,\n"
+            "    -9007199254740992,\n"
+            "    9223372036854776000,\n"
+            "    -9223372036854776000,\n"
+            "    18446744073709552000,\n"
+            "    -18446744073709552000\n"
+            "]\n";
+    QCOMPARE(json, expected);
+}
+
 void tst_QtJson::testObjectSimple()
 {
     QJsonObject object;