Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 6 insertions, 8 deletions

diff --git a/examples/declarative/scrollbar/ScrollBar.qml b/examples/declarative/scrollbar/ScrollBar.qml
index c1c4a4f..b42563d 100644
--- a/examples/declarative/scrollbar/ScrollBar.qml
+++ b/examples/declarative/scrollbar/ScrollBar.qml
@@ -7,8 +7,8 @@ Item {
     // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
     // of the height of the view.
     // orientation can be either 'Vertical' or 'Horizontal'
-    property var position
-    property var pageSize
+    property real position
+    property real pageSize
     property var orientation : "Vertical"
 
     // A light, semi-transparent background
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 48cceb7..0180bda 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -38,22 +38,20 @@ Rectangle {
         id: SBV
         opacity: 0
         orientation: "Vertical"
-        position: View.pageYPosition
-        pageSize: View.pageHeight
+        position: View.visibleArea.yPosition
+        pageSize: View.visibleArea.heightRatio
         width: 12
         height: View.height-12
         anchors.right: View.right
     }
-           /*
     ScrollBar {
         id: SBH
         opacity: 0
         orientation: "Horizontal"
-        position: View.pageXPosition
-        pageSize: View.pageWidth
+        position: View.visibleArea.xPosition
+        pageSize: View.visibleArea.widthRatio
         height: 12
         width: View.width-12
         anchors.bottom: View.bottom
     }
-    */
 }