Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 10 insertions, 10 deletions

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 5abf370..da290b7 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -35,6 +35,8 @@ Text elements: hAlign  -> horizontalAlignment
 Text elements: vAlign  -> verticalAlignment
 State: operations      -> changes
 Transition: operations -> animations
+Transition: fromState  -> from
+Transition: toState    -> to
 Follow: followValue    -> value
 
 Additions:
@@ -59,8 +61,6 @@ Pending Changes
 Renamed elements:
 
 Renamed properties:
-Transition: fromState  -> from
-Trnasition: toState    -> to
 
 Removed Properties:
 PropertyAction::property
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")