diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-14 03:45:57 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-14 03:45:57 (GMT) |
| commit | 677d06cecb44c482c72d1e987e3f923a73fcedd2 (patch) | |
| tree | d54f137eca7945796c36a881cceba4a4550ff9a9 /src/declarative/util/qdeclarativestate.cpp | |
| parent | 645b9ee9dd6e0576542cc61872ecedb408ca8a89 (diff) | |
| parent | 5cd963d2628ed7c01d331cdad03b4d77161c8b93 (diff) | |
| download | Qt-677d06cecb44c482c72d1e987e3f923a73fcedd2.zip Qt-677d06cecb44c482c72d1e987e3f923a73fcedd2.tar.gz Qt-677d06cecb44c482c72d1e987e3f923a73fcedd2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativestate.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index ea209aa..b5f7900 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -390,12 +390,13 @@ void QDeclarativeState::apply(QDeclarativeStateGroup *group, QDeclarativeTransit if (action.event->override(event)) { found = true; - if (action.event != d->revertList.at(jj).event) { + if (action.event != d->revertList.at(jj).event && action.event->needsCopy()) { action.event->copyOriginals(d->revertList.at(jj).event); QDeclarativeSimpleAction r(action); additionalReverts << r; d->revertList.removeAt(jj); + --jj; } else if (action.event->isRewindable()) //###why needed? action.event->saveCurrentValues(); |