diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-12-01 07:36:41 (GMT) |
| commit | a305814f8f59f634943d8d5f8d87d2fd49891cb3 (patch) | |
| tree | 42ed4e6afecbf36af2750e2eeaed87117ab942a6 /src/declarative/qml/qdeclarativecomponent.cpp | |
| parent | 6258fc281f5b66b2634b81a2633b117165cea7ef (diff) | |
| parent | 1337a3e031477aa4d628d01252557dee622629ff (diff) | |
| download | Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.zip Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.gz Qt-a305814f8f59f634943d8d5f8d87d2fd49891cb3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 5be41ab..a72e04e 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -878,9 +878,12 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding> bv = state->bindValues.at(ii); for (int jj = 0; jj < bv.count; ++jj) { - if(bv.at(jj)) + if(bv.at(jj)) { + // XXX akennedy + bv.at(jj)->m_mePtr = 0; bv.at(jj)->setEnabled(true, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding); + } } QDeclarativeEnginePrivate::clear(bv); } |