diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-18 08:01:12 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-18 08:01:12 (GMT) |
| commit | a71898895ea04fe58f77a9fa8601aa1072a76fc8 (patch) | |
| tree | ddf3e6ca9ff860506b159974268ea0b8dce68ab3 /src/declarative/qml/qmlcontext.cpp | |
| parent | 223746067a9a1b3f5c6195868b5e510311608ca1 (diff) | |
| parent | 1ab70725f76433a0f601fdfd70abc55bd6228ac3 (diff) | |
| download | Qt-a71898895ea04fe58f77a9fa8601aa1072a76fc8.zip Qt-a71898895ea04fe58f77a9fa8601aa1072a76fc8.tar.gz Qt-a71898895ea04fe58f77a9fa8601aa1072a76fc8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 b73471a..365c0e8 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 |