Rename targets -> matchTargets and properties -> matchProperties.

22 files changed, 52 insertions, 52 deletions

diff --git a/examples/declarative/anchors/anchor-changes.qml b/examples/declarative/anchors/anchor-changes.qml
index f6fd35d..2ebe1c0 100644
--- a/examples/declarative/anchors/anchor-changes.qml
+++ b/examples/declarative/anchors/anchor-changes.qml
@@ -41,6 +41,6 @@ Item {
     }
 
     transitions : Transition {
-        NumberAnimation { properties: "y,height" }
+        NumberAnimation { matchProperties: "y,height" }
     }
 }
diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index 59e9b17..a9ba05f 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -80,8 +80,8 @@ Rectangle {
 
                 transitions: Transition {
                     ParallelAnimation {
-                        NumberAnimation { properties: "x"; easing: type; duration: 1000 }
-                        ColorAnimation { properties: "color"; easing: type; duration: 1000 }
+                        NumberAnimation { matchProperties: "x"; easing: type; duration: 1000 }
+                        ColorAnimation { matchProperties: "color"; easing: type; duration: 1000 }
                     }
                 }
             }
diff --git a/examples/declarative/behaviours/test.qml b/examples/declarative/behaviours/test.qml
index 946559b..4a44fd7 100644
--- a/examples/declarative/behaviours/test.qml
+++ b/examples/declarative/behaviours/test.qml
@@ -61,7 +61,7 @@ Rectangle {
                 SequentialAnimation {
                     NumberAnimation {
                         target: bluerect
-                        properties: "y"
+                        property: "y"
                         from: 0
                         to: 10
                         easing: "easeOutBounce(amplitude:30)"
@@ -69,7 +69,7 @@ Rectangle {
                     }
                     NumberAnimation {
                         target: bluerect
-                        properties: "y"
+                        property: "y"
                         from: 10
                         to: 0
                         easing: "easeOutBounce(amplitude:30)"
@@ -83,14 +83,14 @@ Rectangle {
             SequentialAnimation {
                 NumberAnimation {
                     target: bluerect
-                    properties: "opacity"
+                    property: "opacity"
                     to: 0
                     duration: 150
                 }
                 PropertyAction {}
                 NumberAnimation {
                     target: bluerect
-                    properties: "opacity"
+                    property: "opacity"
                     to: 1
                     duration: 150
                 }
diff --git a/examples/declarative/layouts/Button.qml b/examples/declarative/layouts/Button.qml
index 44d0c7b..215b536 100644
--- a/examples/declarative/layouts/Button.qml
+++ b/examples/declarative/layouts/Button.qml
@@ -17,6 +17,6 @@ Rectangle { border.color: "black"; color: "steelblue"; radius: 5; width: pix.wid
 
     transitions:
         Transition{
-            NumberAnimation { properties:"x,left"; easing:"easeInOutQuad"; duration:200 }
+            NumberAnimation { matchProperties:"x,left"; easing:"easeInOutQuad"; duration:200 }
         }
 }
diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml
index 90efde2..129effe 100644
--- a/examples/declarative/layouts/positioners.qml
+++ b/examples/declarative/layouts/positioners.qml
@@ -11,17 +11,17 @@ Rectangle {
         y: 0
         move: Transition {
             NumberAnimation {
-                properties: "y"; easing: "easeOutBounce"
+                matchProperties: "y"; easing: "easeOutBounce"
             }
         }
         add: Transition {
             NumberAnimation {
-                properties: "y"; from: 500; duration:500; easing: "easeOutQuad"
+                matchProperties: "y"; from: 500; duration:500; easing: "easeOutQuad"
             }
         }
         remove: Transition {
             NumberAnimation {
-                properties:"y"; to: 500; duration:500; easing: "easeInQuad"
+                matchProperties:"y"; to: 500; duration:500; easing: "easeInQuad"
             }
         }
         Rectangle { color: "red"; width: 100; height: 50; border.color: "black"; radius: 15 }
@@ -36,23 +36,23 @@ Rectangle {
         y: 300 
         move: Transition {
             NumberAnimation {
-                properties: "x"; easing: "easeOutBounce"
+                matchProperties: "x"; easing: "easeOutBounce"
             }
         }
         add: Transition {
             NumberAnimation {
-                properties: "x"; from: 500; duration:500; easing: "easeOutQuad"
+                matchProperties: "x"; from: 500; duration:500; easing: "easeOutQuad"
             }
             NumberAnimation {
-                properties: "opacity"; from: 0;  duration: 500;
+                matchProperties: "opacity"; from: 0;  duration: 500;
             }
         }
         remove: Transition {
             NumberAnimation {
-                properties: "x"; to: 500; duration:500; easing: "easeInQuad"
+                matchProperties: "x"; to: 500; duration:500; easing: "easeInQuad"
             }
             NumberAnimation {
-                properties: "opacity"; from: 1; duration: 500
+                matchProperties: "opacity"; from: 1; duration: 500
             }
         }
         Rectangle { color: "red"; width: 50; height: 100; border.color: "black"; radius: 15 }
@@ -103,25 +103,25 @@ Rectangle {
 
         remove: Transition {
             NumberAnimation {
-                properties: "opacity"; from: 1; to: 0; duration: 500
+                matchProperties: "opacity"; from: 1; to: 0; duration: 500
             }
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                matchProperties: "x,y"; easing: "easeOutBounce"
             }
         }
 
         move: Transition {
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                matchProperties: "x,y"; easing: "easeOutBounce"
             }
         }
 
         add: Transition {
             NumberAnimation {
-                properties: "opacity"; from: 0; to: 1; duration: 500
+                matchProperties: "opacity"; from: 0; to: 1; duration: 500
             }
             NumberAnimation {
-                properties: "x,y"; easing: "easeOutBounce"
+                matchProperties: "x,y"; easing: "easeOutBounce"
             }
         }
 
diff --git a/examples/declarative/listview/dynamic.qml b/examples/declarative/listview/dynamic.qml
index 2607527..101b708 100644
--- a/examples/declarative/listview/dynamic.qml
+++ b/examples/declarative/listview/dynamic.qml
@@ -122,7 +122,7 @@ Rectangle {
                 PropertyChanges { target: verticalScrollBar; opacity: 1 }
             }
         ]
-        transitions: [ Transition { NumberAnimation { properties: "opacity"; duration: 400 } } ]
+        transitions: [ Transition { NumberAnimation { matchProperties: "opacity"; duration: 400 } } ]
     }
 
     Row {
diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml
index be1f62d..9665499 100644
--- a/examples/declarative/listview/highlight.qml
+++ b/examples/declarative/listview/highlight.qml
@@ -31,7 +31,7 @@ Rectangle {
             transitions: [
                 Transition {
                     NumberAnimation {
-                        properties: "x"; duration: 200
+                        matchProperties: "x"; duration: 200
                     }
                 }
             ]
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index 3410f56..c133351 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -124,7 +124,7 @@ Rectangle {
                 ParallelAnimation {
                     ColorAnimation { property: "color"; duration: 500 }
                     NumberAnimation {
-                        duration: 300; properties: "detailsOpacity,x,viewportY,height,width"
+                        duration: 300; matchProperties: "detailsOpacity,x,viewportY,height,width"
                     }
                 }
             }
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 9139346..f3a1182 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -132,12 +132,12 @@ Rectangle {
             Transition {
                 to: "current"
                 SequentialAnimation {
-                    NumberAnimation { properties: "x"; duration: 250 }
+                    NumberAnimation { matchProperties: "x"; duration: 250 }
                 }
             },
             Transition {
-                NumberAnimation { properties: "x"; duration: 250 }
-                NumberAnimation { properties: "x"; duration: 250 }
+                NumberAnimation { matchProperties: "x"; duration: 250 }
+                NumberAnimation { matchProperties: "x"; duration: 250 }
             }
         ]
     }
@@ -171,11 +171,11 @@ Rectangle {
             Transition {
                 to: "current"
                 SequentialAnimation {
-                    NumberAnimation { properties: "x"; duration: 250 }
+                    NumberAnimation { matchProperties: "x"; duration: 250 }
                 }
             },
             Transition {
-                NumberAnimation { properties: "x"; duration: 250 }
+                NumberAnimation { matchProperties: "x"; duration: 250 }
             }
         ]
     }
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
index ac84b47..98dd246 100644
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/parallax/qml/ParallaxView.qml
@@ -80,7 +80,7 @@ Item {
             }
             transitions: Transition {
                 NumberAnimation {
-                    properties: "scale,y"
+                    matchProperties: "scale,y"
                 }
              }
         }
diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml
index 802b537..f68775c 100644
--- a/examples/declarative/scrollbar/ScrollBar.qml
+++ b/examples/declarative/scrollbar/ScrollBar.qml
@@ -2,7 +2,7 @@ import Qt 4.6
 
 Item {
     id: scrollBar
-    // The properties that define the scrollbar's state.
+    // The matchProperties that define the scrollbar's state.
     // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
     // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
     // of the height of the view.
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 536a8b7..0b9f95a 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -27,7 +27,7 @@ Rectangle {
                 from: "*"
                 to: "*"
                 NumberAnimation {
-                    properties: "opacity"
+                    matchProperties: "opacity"
                     duration: 400
                 }
             }
diff --git a/examples/declarative/searchbox/SearchBox.qml b/examples/declarative/searchbox/SearchBox.qml
index 7077a11..42b5d67 100644
--- a/examples/declarative/searchbox/SearchBox.qml
+++ b/examples/declarative/searchbox/SearchBox.qml
@@ -50,11 +50,11 @@ FocusScope {
     transitions: [
         Transition {
             from: ""; to: "hasText"
-            NumberAnimation { exclude: typeSomething; properties: "opacity" }
+            NumberAnimation { exclude: typeSomething; matchProperties: "opacity" }
         },
         Transition {
             from: "hasText"; to: ""
-            NumberAnimation { properties: "opacity" }
+            NumberAnimation { matchProperties: "opacity" }
         }
     ]
 }
diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml
index 1620805..4e13976 100644
--- a/examples/declarative/slideswitch/Switch.qml
+++ b/examples/declarative/slideswitch/Switch.qml
@@ -52,7 +52,7 @@ Item {
     ]
     transitions: [
         Transition {
-            NumberAnimation { properties: "x"; easing: "easeInOutQuad"; duration: 200 }
+            NumberAnimation { matchProperties: "x"; easing: "easeInOutQuad"; duration: 200 }
         }
     ]
 }
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml
index 95b9b97..1d738b2 100644
--- a/examples/declarative/snow/ImageBatch.qml
+++ b/examples/declarative/snow/ImageBatch.qml
@@ -23,7 +23,7 @@ GridView {
     transitions: Transition {
         SequentialAnimation {
             PauseAnimation { duration: 150 }
-            PropertyAction { properties: "z" }
+            PropertyAction { matchProperties: "z" }
         }
     }
     model: XmlListModel {
@@ -42,7 +42,7 @@ GridView {
         width: grid.imageWidth; height: grid.imageHeight;
 
         Image { id: flickrImage; source: url; fillMode: Image.PreserveAspectFit; smooth: true; anchors.fill: parent;
-                opacity: (status == Image.Ready)?1:0; opacity: Behavior { NumberAnimation { properties: "opacity" } } }
+                opacity: (status == Image.Ready)?1:0; opacity: Behavior { NumberAnimation { } } }
         Loading { anchors.centerIn: parent; visible: flickrImage.status!=1 }
 
         states: State {
@@ -55,15 +55,15 @@ GridView {
                 to: "selected"
                 SequentialAnimation {
                     PauseAnimation { duration: 150 }
-                    PropertyAction { properties: "z" }
-                    NumberAnimation { properties: "scale"; duration: 150; }
+                    PropertyAction { matchProperties: "z" }
+                    NumberAnimation { matchProperties: "scale"; duration: 150; }
                 }
             },
             Transition {
                 from: "selected"
                 SequentialAnimation {
-                    NumberAnimation { properties: "scale"; duration: 150 }
-                    PropertyAction { properties: "z" }
+                    NumberAnimation { matchProperties: "scale"; duration: 150 }
+                    PropertyAction { matchProperties: "z" }
                 }
             }
         ]
diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml
index ba97d9be..925d90e 100644
--- a/examples/declarative/states/transitions.qml
+++ b/examples/declarative/states/transitions.qml
@@ -48,23 +48,23 @@ Rectangle {
         }
     ]
 
-    // transitions define how the properties change.
+    // transitions define how the matchProperties change.
     transitions: [
         // When transitioning to 'Position1' move x,y over a duration of 1 second,
         // with easeOutBounce easing function.
         Transition {
             from: "*"; to: "Position1"
-            NumberAnimation { properties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
+            NumberAnimation { matchProperties: "x,y"; easing: "easeOutBounce"; duration: 1000 }
         },
         // When transitioning to 'Position2' move x,y over a duration of 2 seconds,
         // with easeInOutQuad easing function.
         Transition {
             from: "*"; to: "Position2"
-            NumberAnimation { properties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
+            NumberAnimation { matchProperties: "x,y"; easing: "easeInOutQuad"; duration: 2000 }
         },
         // For any other state changes move x,y linearly over duration of 200ms.
         Transition {
-            NumberAnimation { properties: "x,y"; duration: 200 }
+            NumberAnimation { matchProperties: "x,y"; duration: 200 }
         }
     ]
 }
diff --git a/examples/declarative/tutorials/helloworld/tutorial3.qml b/examples/declarative/tutorials/helloworld/tutorial3.qml
index 534d663..52c3fe8 100644
--- a/examples/declarative/tutorials/helloworld/tutorial3.qml
+++ b/examples/declarative/tutorials/helloworld/tutorial3.qml
@@ -28,7 +28,7 @@ Rectangle {
         transitions: Transition {
             from: ""; to: "down"; reversible: true
             ParallelAnimation {
-                NumberAnimation { properties: "y,rotation"; duration: 500; easing: "easeInOutQuad" }
+                NumberAnimation { matchProperties: "y,rotation"; duration: 500; easing: "easeInOutQuad" }
                 ColorAnimation { property: "color"; duration: 500 }
             }
         }
diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
index 4c2ba43..2eb2ceb 100644
--- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml
@@ -24,7 +24,7 @@ Item { id:block
             }
         }
         opacity: 0
-        opacity: Behavior { NumberAnimation { properties:"opacity"; duration: 200 } }
+        opacity: Behavior { NumberAnimation { matchProperties:"opacity"; duration: 200 } }
         anchors.fill: parent
     }
     //![2]
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index 030fa13..3a7ffa9 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -71,7 +71,7 @@ Rectangle {
             }
 
             transitions: Transition {
-                NumberAnimation { properties: "rotation,scale"; duration: 200 }
+                NumberAnimation { matchProperties: "rotation,scale"; duration: 200 }
             }
         }
     }
diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml
index 74c6844..1614906 100644
--- a/examples/declarative/webview/autosize.qml
+++ b/examples/declarative/webview/autosize.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 // The WebView size is determined by the width, height,
-// preferredWidth, and preferredHeight properties.
+// preferredWidth, and preferredHeight matchProperties.
 Rectangle {
     id: rect
     color: "white"
diff --git a/examples/declarative/webview/content/FieldText.qml b/examples/declarative/webview/content/FieldText.qml
index b1c1938..6b1d271 100644
--- a/examples/declarative/webview/content/FieldText.qml
+++ b/examples/declarative/webview/content/FieldText.qml
@@ -149,7 +149,7 @@ Item {
         to: "*"
         reversible: true
         NumberAnimation {
-            properties: "opacity,leftMargin,rightMargin"
+            matchProperties: "opacity,leftMargin,rightMargin"
             duration: 200
         }
         ColorAnimation {
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index 7d8b8a2..4add361 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -61,8 +61,8 @@ Rectangle {
                 transitions: Transition {
                     from: "*"; to: "Details"; reversible: true
                     SequentialAnimation {
-                        NumberAnimation { duration: 200; properties: "height"; easing: "easeOutQuad" }
-                        NumberAnimation { duration: 200; properties: "opacity" }
+                        NumberAnimation { duration: 200; matchProperties: "height"; easing: "easeOutQuad" }
+                        NumberAnimation { duration: 200; matchProperties: "opacity" }
                     }
                 }
             }