summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-10-11 23:33:32 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-11 23:33:32 (GMT)
commitda0e40dfefb7fc487a9a775363321e178e529d16 (patch)
treeb342cf9b06065826f0d0168d4d4d05654b6346f1
parent76b29d542e13184da81129ea3f7373ffd71ceedc (diff)
downloadQt-da0e40dfefb7fc487a9a775363321e178e529d16.zip
Qt-da0e40dfefb7fc487a9a775363321e178e529d16.tar.gz
Qt-da0e40dfefb7fc487a9a775363321e178e529d16.tar.bz2
Make sure ParentChange always saves original parent.
-rw-r--r--src/declarative/util/qmlstate.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 3c85db7..98facd9 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -350,6 +350,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
if (action.event) {
if (!action.event->isReversable())
continue;
+ action.event->saveOriginals();
for (jj = 0; jj < d->revertList.count(); ++jj) {
ActionEvent *event = d->revertList.at(jj).event;
if (event && event->typeName() == action.event->typeName()) {
@@ -359,9 +360,6 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
}
}
}
- if (!found)
- action.event->saveOriginals();
- //### do we ever need to do saveOriginals when found == true?
} else {
action.fromBinding = action.property.binding();