diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-31 05:23:40 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-31 05:23:40 (GMT) |
| commit | f587dfeaa9d369235d347af3d14339054ee59908 (patch) | |
| tree | 3ac92f6a08d871099d8808e8d5fc59f50863bacb /src/script | |
| parent | feb9949a11abbf244e0bfcdc128981596758de40 (diff) | |
| parent | 9da305aedfaa5da5a3059c99ac5a5389dab42b10 (diff) | |
| download | Qt-f587dfeaa9d369235d347af3d14339054ee59908.zip Qt-f587dfeaa9d369235d347af3d14339054ee59908.tar.gz Qt-f587dfeaa9d369235d347af3d14339054ee59908.tar.bz2 | |
Merge remote branch 'staging/4.7' into HEAD
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); |