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>
bb10
Anton Kudryavtsev 2016-10-18 14:58:37 +03:00
parent 3d76031217
commit f620ad1499
1 changed files with 2 additions and 3 deletions

View File

@ -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));