summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-05-27 09:40:17 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-05-27 09:49:45 +0200
commit9d61684d70c8691d81536b7b519388586e2cbbb8 (patch)
treeb85888d73518f6abc7bbde74ab71a27887682f9d /tests
parent59f04faaedc001829f7abbd1bca3c03335f0f98c (diff)
Don't set childMode on a StateMachine
This leads to invalid state machines and is rejected since cfdbfcebbda5f26b89c70df6b191b17ef242e9d7 in qtbase. Rather, add a separate state in between to set the ParallelStates mode. Change-Id: Ia08b286da4c60a26d3043179250f81fb4328864f Fixes: QTBUG-75976 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qmltest/statemachine/tst_parallelmachine.qml32
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
+ }
}
}
}