From 6de515aea2621073325f7d7bb461af26b009d8d0 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Fri, 14 Feb 2014 09:33:21 +0100
Subject: [PATCH] Remove a not required whitespace when writing JSON in compact
 format

Task-number: QTBUG-36682

Change-Id: I0c1c0de850504c8dff20a5ae724cc868d9f983f8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/json/qjsonwriter.cpp       | 2 +-
 tests/auto/corelib/json/tst_qtjson.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/corelib/json/qjsonwriter.cpp b/src/corelib/json/qjsonwriter.cpp
index 5defd497b1..17c22429a5 100644
--- a/src/corelib/json/qjsonwriter.cpp
+++ b/src/corelib/json/qjsonwriter.cpp
@@ -195,7 +195,7 @@ static void objectContentToJson(const QJsonPrivate::Object *o, QByteArray &json,
         json += indentString;
         json += '"';
         json += escapedString(e->key());
-        json += "\": ";
+        json += compact ? "\":" : "\": ";
         valueToJson(o, e->value, json, indent, compact);
 
         if (++i == o->length) {
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index 2312922a58..aee5875613 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -1209,7 +1209,7 @@ void tst_QtJson::toJson()
 
         QByteArray json = QJsonDocument(object).toJson(QJsonDocument::Compact);
         QByteArray expected =
-                "{\"Array\": [true,999,\"string\",null,\"\\\\\\u0007\\n\\r\\b\\tabcABC\\\"\"],\"\\\\Key\\n\": \"Value\",\"null\": null}";
+                "{\"Array\":[true,999,\"string\",null,\"\\\\\\u0007\\n\\r\\b\\tabcABC\\\"\"],\"\\\\Key\\n\":\"Value\",\"null\":null}";
         QCOMPARE(json, expected);
 
         QJsonDocument doc;
@@ -2004,7 +2004,7 @@ void tst_QtJson::testDebugStream()
         qDebug() << object;
 
         object.insert(QLatin1String("foo"), QLatin1String("bar"));
-        QTest::ignoreMessage(QtDebugMsg, "QJsonObject({\"foo\": \"bar\"})");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonObject({\"foo\":\"bar\"})");
         qDebug() << object;
     }
 
@@ -2031,7 +2031,7 @@ void tst_QtJson::testDebugStream()
         QJsonObject object;
         object.insert(QLatin1String("foo"), QLatin1String("bar"));
         doc.setObject(object);
-        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument({\"foo\": \"bar\"})");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument({\"foo\":\"bar\"})");
         qDebug() << doc;
 
         QJsonArray array;
@@ -2076,7 +2076,7 @@ void tst_QtJson::testDebugStream()
         QJsonObject object;
         object.insert(QLatin1String("foo"), QLatin1String("bar"));
         value = QJsonValue(object); // object
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(object, QJsonObject({\"foo\": \"bar\"}) )");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(object, QJsonObject({\"foo\":\"bar\"}) )");
         qDebug() << value;
     }
 }