From a723c7ae756ba567c2f818bb77a83c24373d3438 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Mon, 9 Sep 2013 14:33:28 +0200
Subject: Use a ReturnedValue when converting to String or Object

Also rename Value::toQString() to Value::toQStringNoThrow(),
and add a throwing toQString() method for JS use.

Change-Id: I821b33fc61abb7d08839df965fd337685f61a545
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/jsapi/qjsvalue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qml/jsapi')

diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index f18814cedf..beff645005 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -360,7 +360,7 @@ bool QJSValue::isVariant() const
 */
 QString QJSValue::toString() const
 {
-    return d->value.toQString();
+    return d->value.toQStringNoThrow();
 }
 
 /*!
-- 
cgit v1.2.3