diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-31 01:58:08 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-31 01:58:08 (GMT) |
| commit | 9c5cea7d447019dcc5bad19ea3c27a358cccb2ed (patch) | |
| tree | b10e3a9a0e9d005a31b20fe011a11eace86b4c7f /src/script/api/qscriptcontext.cpp | |
| parent | 7184c41453c64f177f337b173f4ca82afead731d (diff) | |
| parent | 1e60f5fb1c1ad9289247ef3bc47a94434b27dbea (diff) | |
| download | Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.zip Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.tar.gz Qt-9c5cea7d447019dcc5bad19ea3c27a358cccb2ed.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/script/api/qscriptcontext.cpp')
| -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); |