Get rid of the matchProperties/properties distinction, as it

has proven to be confusing in practice.

property/target and properties/targets will be functionally equivilant
(the only distinction being singular/plural). In a transition these
properties can be used for both 'matching' and explicit animation
based on whether a 'to' value is supplied.

The documentation, tests, examples and demos have been updated as well.

2 files changed, 5 insertions, 5 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
index 4116817..6857eae 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflipable.cpp
@@ -94,7 +94,7 @@ public:
         }
 
         transitions: Transition {
-            NumberAnimation { matchProperties: "angle"; duration: 2000 }
+            NumberAnimation { properties: "angle"; duration: 2000 }
         }
 
         MouseRegion {
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
index 142cdce..4905a30 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp
@@ -361,7 +361,7 @@ Column {
 Column {
     move: Transition {
         NumberAnimation {
-            matchProperties: "y"
+            properties: "y"
             ease: "easeOutBounce"
         }
     }
@@ -470,7 +470,7 @@ Row {
     id: positioner
     move: Transition {
         NumberAnimation {
-            matchProperties: "x"
+            properties: "x"
             ease: "easeOutBounce"
         }
     }
@@ -592,7 +592,7 @@ Grid {
 Grid {
     move: Transition {
         NumberAnimation {
-            matchProperties: "x,y"
+            properties: "x,y"
             ease: "easeOutBounce"
         }
     }
@@ -737,7 +737,7 @@ Flow {
     id: positioner
     move: Transition {
         NumberAnimation {
-            matchProperties: "x,y"
+            properties: "x,y"
             ease: "easeOutBounce"
         }
     }