diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-18 02:19:24 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-18 02:19:24 (GMT) |
| commit | 146abce0f1c6b5f019f3e8f6d191fb4c6cf5b9f7 (patch) | |
| tree | 6ba2e4d63e0e0e74315168541c8d0d9e93c1845e /src/declarative/qml/qmlcontext.cpp | |
| parent | 39a2e72700aa481fefc7df7fa64d8dc8c1670d2e (diff) | |
| download | Qt-146abce0f1c6b5f019f3e8f6d191fb4c6cf5b9f7.zip Qt-146abce0f1c6b5f019f3e8f6d191fb4c6cf5b9f7.tar.gz Qt-146abce0f1c6b5f019f3e8f6d191fb4c6cf5b9f7.tar.bz2 | |
Slightly change implementation of scope chain.
Preparation for merge of QtScript's JSC backend.
Diffstat (limited to 'src/declarative/qml/qmlcontext.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcontext.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 451dbcc..009c799 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -105,6 +105,9 @@ void QmlContextPrivate::init() QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine); QScriptValue scopeObj = scriptEngine->newObject(QmlEnginePrivate::get(engine)->contextClass, scriptEngine->newVariant(QVariant::fromValue((QObject*)q))); + //### no longer need to push global object once we switch to JSC (test with objects added to globalObject) + //if (parent) + // scopeChain = parent->d_func()->scopeChain; if (!parent) scopeChain.append(scriptEngine->globalObject()); else |