Update SetProperties to handle changing bindings

Also removed all uses of SetProperty

3 files changed, 6 insertions, 11 deletions

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index ccc91cb..d17e323 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -129,7 +129,7 @@ Flipable {
     states: [
         State {
             name: "Back"
-            SetProperty { target: Container; property: "rotation"; value: 180 }
+            SetProperties { target: Container; rotation: 180 }
         }
     ]
 
diff --git a/demos/declarative/flickr/content/MediaLineEdit.qml b/demos/declarative/flickr/content/MediaLineEdit.qml
index 691bb5b..65c2b38 100644
--- a/demos/declarative/flickr/content/MediaLineEdit.qml
+++ b/demos/declarative/flickr/content/MediaLineEdit.qml
@@ -14,10 +14,9 @@ Item {
                 target: Label
                 text: Container.label + ": "
             }
-            SetProperty {
+            SetProperties {
                 target: Label
-                property: "x"
-                binding: 10
+                x: 10
             }
             SetProperties {
                 target: Editor
diff --git a/demos/declarative/flickr/flickr2.qml b/demos/declarative/flickr/flickr2.qml
index 79f7a32..2f4c823 100644
--- a/demos/declarative/flickr/flickr2.qml
+++ b/demos/declarative/flickr/flickr2.qml
@@ -48,7 +48,6 @@ Item {
                     Script {
                         function photoClicked() {
                             Background.imageDetails.photoTitle = title;
-                            Background.imageDetails.flickableArea.yPosition = 0;
                             Background.imageDetails.photoDescription = description;
                             Background.imageDetails.photoTags = tags;
                             Background.imageDetails.photoWidth = photoWidth;
@@ -129,15 +128,12 @@ Item {
                     states: [
                         State {
                             name: "gridView"
-                            SetProperty { target: Wrapper; property: "moveToParent"; value: GridViewPackage }
+                            SetProperties { target: Wrapper; explicit: true; property: "moveToParent"; value: GridViewPackage }
                         },
                         State {
                             name: "pathView"
-                            SetProperty { target: Wrapper; property: "scale"; value: PathViewPackage.PathView.scale }
-                            SetProperty { target: Wrapper; property: "scale"; binding: "PathViewPackage.PathView.scale" }
-                            SetProperty { target: Wrapper; property: "angle"; value: PathViewPackage.PathView.angle }
-                            SetProperty { target: Wrapper; property: "angle"; binding: "PathViewPackage.PathView.angle" }
-                            SetProperty { target: Wrapper; property: "moveToParent"; value: PathViewPackage }
+                            SetProperties { target: Wrapper; scale: PathViewPackage.PathView.scale; angle: PathViewPackage.PathView.angle; }
+                            SetProperties { target: Wrapper; explicit: true; moveToParent: PathViewPackage }
                         }
                     ]
                     transitions: [