diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-07-13 19:30:33 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 10:08:28 +0200 |
commit | cd1351401ffdfe5e6097b4b41a632655f9fa6e03 (patch) | |
tree | 0d9ab87aaa646a04d471751706221d733078b4b2 /src/corelib/statemachine/qstatemachine_p.h | |
parent | 0b66f723f06f6d115ea37d4db8bb6c0b5f63885b (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/qstatemachine_p.h')
-rw-r--r-- | src/corelib/statemachine/qstatemachine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 9e1f425779..cf20ee31ca 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -224,7 +224,7 @@ public: QMutex externalEventMutex; QStateMachine::Error error; - QStateMachine::RestorePolicy globalRestorePolicy; + QState::RestorePolicy globalRestorePolicy; QString errorString; QSet<QAbstractState *> pendingErrorStates; |