From 4992a894ed3698475935f9dbe20652675087b21f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 12 Jun 2013 10:26:37 +0200 Subject: [PATCH] Fix various xhr auto-test failures In the v8 compatibility layer accessor wrappers, forward v4 exceptions instead of silently eating them. We don't use the v8 TryCatch layer anymore. Change-Id: I43596c58b6f51a481a11e33a87d5294f1336471b Reviewed-by: Lars Knoll --- src/qml/qml/v4/qv4v8.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/qml/qml/v4/qv4v8.cpp b/src/qml/qml/v4/qv4v8.cpp index 0542e1c..e9de6b4 100644 --- a/src/qml/qml/v4/qv4v8.cpp +++ b/src/qml/qml/v4/qv4v8.cpp @@ -121,12 +121,7 @@ struct V8AccessorGetter: FunctionObject { V8AccessorGetter *getter = static_cast(that); AccessorInfo info(thisObject, getter->data.value()); QV4::Value result = QV4::Value::undefinedValue(); - try { - result = getter->getter(getter->name.value(), info)->v4Value(); - } catch (QV4::Exception &e) { - e.accept(context); - } - return result; + return getter->getter(getter->name.value(), info)->v4Value(); } protected: @@ -157,11 +152,7 @@ struct V8AccessorSetter: FunctionObject { return QV4::Value::undefinedValue(); V8AccessorSetter *setter = static_cast(that); AccessorInfo info(thisObject, setter->data.value()); - try { - setter->setter(setter->name.value(), args[0], info); - } catch (QV4::Exception &e) { - e.accept(context); - } + setter->setter(setter->name.value(), args[0], info); return QV4::Value::undefinedValue(); } -- 2.7.4