diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
| commit | 7421702dd3202c21f3871171792476f0d2d50abe (patch) | |
| tree | 5a45e20fd74e23cf0a4ad2aa1a80bd073fa51413 /src/declarative/util/qmlstate.cpp | |
| parent | 9094a6588de3a7264ec4647a24b94253a7609823 (diff) | |
| parent | 949e21cdafeec0c0e4ac632ebbf21767479f04e5 (diff) | |
| download | Qt-7421702dd3202c21f3871171792476f0d2d50abe.zip Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.gz Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
Diffstat (limited to 'src/declarative/util/qmlstate.cpp')
| -rw-r--r-- | src/declarative/util/qmlstate.cpp | 4 |
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(); |