summaryrefslogtreecommitdiffstats
path: root/src/script/api/qscriptengine.cpp
diff options
context:
space:
mode:
authorKent Hansen <khansen@trolltech.com>2009-10-05 11:47:52 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-10-06 02:51:39 (GMT)
commit52d7cc6ececeda3c264ab0a6294aa5000365dec0 (patch)
treeb1aa6ab9b27592e8ff24b77ddf59bf64a193407b /src/script/api/qscriptengine.cpp
parentf22ba0345f04860f7ca936cc413bccdc77379b23 (diff)
downloadQt-52d7cc6ececeda3c264ab0a6294aa5000365dec0.zip
Qt-52d7cc6ececeda3c264ab0a6294aa5000365dec0.tar.gz
Qt-52d7cc6ececeda3c264ab0a6294aa5000365dec0.tar.bz2
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-05102009 ( 38c2b17366f24220d9ae0456a7cfe2ac78a9f91c )
Adapt src/script to src/3rdparty/javascriptcore changes (cherry picked from commit 502c7d324141fb48a902ef475b4fd2932dc859c5)
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
-rw-r--r--src/script/api/qscriptengine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index fb14940..09042e1 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2168,7 +2168,7 @@ QScriptValue QScriptEngine::evaluate(const QString &program, const QString &file
exec->clearException();
JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject());
- JSC::EvalExecutable executable(source);
+ JSC::EvalExecutable executable(exec, source);
JSC::JSObject* error = executable.compile(exec, exec->scopeChain());
if (error) {
exec->setException(error);