3 files changed, 15 insertions, 15 deletions
diff --git a/demos/declarative/contacts/contacts.qml b/demos/declarative/contacts/contacts.qml
index ebcab69..81d8352 100644
--- a/demos/declarative/contacts/contacts.qml
+++ b/demos/declarative/contacts/contacts.qml
@@ -101,7 +101,7 @@ Rectangle {
                         }
                         PropertyChanges {
                             target: contactListView
-                            yPosition: wrapper.y
+                            viewportY: wrapper.y
                         }
                         PropertyChanges {
                             target: contactListView
@@ -121,7 +121,7 @@ Rectangle {
                     Transition {
                         NumberAnimation {
                             duration: 500
-                            properties: "yPosition,height,opacity"
+                            properties: "viewportY,height,opacity"
                         }
                     }
                 ]
diff --git a/demos/declarative/flickr/common/ImageDetails.qml b/demos/declarative/flickr/common/ImageDetails.qml
index 8098273..dcd44eb 100644
--- a/demos/declarative/flickr/common/ImageDetails.qml
+++ b/demos/declarative/flickr/common/ImageDetails.qml
@@ -121,12 +121,12 @@ Flipable {
             id: Slider; x: 25; y: 374; visible: { BigImage.status == 1 && maximum > minimum }
             onValueChanged: {
                 if (BigImage.width * value > Flick.width) {
-                    var xoff = (Flick.width/2 + Flick.xPosition) * value / prevScale;
-                    Flick.xPosition = xoff - Flick.width/2;
+                    var xoff = (Flick.width/2 + Flick.viewportX) * value / prevScale;
+                    Flick.viewportX = xoff - Flick.width/2;
                 }
                 if (BigImage.height * value > Flick.height) {
-                    var yoff = (Flick.height/2 + Flick.yPosition) * value / prevScale;
-                    Flick.yPosition = yoff - Flick.height/2;
+                    var yoff = (Flick.height/2 + Flick.viewportY) * value / prevScale;
+                    Flick.viewportY = yoff - Flick.height/2;
                 }
                 prevScale = value;
             }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index ec3a2a0..126fa87 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -48,8 +48,8 @@ Item {
             anchors.bottom: Footer.top
         }
         RectSoftShadow {
-            x: -Flick.xPosition
-            y: -Flick.yPosition
+            x: -Flick.viewportX
+            y: -Flick.viewportY
             width: MyWebView.width*MyWebView.scale
             height: Flick.y+MyWebView.height*MyWebView.scale
         }
@@ -72,10 +72,10 @@ Item {
                 width: parent.width
                 height: 64
                 state: "Normal"
-                x: Flick.xPosition < 0 ? -Flick.xPosition : Flick.xPosition > Flick.viewportWidth-Flick.width
-                                         ? -Flick.xPosition+Flick.viewportWidth-Flick.width : 0
-                y: Flick.yPosition < 0 ? -Flick.yPosition : progressOff*
-                                        (Flick.yPosition>height?-height:-Flick.yPosition)
+                x: Flick.viewportX < 0 ? -Flick.viewportX : Flick.viewportX > Flick.viewportWidth-Flick.width
+                                         ? -Flick.viewportX+Flick.viewportWidth-Flick.width : 0
+                y: Flick.viewportY < 0 ? -Flick.viewportY : progressOff*
+                                        (Flick.viewportY>height?-height:-Flick.viewportY)
                 Text {
                     id: HeaderText
 
@@ -335,8 +335,8 @@ Item {
         State {
             name: "Normal"
             PropertyChanges { target: MyWebView; zoomedOut: 0 }
-            PropertyChanges { target: Flick; explicit: true; xPosition: Math.min(MyWebView.width-Flick.width,Math.max(0,Flick.centerX-Flick.width/2)) }
-            PropertyChanges { target: Flick; explicit: true; yPosition: Math.min(MyWebView.height-Flick.height,Math.max(0,Flick.centerY-Flick.height/2)) }
+            PropertyChanges { target: Flick; explicit: true; viewportX: Math.min(MyWebView.width-Flick.width,Math.max(0,Flick.centerX-Flick.width/2)) }
+            PropertyChanges { target: Flick; explicit: true; viewportY: Math.min(MyWebView.height-Flick.height,Math.max(0,Flick.centerY-Flick.height/2)) }
         },
         State {
             name: "ZoomedOut"
@@ -360,7 +360,7 @@ Item {
                     }
                     NumberAnimation {
                         target: Flick
-                        properties: "xPosition,yPosition"
+                        properties: "viewportX,viewportY"
                         easing: "easeInOutQuad"
                         duration: 200
                     }