diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-09 07:18:54 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-04-09 07:18:54 (GMT) |
| commit | 06c286b74274166a47df20dc425f76051fb03d4d (patch) | |
| tree | b2b8376b9844dbb5c24e0749d512d5e9c0cd1bea /src | |
| parent | da8dda3a3b66fed6d5da878f3b4617aa0b5f3953 (diff) | |
| download | Qt-06c286b74274166a47df20dc425f76051fb03d4d.zip Qt-06c286b74274166a47df20dc425f76051fb03d4d.tar.gz Qt-06c286b74274166a47df20dc425f76051fb03d4d.tar.bz2 | |
Fix crash in QML library imports
QTBUG-9705
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index 55c2f7c..9307bcc 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -623,6 +623,7 @@ void QDeclarativeContextData::addImportedScript(const QDeclarativeParser::Object if (iter == enginePriv->m_sharedScriptImports.end()) { QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine); + scriptContext->pushScope(enginePriv->contextClass->newContext(0, 0)); scriptContext->pushScope(enginePriv->globalClass->globalObject()); QScriptValue scope = scriptEngine->newObject(); |