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>

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
index 0f35af0d99..2e3a5efdfd 100644
--- a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
+++ b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml
@@ -31,30 +31,30 @@
 **
 ****************************************************************************/
 
-import QtQml.StateMachine 1.0
 import QtTest 1.0
+import QtQml.StateMachine 1.0
 
 TestCase {
     StateMachine {
         id: myStateMachine
-        childMode: StateBase.ParallelStates
-        StateBase {
+        childMode: State.ParallelStates
+        State {
             id: childState1
-            childMode: StateBase.ParallelStates
-            StateBase {
+            childMode: State.ParallelStates
+            State {
                 id: childState11
             }
-            StateBase {
+            State {
                 id: childState12
             }
         }
-        StateBase {
+        State {
             id: childState2
             initialState: childState21
-            StateBase {
+            State {
                 id: childState21
             }
-            StateBase {
+            State {
                 id: childState22
             }
         }