summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine/qstate.h
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-07-13 19:30:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-16 10:08:28 +0200
commitcd1351401ffdfe5e6097b4b41a632655f9fa6e03 (patch)
tree0d9ab87aaa646a04d471751706221d733078b4b2 /src/corelib/statemachine/qstate.h
parent0b66f723f06f6d115ea37d4db8bb6c0b5f63885b (diff)
statemachine: Move RestorePolicy enum to QState class
This makes it possible to add API for setting the restore policy per state, or even per property assignment (QTBUG-17861). This change is fully source compatible with Qt4. Change-Id: I53628546b070f6fc84891f86e7ad7bd8ef5ba285 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/statemachine/qstate.h')
-rw-r--r--src/corelib/statemachine/qstate.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 63a11b4e4f..2989bd4d7e 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -63,13 +63,18 @@ class Q_CORE_EXPORT QState : public QAbstractState
Q_PROPERTY(QAbstractState* initialState READ initialState WRITE setInitialState)
Q_PROPERTY(QAbstractState* errorState READ errorState WRITE setErrorState)
Q_PROPERTY(ChildMode childMode READ childMode WRITE setChildMode)
- Q_ENUMS(ChildMode)
+ Q_ENUMS(ChildMode RestorePolicy)
public:
enum ChildMode {
ExclusiveStates,
ParallelStates
};
+ enum RestorePolicy {
+ DontRestoreProperties,
+ RestoreProperties
+ };
+
QState(QState *parent = 0);
QState(ChildMode childMode, QState *parent = 0);
~QState();