diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-24 07:00:03 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-24 07:00:03 (GMT) |
| commit | 034641277fa71825470f1300f6950b97fdfd6098 (patch) | |
| tree | 939036955e81077b8903044aaeb243874a1631f7 | |
| parent | b82f89bf650ea8a7685737f737d410a089325152 (diff) | |
| download | Qt-034641277fa71825470f1300f6950b97fdfd6098.zip Qt-034641277fa71825470f1300f6950b97fdfd6098.tar.gz Qt-034641277fa71825470f1300f6950b97fdfd6098.tar.bz2 | |
Remove incorrect ASSERT
QTBUG-10832
| -rw-r--r-- | src/declarative/qml/qdeclarativebinding.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index 7385728..882e981 100644 --- a/src/declarative/qml/qdeclarativebinding.cpp +++ b/src/declarative/qml/qdeclarativebinding.cpp @@ -355,8 +355,6 @@ void QDeclarativeAbstractBinding::removeFromObject() if (m_prevBinding) { int index = propertyIndex(); - Q_ASSERT(m_object); - *m_prevBinding = m_nextBinding; if (m_nextBinding) m_nextBinding->m_prevBinding = m_prevBinding; m_prevBinding = 0; @@ -365,7 +363,7 @@ void QDeclarativeAbstractBinding::removeFromObject() if (index & 0xFF000000) { // Value type - we don't remove the proxy from the object. It will sit their happily // doing nothing for ever more. - } else { + } else if (m_object) { QDeclarativeData *data = QDeclarativeData::get(m_object, false); if (data) data->clearBindingBit(index); } |