diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-10 07:03:59 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-10 07:03:59 (GMT) |
| commit | ae22dc2472f53c0926b01ef390b7fbeeae0d11ad (patch) | |
| tree | 76223f7f62c59bc78d6c09492dc2ad55aa4f7381 /src/declarative | |
| parent | 69115b14a2b3c2d029dbb0b4e48a5ce9ba1d6470 (diff) | |
| parent | 46595f3a20e9d1d8483172bdd27d17652c4d302e (diff) | |
| download | Qt-ae22dc2472f53c0926b01ef390b7fbeeae0d11ad.zip Qt-ae22dc2472f53c0926b01ef390b7fbeeae0d11ad.tar.gz Qt-ae22dc2472f53c0926b01ef390b7fbeeae0d11ad.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 81988ed..372821e 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -542,6 +542,8 @@ void QmlEngine::setContextForObject(QObject *object, QmlContext *context) data->context = context; data->nextContextObject = context->d_func()->contextObjects; + if (data->nextContextObject) + data->nextContextObject->prevContextObject = &data->nextContextObject; data->prevContextObject = &context->d_func()->contextObjects; context->d_func()->contextObjects = data; } |