diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-08-07 10:44:46 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-08 09:43:34 +0200 |
| commit | 68458376c0db2f786b2c9ab3b8dfd21695a5645e (patch) | |
| tree | 50388472030452f4881295ac4679b3d825573fba /src/script/api/qscriptengine_p.h | |
| parent | 79ebd39d0d4846cb911ae122d2059e5add568d7e (diff) | |
| download | qtscript-68458376c0db2f786b2c9ab3b8dfd21695a5645e.tar.gz | |
QScriptEngine::pushContext(): Don't inherit parent context's scope
This was a regression introduced in Qt 4.6 (JavaScriptCore-based
backend). pushContext() should always create a context with a "clean"
scope (only the Global Object and the context's own activation object
should be in the scope chain).
The scope chain API is internal, but the wrong behavior could still
be observed e.g. through QScriptEngine::evaluate().
Task-number: QTBUG-18188
Change-Id: I138dabc665d7275fb85d3b5e1b473d56096a989e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/script/api/qscriptengine_p.h')
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index 6c82522..09ecaf2 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -248,7 +248,7 @@ public: static JSC::Register *thisRegisterForFrame(JSC::ExecState *frame); JSC::CallFrame *pushContext(JSC::CallFrame *exec, JSC::JSValue thisObject, const JSC::ArgList& args, - JSC::JSObject *callee, bool calledAsConstructor = false, bool clearScopeChain = false); + JSC::JSObject *callee, bool calledAsConstructor = false); void popContext(); void mark(JSC::MarkStack& markStack); |