QJSValue::property should return the exception if one was thrown

Change-Id: If87af8b6562d97a490950212a455ee46631d18f6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/qml/qml/v8/qjsvalue.cpp b/src/qml/qml/v8/qjsvalue.cpp
index d483076..e0a72ad 100644 (file)
--- 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());
     }
 }