diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-30 23:00:17 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-30 23:00:17 (GMT) |
| commit | 9d9152a4c0fd3752418662b0fcdd77b3906d9b5b (patch) | |
| tree | 25788c724d28c853c8ba6d79291fb3ea8a5540ed /src/declarative/qml/qdeclarativecomponent.cpp | |
| parent | 4d144f84300fb2613391fbe3de9fc9fdba5c6691 (diff) | |
| parent | bb1a6cd1e9d6d00e8d70f665ca223261e9eda06e (diff) | |
| download | Qt-9d9152a4c0fd3752418662b0fcdd77b3906d9b5b.zip Qt-9d9152a4c0fd3752418662b0fcdd77b3906d9b5b.tar.gz Qt-9d9152a4c0fd3752418662b0fcdd77b3906d9b5b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
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 2686ce3..63bde0f 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -876,9 +876,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); } |