summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine
diff options
context:
space:
mode:
authorKent Hansen <kent.hansen@nokia.com>2012-07-03 22:13:56 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-10 06:20:23 +0200
commitbc5a4d28afbd273adeaae75ebd4aeb97337df6ed (patch)
tree6e1571abca3c0b5eb1f5b35b5e8c51781d32017c /src/corelib/statemachine
parent5db78a077b8f070b6e28431de6c3add6660ad1be (diff)
Set compound state's initial state to 0 if it is removed/deleted
Change-Id: I45b7c15a9b3d5a1860cb9a7da8836f9eaaa0326d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r--src/corelib/statemachine/qstate.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 14432edd7c..39651b9736 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -495,6 +495,8 @@ bool QState::event(QEvent *e)
if ((e->type() == QEvent::ChildAdded) || (e->type() == QEvent::ChildRemoved)) {
d->childStatesListNeedsRefresh = true;
d->transitionsListNeedsRefresh = true;
+ if ((e->type() == QEvent::ChildRemoved) && (static_cast<QChildEvent *>(e)->child() == d->initialState))
+ d->initialState = 0;
}
return QAbstractState::event(e);
}