diff options
| author | Andrew Christian <andrew.christian@nokia.com> | 2012-02-17 15:38:23 -0500 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-18 18:08:06 +0100 |
| commit | 908a080006faff333b061b69b0dc0fd9cab36114 (patch) | |
| tree | 3b9a1ee39a3d44643180a74febb7dd441d56326f /src/corelib/json/qjsondocument.cpp | |
| parent | f63b23afdac47bbf71a7b72fdd965c55b2f60602 (diff) | |
Added error reporting to QJsonParser
Change-Id: Ib2390c0faf1ed7ada3fc185abce83740ad112929
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/json/qjsondocument.cpp')
| -rw-r--r-- | src/corelib/json/qjsondocument.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/json/qjsondocument.cpp b/src/corelib/json/qjsondocument.cpp index 5ae1bcbe4e..8a7fa760ae 100644 --- a/src/corelib/json/qjsondocument.cpp +++ b/src/corelib/json/qjsondocument.cpp @@ -317,10 +317,10 @@ QByteArray QJsonDocument::toJson() const \sa toJson */ -QJsonDocument QJsonDocument::fromJson(const QByteArray &json) +QJsonDocument QJsonDocument::fromJson(const QByteArray &json, QJsonParseError *error) { QJsonPrivate::Parser parser(json.constData(), json.length()); - return parser.parse(); + return parser.parse(error); } /*! |