From 573f87d81363a303b7005f999a283db624201db8 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 10 Nov 2015 15:41:01 +0100 Subject: Use "shortest" double conversion for JSON Task-number: QTBUG-42419 Change-Id: I649c4de96a2e41078e139c0f382e5a6cf96d3bb9 Reviewed-by: Lars Knoll --- src/corelib/json/qjsonwriter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib/json') diff --git a/src/corelib/json/qjsonwriter.cpp b/src/corelib/json/qjsonwriter.cpp index 45a05e93a3..0ab8b2bb80 100644 --- a/src/corelib/json/qjsonwriter.cpp +++ b/src/corelib/json/qjsonwriter.cpp @@ -32,6 +32,7 @@ ** ****************************************************************************/ +#include #include "qjsonwriter_p.h" #include "qjson_p.h" #include "private/qutfcodec_p.h" @@ -123,7 +124,7 @@ static void valueToJson(const QJsonPrivate::Base *b, const QJsonPrivate::Value & case QJsonValue::Double: { const double d = v.toDouble(b); if (qIsFinite(d)) // +2 to format to ensure the expected precision - json += QByteArray::number(d, 'g', std::numeric_limits::digits10 + 2); // ::digits10 is 15 + json += QByteArray::number(d, 'g', QLocale::FloatingPointShortest); else json += "null"; // +INF || -INF || NaN (see RFC4627#section2.4) break; -- cgit v1.2.3