summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsondocument.cpp
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-10-18 14:58:37 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-10-18 17:42:27 +0000
commitf620ad1499c815da2e779cb1cbdd9758fb207c59 (patch)
tree9d1a43cc049dc4c4ddf75c4e96ba9abd49b8d836 /src/corelib/json/qjsondocument.cpp
parent3d760312175279cbeefcfc6b26ef12ba940d5f2a (diff)
QJsonDocument: enable NRVO for gcc in toJson()
Change-Id: I1b639272d38f8463b17a85a406addb74bb572756 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/json/qjsondocument.cpp')
-rw-r--r--src/corelib/json/qjsondocument.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp
index 630f61a1b0..8927f1330b 100644
--- a/src/corelib/json/qjsondocument.cpp
+++ b/src/corelib/json/qjsondocument.cpp
@@ -351,10 +351,9 @@ QByteArray QJsonDocument::toJson() const
#ifndef QT_JSON_READONLY
QByteArray QJsonDocument::toJson(JsonFormat format) const
{
- if (!d)
- return QByteArray();
-
QByteArray json;
+ if (!d)
+ return json;
if (d->header->root()->isArray())
QJsonPrivate::Writer::arrayToJson(static_cast<QJsonPrivate::Array *>(d->header->root()), json, 0, (format == Compact));