From ef285b45aa378a054488529fad7d035f4ec65cb7 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 7 Jun 2013 14:34:41 +0200 Subject: [PATCH] QJSValue::property should return the exception if one was thrown Change-Id: If87af8b6562d97a490950212a455ee46631d18f6 Reviewed-by: Simon Hausmann --- src/qml/qml/v8/qjsvalue.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp index d483076..e0a72ad 100644 --- a/src/qml/qml/v8/qjsvalue.cpp +++ b/src/qml/qml/v8/qjsvalue.cpp @@ -771,7 +771,7 @@ QJSValue QJSValue::property(const QString& name) const return new QJSValuePrivate(engine, v); } catch (QV4::Exception &e) { e.accept(ctx); - return QJSValue(); + return new QJSValuePrivate(engine, e.value()); } } @@ -800,7 +800,7 @@ QJSValue QJSValue::property(quint32 arrayIndex) const return new QJSValuePrivate(engine, v); } catch (QV4::Exception &e) { e.accept(ctx); - return QJSValue(); + return new QJSValuePrivate(engine, e.value()); } } -- 2.7.4