diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-15 09:10:43 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-15 09:10:43 (GMT) |
commit | 06d71fb79ad850c62a1b95fbeec607dfc4220489 (patch) | |
tree | 78698d4ab162020c725ed06fa73aa27776f3e5ec /src/declarative/qml/qdeclarativebinding.cpp | |
parent | e85223d233c0e1d6beca748332b8fbaba3ebbf2d (diff) | |
parent | 2b768dc774a5a957e7806515db3c7976bb9e337c (diff) | |
download | Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.zip Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.tar.gz Qt-06d71fb79ad850c62a1b95fbeec607dfc4220489.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativebinding.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativebinding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index e172a8b..664118d 100644 --- a/src/declarative/qml/qdeclarativebinding.cpp +++ b/src/declarative/qml/qdeclarativebinding.cpp @@ -126,7 +126,7 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags) QDeclarativeBindingData *data = d->bindingData(); - if (!data->enabled || !data->context() || !data->context()->engine) + if (!data->enabled || !data->context() || !data->context()->isValid()) return; data->addref(); |