summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-02-10 06:06:10 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-02-10 06:06:49 (GMT)
commita221b2d7980932d09c20f215ad1dc56531ae7bf1 (patch)
treec5fd46f33d7018557c86b422b0d5aa2ee8f0161a
parent8d3a376d7d468fcc16fcbf6b98f9301a68ae7d2b (diff)
downloadQt-a221b2d7980932d09c20f215ad1dc56531ae7bf1.zip
Qt-a221b2d7980932d09c20f215ad1dc56531ae7bf1.tar.gz
Qt-a221b2d7980932d09c20f215ad1dc56531ae7bf1.tar.bz2
Crash
-rw-r--r--src/declarative/qml/qmlengine.cpp2
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;
}