From 908a080006faff333b061b69b0dc0fd9cab36114 Mon Sep 17 00:00:00 2001
From: Andrew Christian <andrew.christian@nokia.com>
Date: Fri, 17 Feb 2012 15:38:23 -0500
Subject: Added error reporting to QJsonParser

Change-Id: Ib2390c0faf1ed7ada3fc185abce83740ad112929
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/corelib/json/qjsondocument.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/json/qjsondocument.cpp')

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);
 }
 
 /*!
-- 
cgit v1.2.3