summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-05-17 16:55:11 +1000
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-05-17 16:55:11 +1000
commitca4f1b71faf0113f5030902ee03a39c169847526 (patch)
tree855550e46c6c96b7401bad939ce065bb4290d338 /src
parent45fe1dd88afb7b82c5fb39bfc4c70bcf16e5c0ea (diff)
Restructure QDeclarativeAbstractBinding destructor
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qdeclarativebinding.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 3e729c2d15..2e905b90cb 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -287,12 +287,14 @@ QDeclarativeAbstractBinding::QDeclarativeAbstractBinding()
QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding()
{
Q_ASSERT(m_prevBinding == 0);
- if (m_mePtr)
- *m_mePtr = 0;
+ Q_ASSERT(m_mePtr == 0);
}
void QDeclarativeAbstractBinding::destroy()
{
+ removeFromObject();
+ clear();
+
delete this;
}