diff options
| -rw-r--r-- | src/corelib/json/qjsonvalue.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/json/qjsonvalue.h | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/json/tst_qtjson.cpp | 6 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index a540626579..d0b06c6924 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -156,6 +156,18 @@ QJsonValue::QJsonValue(int n) } /*! + \overload + Creates a value of type Double, with value \a n. + NOTE: the integer limits for IEEE 754 double precision data is 2^53 (-9007199254740992 to +9007199254740992). + If you pass in values outside this range expect a loss of precision to occur. + */ +QJsonValue::QJsonValue(qint64 n) + : d(0), t(Double) +{ + this->dbl = n; +} + +/*! Creates a value of type String, with value \a s. */ QJsonValue::QJsonValue(const QString &s) diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h index b8bdf55aa3..c8efab5d5f 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/json/qjsonvalue.h @@ -79,6 +79,7 @@ public: QJsonValue(bool b); QJsonValue(double n); QJsonValue(int n); + QJsonValue(qint64 n); QJsonValue(const QString &s); QJsonValue(QLatin1String s); QJsonValue(const QJsonArray &a); diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp index bbc137d688..543226978c 100644 --- a/tests/auto/corelib/json/tst_qtjson.cpp +++ b/tests/auto/corelib/json/tst_qtjson.cpp @@ -1128,6 +1128,8 @@ void tst_QtJson::toJsonLargeNumericValues() array.append(QJsonValue(-std::numeric_limits<double>::epsilon())); array.append(QJsonValue(-std::numeric_limits<double>::denorm_min())); array.append(QJsonValue(-0.0)); + array.append(QJsonValue(9007199254740992LL)); // JS Number max integer + array.append(QJsonValue(-9007199254740992LL)); // JS Number min integer object.insert("Array", array); QByteArray json = QJsonDocument(object).toJson(); @@ -1150,7 +1152,9 @@ void tst_QtJson::toJsonLargeNumericValues() " -1.7976931348623157e+308,\n" " -2.2204460492503131e-16,\n" " -4.9406564584124654e-324,\n" - " 0\n" + " 0,\n" + " 9007199254740992,\n" + " -9007199254740992\n" " ]\n" "}\n"; |