diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-08 00:14:12 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-08 00:14:12 (GMT) |
| commit | f6c08f5e68c90338a8402c0912cd6be72e84b1e6 (patch) | |
| tree | d928f975e686b752cd1fc47eca812f376d9d0a03 /src/script | |
| parent | 276a44c0867a76a90b425baa8dcbda733d25b3fb (diff) | |
| parent | 0cbbc9cb9e87a3a39ee1597f4cea1c2b77d8f8da (diff) | |
| download | Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.zip Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.tar.gz Qt-f6c08f5e68c90338a8402c0912cd6be72e84b1e6.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptengineagent.cpp | 4 | ||||
| -rw-r--r-- | src/script/bridge/qscriptqobject.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/script/api/qscriptengineagent.cpp b/src/script/api/qscriptengineagent.cpp index 333a415..13bc6a6 100644 --- a/src/script/api/qscriptengineagent.cpp +++ b/src/script/api/qscriptengineagent.cpp @@ -146,11 +146,7 @@ void QScriptEngineAgentPrivate::returnEvent(const JSC::DebuggerCallFrame& frame, { Q_UNUSED(frame); Q_UNUSED(lineno); -#if ENABLE(JIT) - functionExit(JSC::JSValue(), sourceID); -#else Q_UNUSED(sourceID); -#endif } void QScriptEngineAgentPrivate::exceptionThrow(const JSC::DebuggerCallFrame& frame, intptr_t sourceID, bool hasHandler) diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp index bd5d161..ecfb060 100644 --- a/src/script/bridge/qscriptqobject.cpp +++ b/src/script/bridge/qscriptqobject.cpp @@ -610,7 +610,7 @@ static JSC::JSValue callQtMethod(JSC::ExecState *exec, QMetaMethod::MethodType c if (i < (int)scriptArgs.size()) actual = engine->scriptValueFromJSCValue(scriptArgs.at(i)); else - actual = QScriptValue::QScriptValue(QScriptValue::UndefinedValue); + actual = QScriptValue(QScriptValue::UndefinedValue); QScriptMetaType argType = mtd.argumentType(i); int tid = -1; QVariant v; |