diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-04-21 04:39:28 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-04-21 04:39:28 (GMT) |
| commit | 045539e38b606814a3a3f5fb37f871f03fb2a53b (patch) | |
| tree | 80f170a2540124270564d1ce36a03ddbbd1633c7 | |
| parent | 146eb30c23f55c714afdde887ea6bb4df104e057 (diff) | |
| parent | 90ce3a68a0efd32e279b9bedfce603aa27870716 (diff) | |
| download | Qt-045539e38b606814a3a3f5fb37f871f03fb2a53b.zip Qt-045539e38b606814a3a3f5fb37f871f03fb2a53b.tar.gz Qt-045539e38b606814a3a3f5fb37f871f03fb2a53b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/qml/qdeclarativebinding.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index 95520da..d44e7fb 100644 --- a/src/declarative/qml/qdeclarativebinding.cpp +++ b/src/declarative/qml/qdeclarativebinding.cpp @@ -361,8 +361,10 @@ void QDeclarativeAbstractBinding::removeFromObject() void QDeclarativeAbstractBinding::clear() { - if (m_mePtr) + if (m_mePtr) { *m_mePtr = 0; + m_mePtr = 0; + } } QString QDeclarativeAbstractBinding::expression() const |