diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-05-14 13:15:08 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-05-14 13:15:08 +1000 |
| commit | 5cd963d2628ed7c01d331cdad03b4d77161c8b93 (patch) | |
| tree | 42301ae7c37afb47b1daf897ed185e419a247304 /src/declarative/util/qdeclarativestateoperations.cpp | |
| parent | 873f755d1f40619174de0436dba293729f87bac9 (diff) | |
| download | qt4-tools-5cd963d2628ed7c01d331cdad03b4d77161c8b93.tar.gz | |
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.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index a93a25db14..a6fcaf3443 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -408,7 +408,7 @@ void QDeclarativeParentChange::saveOriginals() d->origStackBefore = d->rewindStackBefore; } -void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other) +/*void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other) { Q_D(QDeclarativeParentChange); QDeclarativeParentChange *pc = static_cast<QDeclarativeParentChange*>(other); @@ -417,7 +417,7 @@ void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other) d->origStackBefore = pc->d_func()->rewindStackBefore; saveCurrentValues(); -} +}*/ void QDeclarativeParentChange::execute(Reason) { |