diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:34 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-05-28 17:59:40 +0200 |
commit | 1f3c157ec6b8be5de1eb89295713c2980fb1a7aa (patch) | |
tree | b85888d73518f6abc7bbde74ab71a27887682f9d /tests/auto/qmltest | |
parent | 44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (diff) | |
parent | 0f5c34f2c6b64bae3429706a6c4211334c689092 (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng
Diffstat (limited to 'tests/auto/qmltest')
-rw-r--r-- | tests/auto/qmltest/statemachine/tst_parallelmachine.qml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml index be7d73fbe5..eb996c7718 100644 --- a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml +++ b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml @@ -32,25 +32,29 @@ import QtQml.StateMachine 1.0 TestCase { StateMachine { id: myStateMachine - childMode: State.ParallelStates + initialState: rootState State { - id: childState1 + id: rootState childMode: State.ParallelStates State { - id: childState11 + id: childState1 + childMode: State.ParallelStates + State { + id: childState11 + } + State { + id: childState12 + } } State { - id: childState12 - } - } - State { - id: childState2 - initialState: childState21 - State { - id: childState21 - } - State { - id: childState22 + id: childState2 + initialState: childState21 + State { + id: childState21 + } + State { + id: childState22 + } } } } |