summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlstate.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-19 08:46:43 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-19 08:46:43 (GMT)
commit4871ff0563cf8a9691db8b084dce012aeb5abf47 (patch)
treea546213763b5ab71793c147debf2ef31d1bcc453 /src/declarative/util/qmlstate.cpp
parent7a9fb0de42835bc4297ac04b901a33f99680f744 (diff)
downloadQt-4871ff0563cf8a9691db8b084dce012aeb5abf47.zip
Qt-4871ff0563cf8a9691db8b084dce012aeb5abf47.tar.gz
Qt-4871ff0563cf8a9691db8b084dce012aeb5abf47.tar.bz2
Add a SetProperties::restoreEntryValues property to store the state restoring property entry values
Diffstat (limited to 'src/declarative/util/qmlstate.cpp')
-rw-r--r--src/declarative/util/qmlstate.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 194cc1b..6261003 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
-Action::Action() : bv(0), event(0), actionDone(false)
+Action::Action() : restore(true), bv(0), event(0), actionDone(false)
{
}
@@ -344,7 +344,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever
for (int ii = 0; ii < applyList.count(); ++ii) {
const Action &action = applyList.at(ii);
- if (action.event)
+ if (action.event || !action.restore)
continue;
bool found = false;