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/qdeclarativestateoperations_p.h | |
| 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/qdeclarativestateoperations_p.h')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index e22c1e2..21a86f5 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -107,7 +107,7 @@ public: virtual ActionList actions(); virtual void saveOriginals(); - virtual void copyOriginals(QDeclarativeActionEvent*); + //virtual void copyOriginals(QDeclarativeActionEvent*); virtual void execute(Reason reason = ActualChange); virtual bool isReversable(); virtual void reverse(Reason reason = ActualChange); @@ -277,6 +277,7 @@ public: virtual bool override(QDeclarativeActionEvent*other); virtual bool changesBindings(); virtual void saveOriginals(); + virtual bool needsCopy() { return true; } virtual void copyOriginals(QDeclarativeActionEvent*); virtual void clearBindings(); virtual void rewind(); |