diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-09 11:27:08 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-09 11:27:08 (GMT) |
| commit | 62d3e29b374cd94adcb5fb937fd57d8d21a78594 (patch) | |
| tree | 9c07c4a570bcfcc51db595f34e138a03f657c2b9 /src/declarative/qml | |
| parent | 83385a08b72f1726c0a234ac597d33897c51a995 (diff) | |
| download | Qt-62d3e29b374cd94adcb5fb937fd57d8d21a78594.zip Qt-62d3e29b374cd94adcb5fb937fd57d8d21a78594.tar.gz Qt-62d3e29b374cd94adcb5fb937fd57d8d21a78594.tar.bz2 | |
Properly insert objects into the context's object list
Fixes a failing autotest, where the object's context pointer was not
being reset. This was because the object was not placed properly in the
context's contextObjects list and so was not found and cleared when the
context was destroyed.
Diffstat (limited to 'src/declarative/qml')
| -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) |