diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2014-10-09 16:05:33 +0200 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2014-10-21 02:13:33 +0200 |
| commit | f830c109d09d835551c1325c4904fc9a490b3754 (patch) | |
| tree | 6bb3c09cb44ed0a5446749701ac4281831a62967 /tests/auto/qmltest/statemachine/tst_trafficlight.qml | |
| parent | 5871f3e829f1f48995b5d6c03f7ad31fcda386e5 (diff) | |
qmlstatemachine: Rename StateBase to State
As discussed with Brett Stottlmyer and Alan Alpert.
Add a section about the implications when importing both
QtQml.StateMachine
and QtQuick in one single QML file.
Change-Id: I8755f4b578e2a6ff4c2377c7a8a0b996ba9b7129
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qmltest/statemachine/tst_trafficlight.qml')
| -rw-r--r-- | tests/auto/qmltest/statemachine/tst_trafficlight.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qmltest/statemachine/tst_trafficlight.qml b/tests/auto/qmltest/statemachine/tst_trafficlight.qml index 8a7cad8268..3f731a4014 100644 --- a/tests/auto/qmltest/statemachine/tst_trafficlight.qml +++ b/tests/auto/qmltest/statemachine/tst_trafficlight.qml @@ -31,8 +31,8 @@ ** ****************************************************************************/ -import QtQml.StateMachine 1.0 import QtTest 1.0 +import QtQml.StateMachine 1.0 TestCase { StateMachine { @@ -42,10 +42,10 @@ TestCase { id: finalState } - StateBase { + State { id: red initialState: justRed - StateBase { + State { id: justRed SignalTransition { id: e1 @@ -56,7 +56,7 @@ TestCase { targetState: finalState } } - StateBase { + State { id: waitingForGreen TimeoutTransition { id: e2 @@ -65,7 +65,7 @@ TestCase { } } } - StateBase { + State { id: yellowred TimeoutTransition { id: e3 @@ -73,7 +73,7 @@ TestCase { timeout: 10 } } - StateBase { + State { id: green TimeoutTransition { id: e4 @@ -81,7 +81,7 @@ TestCase { timeout: 50 } } - StateBase { + State { id: yellow TimeoutTransition { id: e5 |