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

3 files changed, 9 insertions, 7 deletions

diff --git a/doc/src/declarative/animation.qdoc b/doc/src/declarative/animation.qdoc
index ef18de3..ba45d81 100644
--- a/doc/src/declarative/animation.qdoc
+++ b/doc/src/declarative/animation.qdoc
@@ -113,7 +113,7 @@ For example, a transition could describe how an item moves from its initial posi
 transitions: [
     Transition {
         NumberAnimation {
-            properties: "x,y"
+            matchProperties: "x,y"
             easing: "easeOutBounce"
             duration: 200
         }
@@ -123,7 +123,7 @@ transitions: [
 
 As you can see from the above example, transitions make use of the same basic animation classes introduced
 above. However, you generally use a different set of properties when working with transitions. In the example,
-no target or property has been specified. Instead, we have specified properties, which acts as a selector to
+no target or property has been specified. Instead, we have specified matchProperties, which acts as a selector to
 determine which property changes to animate; in this case, we will animate any x,y properties that have
 changed on any objects.
 
@@ -156,13 +156,13 @@ Transition {
             NumberAnimation {
                 duration: 1000
                 easing: "easeOutBounce"
-                target: box1
-                properties: "x,y"
+                matchTargets: box1
+                matchProperties: "x,y"
             }
             NumberAnimation {
                 duration: 1000
-                target: box2
-                properties: "x,y"
+                matchTargets: box2
+                matchProperties: "x,y"
             }
         }
     }
diff --git a/doc/src/declarative/focus.qdoc b/doc/src/declarative/focus.qdoc
index ec6a02f..6eca667 100644
--- a/doc/src/declarative/focus.qdoc
+++ b/doc/src/declarative/focus.qdoc
@@ -75,6 +75,8 @@ Item {
 
 \endlist
 
+See also the \l {Keys}{Keys attached property} and {KeyNavigation}{KeyNavigation attached property}.
+
 \section1 Querying the Active Focus Item
 
 Whether or not an \l Item has \e {active focus} can be queried through the
diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml
index 7970ede..b016f9a 100644
--- a/doc/src/snippets/declarative/listview/highlight.qml
+++ b/doc/src/snippets/declarative/listview/highlight.qml
@@ -30,7 +30,7 @@ Rectangle {
                 }
             ]
             transitions: [
-                Transition { NumberAnimation { properties: "x"; duration: 200 } }
+                Transition { NumberAnimation { matchProperties: "x"; duration: 200 } }
             ]
         }
     }