diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2010-05-14 03:15:08 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2010-05-14 03:15:08 (GMT) |
commit | 5cd963d2628ed7c01d331cdad03b4d77161c8b93 (patch) | |
tree | 42301ae7c37afb47b1daf897ed185e419a247304 /src/declarative/util/qdeclarativepropertychanges.cpp | |
parent | 873f755d1f40619174de0436dba293729f87bac9 (diff) | |
download | Qt-5cd963d2628ed7c01d331cdad03b4d77161c8b93.zip Qt-5cd963d2628ed7c01d331cdad03b4d77161c8b93.tar.gz Qt-5cd963d2628ed7c01d331cdad03b4d77161c8b93.tar.bz2 |
Fix crash in ParentAnimation.
copyOriginals plays with the order of the revertList, which messes up
the assumptions of ParentAnimation. The full fix will require some
rearchitecting of how the states and transitions handle "related"
actions, but for now this fixes the crash.
Reverting to the base state has also been fixed.
Task-number: QTBUG-10671, QTBUG-10676
Diffstat (limited to 'src/declarative/util/qdeclarativepropertychanges.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativepropertychanges.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index a22c756..12fef36 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -179,7 +179,7 @@ public: reverseExpression = rewindExpression; } - virtual void copyOriginals(QDeclarativeActionEvent *other) + /*virtual void copyOriginals(QDeclarativeActionEvent *other) { QDeclarativeReplaceSignalHandler *rsh = static_cast<QDeclarativeReplaceSignalHandler*>(other); saveCurrentValues(); @@ -190,7 +190,7 @@ public: ownedExpression = rsh->ownedExpression; rsh->ownedExpression = 0; } - } + }*/ virtual void rewind() { ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression); |