summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengineagent.cpp
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-09-07 09:55:37 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-09-07 09:55:37 (GMT)
commitf27ed1a26d0b68594f13f79be4806b40e489ce14 (patch)
tree1c58a8a813c9f398a36098b6517eadbe2f47498c /src/script/api/qscriptengineagent.cpp
parent1cac9a68bab207cab3fd3790baec4569a0acd385 (diff)
parent6b7330ee075a62138f005492a6448059106554af (diff)
downloadQt-f27ed1a26d0b68594f13f79be4806b40e489ce14.zip
Qt-f27ed1a26d0b68594f13f79be4806b40e489ce14.tar.gz
Qt-f27ed1a26d0b68594f13f79be4806b40e489ce14.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengineagent.cpp')
-rw-r--r--src/script/api/qscriptengineagent.cpp4
1 files changed, 0 insertions, 4 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)