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

Conflicts:
	src/declarative/fx/qfxpositioners.cpp

12 files changed, 22 insertions, 20 deletions

diff --git a/examples/declarative/clock/display.qml b/examples/declarative/clock/display.qml
index cd6dcf7..00af9b3 100644
--- a/examples/declarative/clock/display.qml
+++ b/examples/declarative/clock/display.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rect {
-    width: contents.width
-    height: contents.height
+    width: childrenRect.width
+    height: childrenRect.height
     Clock { id: Clock }
 }
diff --git a/examples/declarative/dial/dial.qml b/examples/declarative/dial/dial.qml
index 3773bcc..75bd9b1 100644
--- a/examples/declarative/dial/dial.qml
+++ b/examples/declarative/dial/dial.qml
@@ -26,7 +26,7 @@ Rect {
             }
             MouseRegion {
                 anchors.fill: parent
-                drag.target: parent; drag.axis: "x"; drag.xmin: 2; drag.xmax: 128
+                drag.target: parent; drag.axis: "x"; drag.minimumX: 2; drag.maximumX: 128
             }
         }
     }
diff --git a/examples/declarative/minehunt/Description.qml b/examples/declarative/minehunt/Description.qml
index 9ad6522..cf02bff 100644
--- a/examples/declarative/minehunt/Description.qml
+++ b/examples/declarative/minehunt/Description.qml
@@ -8,10 +8,10 @@ Item {
         anchors.fill: parent
         drag.target: Page
         drag.axis: "xy"
-        drag.xmin: 0
-        drag.xmax: 1000
-        drag.ymin: 0
-        drag.ymax: 1000
+        drag.minimumX: 0
+        drag.maximumX: 1000
+        drag.minimumY: 0
+        drag.maximumY: 1000
     }
     Rect {
         radius: 10
diff --git a/examples/declarative/mouseregion/mouse.qml b/examples/declarative/mouseregion/mouse.qml
index d9db106..34c6e66 100644
--- a/examples/declarative/mouseregion/mouse.qml
+++ b/examples/declarative/mouseregion/mouse.qml
@@ -25,8 +25,8 @@ Rect {
         MouseRegion {
             drag.target: parent
             drag.axis: "x"
-            drag.xmin: 0
-            drag.xmax: 150
+            drag.minimumX: 0
+            drag.maximumX: 150
             onPressed: { print('press') }
             onReleased: { print('release (isClick: ' + mouse.isClick + ') (wasHeld: ' + mouse.wasHeld + ')') }
             onClicked: { print('click' + '(wasHeld: ' + mouse.wasHeld + ')') }
diff --git a/examples/declarative/scrollbar/display.qml b/examples/declarative/scrollbar/display.qml
index 03a40d3..d8bd187 100644
--- a/examples/declarative/scrollbar/display.qml
+++ b/examples/declarative/scrollbar/display.qml
@@ -44,6 +44,7 @@ Rect {
         height: View.height-12
         anchors.right: View.right
     }
+           /*
     ScrollBar {
         id: SBH
         opacity: 0
@@ -54,4 +55,5 @@ Rect {
         width: View.width-12
         anchors.bottom: View.bottom
     }
+    */
 }
diff --git a/examples/declarative/slideswitch/Switch.qml b/examples/declarative/slideswitch/Switch.qml
index 91627c7..b5de9ec 100644
--- a/examples/declarative/slideswitch/Switch.qml
+++ b/examples/declarative/slideswitch/Switch.qml
@@ -36,7 +36,7 @@ Item {
         anchors.fill: Knob
         onClicked: { toggle() }
         onReleased: { dorelease() }
-        drag.target: Knob; drag.axis: "x"; drag.xmin: 1; drag.xmax: 78
+        drag.target: Knob; drag.axis: "x"; drag.minimumX: 1; drag.maximumX: 78
     }
     states: [
         State {
diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml
index a70ef16..1087d6a 100644
--- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml
+++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml
@@ -7,7 +7,7 @@ Rect {
     color: "white"
     VerticalPositioner {
         id: layout
-        width: contents.width
+        width: childrenRect.width
         GroupBox {
             contents: "1/RemoveButton.qml"
             label: "Rectangle Component"
diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml
index 7ac513e..70b8b95 100644
--- a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml
+++ b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml
@@ -9,7 +9,7 @@ Rect {
         id: layout
         columns: 2
         rows: 4
-        width: contents.width
+        width: childrenRect.width
         GroupBox {
             contents: "1/ContactField.qml"
             label: "Loading: simple"
diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml
index d61705c..5a22b1c 100644
--- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml
+++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml
@@ -13,8 +13,8 @@ Rect {
     // component removes focus from any previous element
     GridPositioner {
         id: layout
-        width: contents.width
-        height: contents.height
+        width: childrenRect.width
+        height: childrenRect.height
         GroupBox {
             contents: "1/ContactView.qml"
             label: "list only"
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index 59a31af..c959b0c 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -71,10 +71,10 @@ Rect {
                         anchors.fill: parent
                         drag.target: StickyPage
                         drag.axis: "xy"
-                        drag.ymin: 0
-                        drag.ymax: 500
-                        drag.xmin: 0
-                        drag.xmax: 400
+                        drag.minimumY: 0
+                        drag.maximumY: 500
+                        drag.minimumX: 0
+                        drag.maximumX: 400
                     }
                 }
             }
diff --git a/examples/declarative/xmldata/daringfireball.qml b/examples/declarative/xmldata/daringfireball.qml
index 4fb12af..a93483e 100644
--- a/examples/declarative/xmldata/daringfireball.qml
+++ b/examples/declarative/xmldata/daringfireball.qml
@@ -26,7 +26,7 @@ Rect {
         Component {
             id: feedDelegate
             Item {
-                height: contents.height + 20
+                height: childrenRect.height + 20
                 Text {
                     x: 10
                     id: TitleText
diff --git a/examples/declarative/xmldata/yahoonews.qml b/examples/declarative/xmldata/yahoonews.qml
index 156eb31..22586b8 100644
--- a/examples/declarative/xmldata/yahoonews.qml
+++ b/examples/declarative/xmldata/yahoonews.qml
@@ -66,7 +66,7 @@ Rect {
                     states: [
                         State {
                             name: "Details"
-                            SetProperties { target: Wrapper; height: contents.height + 10 }
+                            SetProperties { target: Wrapper; height: childrenRect.height + 10 }
                             SetProperties { target: Description; opacity: 1 } 
                         }
                     ]