diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
| commit | c006edf9b186c4a8a56e888e8f5d1b692e29f1d8 (patch) | |
| tree | e105f4e2389cd17a5392478160d37230f4118960 /src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp | |
| parent | fd5e86e65adfdecd7bf8a49764d9c9410d877e44 (diff) | |
| parent | 2d003378ff5e7621d5dcc810408039cfe13a8c0a (diff) | |
| download | Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.zip Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.gz Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Conflicts:
src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp b/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp index db02329..902a802 100644 --- a/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/debugger/Debugger.cpp @@ -100,12 +100,12 @@ JSValue evaluateInGlobalCallFrame(const UString& script, JSValue& exception, JSG { CallFrame* globalCallFrame = globalObject->globalExec(); - EvalExecutable eval(globalCallFrame, makeSource(script)); - JSObject* error = eval.compile(globalCallFrame, globalCallFrame->scopeChain()); + RefPtr<EvalExecutable> eval = EvalExecutable::create(globalCallFrame, makeSource(script)); + JSObject* error = eval->compile(globalCallFrame, globalCallFrame->scopeChain()); if (error) return error; - return globalObject->globalData()->interpreter->execute(&eval, globalCallFrame, globalObject, globalCallFrame->scopeChain(), &exception); + return globalObject->globalData()->interpreter->execute(eval.get(), globalCallFrame, globalObject, globalCallFrame->scopeChain(), &exception); } } // namespace JSC |