make more tests pass

2 files changed, 2 insertions, 4 deletions

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index be6cdba..16c0371 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1960,6 +1960,8 @@ int QScriptEngine::uncaughtExceptionLineNumber() const
 */
 QStringList QScriptEngine::uncaughtExceptionBacktrace() const
 {
+    if (!hasUncaughtException())
+        return QStringList();
     qWarning("QScriptEngine::uncaughtExceptionBacktrace() not implemented");
 // ### implement me
     // how do we get a bt with JSC?
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 09f0d0c..ff2823b 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1887,8 +1887,6 @@ QScriptValue QScriptValue::call(const QScriptValue &thisObject,
     } else if (callType == JSC::CallTypeHost) {
         result = callData.native.function(exec, JSC::asObject(callee), jscThisObject, jscArgs);
     }
-    if (exec->hadException())
-        result = exec->exception();
     return eng_p->scriptValueFromJSCValue(result);
 }
 
@@ -2016,8 +2014,6 @@ QScriptValue QScriptValue::construct(const QScriptValueList &args)
     } else if (constructType == JSC::ConstructTypeHost) {
         result = constructData.native.function(exec, JSC::asObject(callee), jscArgs);
     }
-    if (exec->hadException())
-        result = exec->exception();
     return eng_p->scriptValueFromJSCValue(result);
 }