fromState -> from, toState -> to for Transition.

34 files changed, 87 insertions, 87 deletions

diff --git a/demos/declarative/contacts/Button.qml b/demos/declarative/contacts/Button.qml
index 476f170..9719231 100644
--- a/demos/declarative/contacts/Button.qml
+++ b/demos/declarative/contacts/Button.qml
@@ -34,16 +34,16 @@ Item {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "pressed"
+                from: "*"
+                to: "pressed"
                 ColorAnimation {
                     property: "color"
                     duration: 200
                 }
             },
             Transition {
-                fromState: "pressed"
-                toState: "*"
+                from: "pressed"
+                to: "*"
                 ColorAnimation {
                     property: "color"
                     duration: 1000
diff --git a/demos/declarative/contacts/ContactField.qml b/demos/declarative/contacts/ContactField.qml
index 8fb627d..6cf7baa 100644
--- a/demos/declarative/contacts/ContactField.qml
+++ b/demos/declarative/contacts/ContactField.qml
@@ -48,8 +48,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/demos/declarative/contacts/FieldText.qml b/demos/declarative/contacts/FieldText.qml
index 6793b7c..d30d4d8 100644
--- a/demos/declarative/contacts/FieldText.qml
+++ b/demos/declarative/contacts/FieldText.qml
@@ -138,8 +138,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/demos/declarative/contacts/RemoveButton.qml b/demos/declarative/contacts/RemoveButton.qml
index 2493f65..cc858c3 100644
--- a/demos/declarative/contacts/RemoveButton.qml
+++ b/demos/declarative/contacts/RemoveButton.qml
@@ -111,8 +111,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index 3be2b04..ebcab69 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -281,8 +281,8 @@ Rectangle {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "*"
+                from: "*"
+                to: "*"
                 NumberAnimation {
                     property: "bottomMargin"
                     duration: 250
@@ -310,8 +310,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "*"
+            from: "*"
+            to: "*"
             NumberAnimation {
                 property: "opacity"
                 duration: 500
diff --git a/demos/declarative/flickr/content/ScrollBar.qml b/demos/declarative/flickr/content/ScrollBar.qml
index 540f94f..89d51e2 100644
--- a/demos/declarative/flickr/content/ScrollBar.qml
+++ b/demos/declarative/flickr/content/ScrollBar.qml
@@ -28,8 +28,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "*"
+            from: "*"
+            to: "*"
             NumberAnimation {
                 target: Container
                 properties: "opacity"
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index d3c1a48..d8a27d5 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -100,12 +100,12 @@ Item {
 
             transitions: [
                 Transition {
-                    fromState: "*"; toState: "Details"
+                    from: "*"; to: "Details"
                     ParentAction { }
                     NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
                 },
                 Transition {
-                    fromState: "Details"; toState: "*"
+                    from: "Details"; to: "*"
                     SequentialAnimation {
                         ParentAction { }
                         NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
@@ -196,7 +196,7 @@ Item {
 
         transitions: [
             Transition {
-                fromState: "*"; toState: "*"
+                from: "*"; to: "*"
                 NumberAnimation { properties: "y"; duration: 1000; easing: "easeOutBounce(amplitude:0.5)" }
             }
         ]
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index 0bdbaaf..d9b1f60 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -99,12 +99,12 @@ Item {
 
                     transitions: [
                         Transition {
-                            fromState: "*"; toState: "Details"
+                            from: "*"; to: "Details"
                             ParentAction { }
                             NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
                         },
                         Transition {
-                            fromState: "Details"; toState: "*"
+                            from: "Details"; to: "*"
                             SequentialAnimation {
                                 ParentAction { }
                                 NumberAnimation { properties: "x,y,scale,opacity,angle"; duration: 500; easing: "easeInOutQuad" }
@@ -140,7 +140,7 @@ Item {
                     ]
                     transitions: [
                         Transition {
-                            toState: "pathView"
+                            to: "pathView"
                             SequentialAnimation {
                                 PropertyAction { target: Wrapper; property: "moveToParent" }
                                 ParallelAnimation {
@@ -156,7 +156,7 @@ Item {
                             }
                         },
                         Transition {
-                            toState: "gridView"
+                            to: "gridView"
                             SequentialAnimation {
                                 PauseAnimation { duration: Math.floor(index/7)*100 }
                                 PropertyAction { target: Wrapper; property: "moveToParent" }
diff --git a/demos/declarative/webbrowser/fieldtext/FieldText.qml b/demos/declarative/webbrowser/fieldtext/FieldText.qml
index 4d59705..976785b 100644
--- a/demos/declarative/webbrowser/fieldtext/FieldText.qml
+++ b/demos/declarative/webbrowser/fieldtext/FieldText.qml
@@ -148,8 +148,8 @@ Item {
 
     transitions: [
     Transition {
-        fromState: ""
-        toState: "*"
+        from: ""
+        to: "*"
         reversible: true
         NumberAnimation {
             properties: "opacity,leftMargin,rightMargin"
diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index 28a3c47..9554ad5 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -121,8 +121,8 @@ QML transitions can use selectors to determine which state changes a transition
 
 \code
 Transition {
-    fromState: "*"
-    toState: "Details"
+    from: "*"
+    to: "Details"
     ...
 }
 \endcode
@@ -131,8 +131,8 @@ Transitions can happen in parallel, in sequence, or in any combination of the tw
 
 \code
 Transition {
-    fromState: "*"
-    toState: "MyState"
+    from: "*"
+    to: "MyState"
     reversible: true
     SequentialAnimation {
         ColorAnimation {
diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc
index d402a66..1330c43 100644
--- a/doc/src/declarative/tutorial3.qdoc
+++ b/doc/src/declarative/tutorial3.qdoc
@@ -33,8 +33,8 @@ Rectangle {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "down"
+                from: "*"
+                to: "down"
                 reversible: true
                 ParallelAnimation {
                     NumberAnimation {
@@ -82,15 +82,15 @@ The \e down state includes a set of property changes from our implicit \e {defau
 
 \code
 Transition {
-    fromState: "*"
-    toState: "down"
+    from: "*"
+    to: "down"
     reversible: true
 }
 \endcode
 
 Because we don't want the text to appear at the bottom instantly but rather move smoothly, we add a transition between our two states.
 
-\c fromState and \c toState define the states between which the transition will run. In this case, we want a transition from any state to our \e down state.
+\c from and \c to define the states between which the transition will run. In this case, we want a transition from any state to our \e down state.
 
 Because we want the same transition to be run in reverse when changing back from the \e down state to the default state, we set \c reversible to \c true. This is equivalent to writing the two transitions separately.
 
diff --git a/examples/declarative/flowview/flowview.qml b/examples/declarative/flowview/flowview.qml
index e82561e..ca31bcc 100644
--- a/examples/declarative/flowview/flowview.qml
+++ b/examples/declarative/flowview/flowview.qml
@@ -22,7 +22,7 @@ Rectangle {
             PropertyChanges { target: RightBar; x: 770 }
         }
         transitions: Transition {
-            fromState: "" ; toState: "rotated"
+            from: "" ; to: "rotated"
             reversible: true
             SequentialAnimation {
                 NumberAnimation { targets: [TopBar, BottomBar]; properties: "x,y"; easing: "easeInOutQuad" }
@@ -64,7 +64,7 @@ Rectangle {
                     ]
                     transitions: [
                     Transition {
-                        fromState: "*"; toState: "InGrid"
+                        from: "*"; to: "InGrid"
                         SequentialAnimation { 
                             ParentAction{} 
                             PauseAnimation { duration: 50 * List.FlowView.column }
@@ -72,7 +72,7 @@ Rectangle {
                         } 
                     },
                     Transition {
-                        fromState: "*"; toState: "InList"
+                        from: "*"; to: "InList"
                         SequentialAnimation { 
                             ParentAction{} 
                             PauseAnimation { duration: 50 * (Grid.FlowView.row * 2 + Grid.FlowView.column) }
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 639a8cc..48cceb7 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -24,8 +24,8 @@ Rectangle {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "*"
+                from: "*"
+                to: "*"
                 NumberAnimation {
                     properties: "opacity"
                     duration: 400
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml
index 17e5a48..021cef3 100644
--- a/examples/declarative/snow/ImageBatch.qml
+++ b/examples/declarative/snow/ImageBatch.qml
@@ -52,7 +52,7 @@ GridView {
         }
         transitions: [
             Transition {
-                toState: "selected"
+                to: "selected"
                 SequentialAnimation {
                     PauseAnimation { duration: 150 }
                     PropertyAction { properties: "z" }
@@ -60,7 +60,7 @@ GridView {
                 }
             },
             Transition {
-                fromState: "selected"
+                from: "selected"
                 SequentialAnimation {
                     NumberAnimation { properties: "scale"; duration: 150 }
                     PropertyAction { properties: "z" }
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index 0be9b01..be1419d 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -51,13 +51,13 @@ Rectangle {
         // When transitioning to 'Position1' move x,y over a duration of 1 second,
         // with easeOutBounce easing function.
         Transition {
-            fromState: "*"; toState: "Position1"
+            from: "*"; to: "Position1"
             NumberAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
         },
         // When transitioning to 'Position2' move x,y over a duration of 2 seconds,
         // with easeInOutQuad easing function.
         Transition {
-            fromState: "*"; toState: "Position2"
+            from: "*"; to: "Position2"
             NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
         },
         // For any other state changes move x,y linearly over duration of 200ms.
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
index d75eedc..75d5aaa 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/5/RemoveButton.qml
@@ -101,8 +101,8 @@ Rectangle {
 //! [transition]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
index de9f15a..5ac62ce 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1/RemoveButton.qml
@@ -100,8 +100,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
index de9f15a..5ac62ce 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1a/RemoveButton.qml
@@ -100,8 +100,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
index 07a0814..eb694ce 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/1b/lib/RemoveButton.qml
@@ -102,8 +102,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
index be5f871..b1cd72e 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2/RemoveButton.qml
@@ -108,8 +108,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
index 0b9c02a..1517a74 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/ContactField.qml
@@ -48,8 +48,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
index 8a9424f..3a8bb7f 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/FieldText.qml
@@ -128,8 +128,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
index fc260e3..1276c6b 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/3/RemoveButton.qml
@@ -103,8 +103,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
index 691918f..ccd756e 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/ContactField.qml
@@ -46,8 +46,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
index 62fb08f..8f98ede 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/FieldText.qml
@@ -129,8 +129,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
index abf8fd9..8938184 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/4/RemoveButton.qml
@@ -108,8 +108,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
index 476f170..9719231 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Button.qml
@@ -34,16 +34,16 @@ Item {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "pressed"
+                from: "*"
+                to: "pressed"
                 ColorAnimation {
                     property: "color"
                     duration: 200
                 }
             },
             Transition {
-                fromState: "pressed"
-                toState: "*"
+                from: "pressed"
+                to: "*"
                 ColorAnimation {
                     property: "color"
                     duration: 1000
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
index 691918f..ccd756e 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/ContactField.qml
@@ -46,8 +46,8 @@ Item {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "width,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
index e05708f..228a00d 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/FieldText.qml
@@ -129,8 +129,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: ""
-            toState: "*"
+            from: ""
+            to: "*"
             reversible: true
             NumberAnimation {
                 properties: "opacity,leftMargin,rightMargin"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
index 6bca8b9..3c77cd8 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/lib/RemoveButton.qml
@@ -107,8 +107,8 @@ Rectangle {
     ]
     transitions: [
         Transition {
-            fromState: "*"
-            toState: "opened"
+            from: "*"
+            to: "opened"
             reversible: true
             NumberAnimation {
                 properties: "opacity,x,width"
diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
index b652eac..daf32d5 100644
--- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml
@@ -25,8 +25,8 @@ Rectangle {
         ]
         transitions: [
             Transition {
-                fromState: "*"
-                toState: "down"
+                from: "*"
+                to: "down"
                 reversible: true
                 ParallelAnimation {
                     NumberAnimation {
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index d7d47b1..6395284 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -72,8 +72,8 @@ Rectangle {
                     ]
                     transitions: [
                         Transition {
-                            fromState: "*"
-                            toState: "Details"
+                            from: "*"
+                            to: "Details"
                             reversible: true
                             SequentialAnimation {
                                 NumberAnimation {
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index e70661d..66275d9 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -183,17 +183,17 @@ void QmlTransition::prepare(QmlStateOperation::ActionList &actions,
 }
 
 /*!
-    \qmlproperty string Transition::fromState
-    \qmlproperty string Transition::toState
+    \qmlproperty string Transition::from
+    \qmlproperty string Transition::to
     These properties are selectors indicating which state changes should trigger the transition.
 
-    fromState is used in conjunction with toState to determine when a transition should
-    be applied. By default fromState and toState are both "*" (any state). In the following example,
+    from is used in conjunction with to to determine when a transition should
+    be applied. By default from and to are both "*" (any state). In the following example,
     the transition is applied when changing from state1 to state2.
     \code
     Transition {
-        fromState: "state1"
-        toState: "state2"
+        from: "state1"
+        to: "state2"
         ...
     }
     \endcode
diff --git a/src/declarative/util/qmltransition.h b/src/declarative/util/qmltransition.h
index 39b35ba..b09341d 100644
--- a/src/declarative/util/qmltransition.h
+++ b/src/declarative/util/qmltransition.h
@@ -61,8 +61,8 @@ class Q_DECLARATIVE_EXPORT QmlTransition : public QObject
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlTransition)
 
-    Q_PROPERTY(QString fromState READ fromState WRITE setFromState)
-    Q_PROPERTY(QString toState READ toState WRITE setToState)
+    Q_PROPERTY(QString from READ fromState WRITE setFromState)
+    Q_PROPERTY(QString to READ toState WRITE setToState)
     Q_PROPERTY(bool reversible READ reversible WRITE setReversible)
     Q_PROPERTY(QmlList<QmlAbstractAnimation *>* animations READ animations)
     Q_CLASSINFO("DefaultProperty", "animations")