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, 5 insertions, 6 deletions

diff --git a/src/qml/doc/snippets/qml/statemachine/guardcondition.qml b/src/qml/doc/snippets/qml/statemachine/guardcondition.qml
index f9ecf450bd..3d4badb350 100644
--- a/src/qml/doc/snippets/qml/statemachine/guardcondition.qml
+++ b/src/qml/doc/snippets/qml/statemachine/guardcondition.qml
@@ -39,23 +39,23 @@
 ****************************************************************************/
 
 //! [document]
-import QtQml.StateMachine 1.0
 import QtQuick 2.0
+import QtQml.StateMachine 1.0 as DSM
 
 Rectangle {
     Button {
         anchors.fill: parent
         id: button
-        StateMachine {
-            StateBase {
-                SignalTransition {
+        DSM.StateMachine {
+            DSM.State {
+                DSM.SignalTransition {
                     targetState: finalState
                     signal: button.mysignal
                     // the guard condition uses the mystr string argument from mysignal
                     guard: mystr == "test"
                 }
             }
-            FinalState {
+            DSM.FinalState {
                 id: finalState
             }
         }
@@ -66,4 +66,3 @@ Rectangle {
     }
 }
 //! [document]
-