diff options
| author | Sebastian Sauer <sebastian.sauer.ford@kdab.com> | 2014-09-18 00:10:40 +0700 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2014-09-24 17:39:14 +0200 |
| commit | 40f76f99469e75d7a6818306891964e5966d0fad (patch) | |
| tree | e936508affedefd98ab8ec2c073ea7be9187c4f4 /src/imports/statemachine | |
| parent | 5b21f8529ebc8e3e66ec6d057734f90b10bb7657 (diff) | |
QDSM: Nested statemachines are supported
* Remove wrongly printed info that nested
statemachines are not supported.
* Added autotest for nested statemachines.
* Re-enable commented out testcase in the
nestedInitalStates autotest. The reason
why the test was disabled was fixed a
while ago.
Change-Id: I921483fa49d751d14c877f8f63335fa88cf2ce7b
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/statemachine')
| -rw-r--r-- | src/imports/statemachine/childrenprivate.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/imports/statemachine/childrenprivate.h b/src/imports/statemachine/childrenprivate.h index 5e2d60e299..d66454ca1c 100644 --- a/src/imports/statemachine/childrenprivate.h +++ b/src/imports/statemachine/childrenprivate.h @@ -51,9 +51,6 @@ public: { QAbstractState *state = qobject_cast<QAbstractState*>(item); if (state) { - if (qobject_cast<QStateMachine*>(item)) - qmlInfo(static_cast<T *>(prop->object)) << "StateMachines should not be nested."; - item->setParent(prop->object); } else { QAbstractTransition *trans = qobject_cast<QAbstractTransition*>(item); @@ -68,9 +65,6 @@ public: { QAbstractState *state = qobject_cast<QAbstractState*>(item); if (state) { - if (qobject_cast<QStateMachine*>(item)) - qmlInfo(static_cast<T *>(prop->object)) << "StateMachines should not be nested."; - item->setParent(prop->object); } static_cast<ChildrenPrivate<T>*>(prop->data)->children.append(item); |