diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-11-10 06:39:00 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-11-10 06:39:00 (GMT) |
| commit | 432d54d092414431e1e54daa2259384d83600bf2 (patch) | |
| tree | 0ec7c9080b5dcdae1f411457f8b057145ef94366 /src/declarative/qml/qmlcontext.cpp | |
| parent | c411c39557d31b94efb5813be9e9ef43c05a9093 (diff) | |
| parent | 4459e18afd3e537c2155dadad0937e0a5cdd76c5 (diff) | |
| download | Qt-432d54d092414431e1e54daa2259384d83600bf2.zip Qt-432d54d092414431e1e54daa2259384d83600bf2.tar.gz Qt-432d54d092414431e1e54daa2259384d83600bf2.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of 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, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index f8e685a..105c673 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -48,6 +48,7 @@ #include <QtCore/qvarlengtharray.h> #include <QtCore/qdebug.h> #include <private/qmlbindingoptimizations_p.h> +#include <private/qscriptdeclarativeclass_p.h> #include <QtDeclarative/qmlinfo.h> QT_BEGIN_NAMESPACE @@ -69,7 +70,7 @@ void QmlContextPrivate::addScript(const QString &script, QObject *scopeObject, QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine); QScriptEngine *scriptEngine = QmlEnginePrivate::getScriptEngine(engine); - QScriptContext *scriptContext = scriptEngine->pushCleanContext(); + QScriptContext *scriptContext = QScriptDeclarativeClass::pushCleanContext(scriptEngine); scriptContext->pushScope(enginePriv->contextClass->newContext(q, scopeObject)); QScriptValue scope = scriptEngine->newObject(); |