diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-09 21:39:42 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-09 21:39:42 (GMT) |
| commit | 4adf3144d79cf3affe2b83dabf5333134b6ec6f7 (patch) | |
| tree | e6b0a817300eb4a195ee92e5c6c6a19ed4a36f60 /src/declarative/qml/qmlengine.cpp | |
| parent | 9a3b5988a089429e016334a434023bc5c992f0ed (diff) | |
| parent | 969b61f508294d1f683e09e78641127d0f0def05 (diff) | |
| download | Qt-4adf3144d79cf3affe2b83dabf5333134b6ec6f7.zip Qt-4adf3144d79cf3affe2b83dabf5333134b6ec6f7.tar.gz Qt-4adf3144d79cf3affe2b83dabf5333134b6ec6f7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative/qml/qmlengine.cpp')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index f4dcb7a..81988ed 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -543,6 +543,7 @@ void QmlEngine::setContextForObject(QObject *object, QmlContext *context) data->context = context; data->nextContextObject = context->d_func()->contextObjects; data->prevContextObject = &context->d_func()->contextObjects; + context->d_func()->contextObjects = data; } void qmlExecuteDeferred(QObject *object) |