Renamed Flickable viewportXXX properties contentXXX

A viewport is the thing you look through, not what you look at.

7 files changed, 12 insertions, 12 deletions

diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml
index a7ba1c5..8f2655e 100644
--- a/examples/declarative/animations/easing.qml
+++ b/examples/declarative/animations/easing.qml
@@ -89,7 +89,7 @@ Rectangle {
     }
 
     Flickable {
-        anchors.fill: parent; viewportHeight: layout.height
+        anchors.fill: parent; contentHeight: layout.height
         Column {
             id: layout
             anchors.left: parent.left; anchors.right: parent.right
diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml
index f848be0..b76a9ab 100644
--- a/examples/declarative/listview/recipes.qml
+++ b/examples/declarative/listview/recipes.qml
@@ -81,7 +81,7 @@ Rectangle {
                 Flickable {
                     id: flick
                     anchors.top: methodTitle.bottom; anchors.bottom: parent.bottom
-                    width: parent.width; viewportHeight: methodText.height; clip: true
+                    width: parent.width; contentHeight: methodText.height; clip: true
                     Text { id: methodText; text: method; wrap: true; width: details.width }
                 }
                 Image {
@@ -114,7 +114,7 @@ Rectangle {
                 // Make the detailed view fill the entire list area
                 PropertyChanges { target: wrapper; height: list.height }
                 // Move the list so that this item is at the top.
-                PropertyChanges { target: wrapper.ListView.view; explicit: true; viewportY: wrapper.y }
+                PropertyChanges { target: wrapper.ListView.view; explicit: true; contentY: wrapper.y }
                 // Disallow flicking while we're in detailed view
                 PropertyChanges { target: wrapper.ListView.view; interactive: false }
             }
@@ -124,7 +124,7 @@ Rectangle {
                 ParallelAnimation {
                     ColorAnimation { property: "color"; duration: 500 }
                     NumberAnimation {
-                        duration: 300; properties: "detailsOpacity,x,viewportY,height,width"
+                        duration: 300; properties: "detailsOpacity,x,contentY,height,width"
                     }
                 }
             }
diff --git a/examples/declarative/parallax/qml/ParallaxView.qml b/examples/declarative/parallax/qml/ParallaxView.qml
index 811891b..5e58100 100644
--- a/examples/declarative/parallax/qml/ParallaxView.qml
+++ b/examples/declarative/parallax/qml/ParallaxView.qml
@@ -10,8 +10,8 @@ Item {
     Image {
         id: background
         fillMode: Image.TileHorizontally
-        x: -list.viewportX / 2
-        width: Math.max(list.viewportWidth, parent.width)
+        x: -list.contentX / 2
+        width: Math.max(list.contentWidth, parent.width)
     }
 
     ListView {
diff --git a/examples/declarative/progressbar/progressbars.qml b/examples/declarative/progressbar/progressbars.qml
index fdd4ca7..6530c3d 100644
--- a/examples/declarative/progressbar/progressbars.qml
+++ b/examples/declarative/progressbar/progressbars.qml
@@ -6,7 +6,7 @@ Rectangle {
     width: 600; height: 405; color: "#edecec"
 
     Flickable {
-        anchors.fill: parent; viewportHeight: column.height + 20
+        anchors.fill: parent; contentHeight: column.height + 20
         Column {
             id: column; x: 10; y: 10; spacing: 10
             Repeater {
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index a96db6e..84763d2 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -12,8 +12,8 @@ Rectangle {
             source: "pics/niagara_falls.jpg"
             asynchronous: true
         }
-        viewportWidth: picture.width
-        viewportHeight: picture.height
+        contentWidth: picture.width
+        contentHeight: picture.height
         // Only show the scrollbars when the view is moving.
         states: [
             State {
diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml
index 50d69d8..0d1881e 100644
--- a/examples/declarative/velocity/velocity.qml
+++ b/examples/declarative/velocity/velocity.qml
@@ -96,7 +96,7 @@ Rectangle {
     }
     Flickable {
         id: flickable
-        anchors.fill: parent; viewportWidth: lay.width
+        anchors.fill: parent; contentWidth: lay.width
         Row {
             id: lay
             Repeater {
diff --git a/examples/declarative/webview/qdeclarative-in-html.qml b/examples/declarative/webview/qdeclarative-in-html.qml
index a2f2f2a..77180ec 100644
--- a/examples/declarative/webview/qdeclarative-in-html.qml
+++ b/examples/declarative/webview/qdeclarative-in-html.qml
@@ -6,8 +6,8 @@ Rectangle {
     Flickable {
         width: parent.width
         height: parent.height/2
-        viewportWidth: web.width*web.scale
-        viewportHeight: web.height*web.scale
+        contentWidth: web.width*web.scale
+        contentHeight: web.height*web.scale
         WebView {
             id: web
             width: 250