diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-06-01 17:40:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-06-01 17:40:53 (GMT) |
| commit | 5c6e671c8cbab281af4685d3698790ab566ed2f2 (patch) | |
| tree | 0f3e15d12cf984d8f49c7adfaf056063cc726803 /src/script | |
| parent | 7165826d2e9ff77951a289c62746d6c87f725139 (diff) | |
| parent | 0b034e816994f3c6ad5ba5e0e9f7c0c60ab9440d (diff) | |
| download | Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.zip Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.gz Qt-5c6e671c8cbab281af4685d3698790ab566ed2f2.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/qscriptcontext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp index 639af80..3f08e74 100644 --- a/src/script/api/qscriptcontext.cpp +++ b/src/script/api/qscriptcontext.cpp @@ -742,6 +742,7 @@ void QScriptContext::pushScope(const QScriptValue &object) */ QScriptValue QScriptContext::popScope() { + activationObject(); //ensure the creation of the normal scope for native context JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this); JSC::ScopeChainNode *scope = frame->scopeChain(); Q_ASSERT(scope != 0); |