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

12 files changed, 62 insertions, 62 deletions

diff --git a/tests/auto/declarative/visual/ListView/basic1.qml b/tests/auto/declarative/visual/ListView/basic1.qml
index 85934dc..3c371a6 100644
--- a/tests/auto/declarative/visual/ListView/basic1.qml
+++ b/tests/auto/declarative/visual/ListView/basic1.qml
@@ -4,7 +4,7 @@ Rectangle {
     color: "blue"
     width: 200
     height: 300
-    id: Page
+    id: page
     ListView {
         anchors.fill: parent
         delegate: Rectangle {
diff --git a/tests/auto/declarative/visual/ListView/basic2.qml b/tests/auto/declarative/visual/ListView/basic2.qml
index 4fe63ac..bdba65e 100644
--- a/tests/auto/declarative/visual/ListView/basic2.qml
+++ b/tests/auto/declarative/visual/ListView/basic2.qml
@@ -4,9 +4,9 @@ Rectangle {
     color: "blue"
     width: 200
     height: 300
-    id: Page
+    id: page
     Component {
-        id: Delegate
+        id: delegate
         Rectangle {
             color: "red"
             width: 100
@@ -18,7 +18,7 @@ Rectangle {
     }
     ListView {
         anchors.fill: parent
-        delegate: Delegate
+        delegate: delegate
         model: ListModel {
             ListElement {
                 name: "January"
diff --git a/tests/auto/declarative/visual/ListView/basic3.qml b/tests/auto/declarative/visual/ListView/basic3.qml
index c0705e9..05ac358 100644
--- a/tests/auto/declarative/visual/ListView/basic3.qml
+++ b/tests/auto/declarative/visual/ListView/basic3.qml
@@ -4,9 +4,9 @@ Rectangle {
     color: "blue"
     width: 200
     height: 300
-    id: Page
-    ListModel {
-        id: Model
+    id: page
+    Listmodel {
+        id: model
         ListElement {
             name: "January"
         }
@@ -16,7 +16,7 @@ Rectangle {
     }
     ListView {
         anchors.fill: parent
-        model: Model
+        model: model
         delegate: Rectangle {
             color: "red"
             width: 100
diff --git a/tests/auto/declarative/visual/ListView/basic4.qml b/tests/auto/declarative/visual/ListView/basic4.qml
index c8e1bcc..3628bd3 100644
--- a/tests/auto/declarative/visual/ListView/basic4.qml
+++ b/tests/auto/declarative/visual/ListView/basic4.qml
@@ -4,9 +4,9 @@ Rectangle {
     color: "blue"
     width: 200
     height: 300
-    id: Page
-    ListModel {
-        id: Model
+    id: page
+    Listmodel {
+        id: model
         ListElement {
             name: "January"
         }
@@ -15,7 +15,7 @@ Rectangle {
         }
     }
     Component {
-        id: Delegate
+        id: delegate
         Rectangle {
             color: "red"
             width: 100
@@ -27,7 +27,7 @@ Rectangle {
     }
     ListView {
         anchors.fill: parent
-        model: Model
-        delegate: Delegate
+        model: model
+        delegate: delegate
     }
 }
diff --git a/tests/auto/declarative/visual/Package_Views/packageviews.qml b/tests/auto/declarative/visual/Package_Views/packageviews.qml
index ece6b88..c8016b6 100644
--- a/tests/auto/declarative/visual/Package_Views/packageviews.qml
+++ b/tests/auto/declarative/visual/Package_Views/packageviews.qml
@@ -6,9 +6,9 @@ Rectangle {
     height: 200
     color: "black"
 
-    VisualDataModel {
-        id: Model
-        model: ListModel {
+    VisualDatamodel {
+        id: model
+        model: Listmodel {
             ListElement { itemColor: "red" }
             ListElement { itemColor: "green" }
             ListElement { itemColor: "blue" }
@@ -75,7 +75,7 @@ Rectangle {
     ListView {
         width: parent.width/2
         height: parent.height
-        model: Model.parts.list
+        model: model.parts.list
     }
 
     GridView {
@@ -84,6 +84,6 @@ Rectangle {
         cellWidth: 50
         cellHeight: 50
         height: parent.height
-        model: Model.parts.grid
+        model: model.parts.grid
     }
 }
diff --git a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml b/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
index 1afd4cd..732eb59 100644
--- a/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
+++ b/tests/auto/declarative/visual/animation/bindinganimation/bindinganimation.qml
@@ -4,9 +4,9 @@ Rectangle {
     color: "blue"
     width: 320
     height: 240
-    id: Page
+    id: page
     Rectangle {
-        id: MyRectangle
+        id: myRectangle
         width: 100
         height: 100
         color: "red"
@@ -16,12 +16,12 @@ Rectangle {
         State {
             name: "hello"
             PropertyChanges {
-                target: MyRectangle
+                target: myRectangle
                 x: 50 + 50
             }
             PropertyChanges {
-                target: MyMouseRegion
-                onClicked: Page.state = ''
+                target: myMouseRegion
+                onClicked: page.state = ''
             }
         }
     ]
@@ -33,8 +33,8 @@ Rectangle {
         }
     ]
     MouseRegion {
-        id: MyMouseRegion
+        id: myMouseRegion
         anchors.fill: parent
-        onClicked: { Page.state= 'hello' }
+        onClicked: { page.state= 'hello' }
     }
 }
diff --git a/tests/auto/declarative/visual/animation/parentAction/parentAction.qml b/tests/auto/declarative/visual/animation/parentAction/parentAction.qml
index e69d234..1e3f402 100644
--- a/tests/auto/declarative/visual/animation/parentAction/parentAction.qml
+++ b/tests/auto/declarative/visual/animation/parentAction/parentAction.qml
@@ -8,7 +8,7 @@ Rectangle {
         transformOrigin: "Center"
         x: 10; y: 10
         Rectangle {
-            id: MyRect
+            id: myRect
             x: 5
             width: 100; height: 100
             transformOrigin: "BottomLeft"
@@ -16,7 +16,7 @@ Rectangle {
         }
     }
     MouseRegion {
-        id: Clickable
+        id: clickable
         anchors.fill: parent
     }
 
@@ -32,13 +32,13 @@ Rectangle {
 
     states: State {
         name: "moved"
-        when: Clickable.pressed
+        when: clickable.pressed
         ParentChange {
-            target: MyRect
+            target: myRect
             parent: newParent
         }
         PropertyChanges {
-            target: MyRect
+            target: myRect
             rotation: -52
             scale: 1
             color: "blue"
diff --git a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
index a9d3c74..b670166 100644
--- a/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
+++ b/tests/auto/declarative/visual/animation/propertyAction/propertyAction.qml
@@ -3,20 +3,20 @@ import Qt 4.6
 Rectangle {
     width: 400; height: 400
     Rectangle {
-        id: MyRect
+        id: myRect
         width: 100; height: 100
         color: "red"
     }
     MouseRegion {
-        id: Clickable
+        id: clickable
         anchors.fill: parent
     }
 
     states: State {
         name: "state1"
-        when: Clickable.pressed
+        when: clickable.pressed
         PropertyChanges {
-            target: MyRect
+            target: myRect
             x: 50; y: 50
             color: "blue"
         }
diff --git a/tests/auto/declarative/visual/focusscope/test.qml b/tests/auto/declarative/visual/focusscope/test.qml
index dd6d726..401c7dc 100644
--- a/tests/auto/declarative/visual/focusscope/test.qml
+++ b/tests/auto/declarative/visual/focusscope/test.qml
@@ -8,7 +8,7 @@ Rectangle {
     Keys.onDigit9Pressed: console.log("Error - Root")
 
     FocusScope {
-        id: MyScope
+        id: myScope
         focus: true
 
         Keys.onDigit9Pressed: console.log("Error - FocusScope")
@@ -19,16 +19,16 @@ Rectangle {
 
             color: "transparent"
             border.width: 5
-            border.color: MyScope.wantsFocus?"blue":"black"
+            border.color: myScope.wantsFocus?"blue":"black"
 
             Rectangle {
-                id: Item1
+                id: item1
                 x: 10; y: 10 
                 width: 100; height: 100; color: "green"
                 border.width: 5
                 border.color: wantsFocus?"blue":"black"
                 Keys.onDigit9Pressed: console.log("Top Left");
-                KeyNavigation.right: Item2
+                KeyNavigation.right: item2
                 focus: true 
 
                 Rectangle {
@@ -38,12 +38,12 @@ Rectangle {
             }
 
             Rectangle {
-                id: Item2
+                id: item2
                 x: 310; y: 10
                 width: 100; height: 100; color: "green"
                 border.width: 5
                 border.color: wantsFocus?"blue":"black"
-                KeyNavigation.left: Item1
+                KeyNavigation.left: item1
                 Keys.onDigit9Pressed: console.log("Top Right");
 
                 Rectangle {
@@ -52,20 +52,20 @@ Rectangle {
                 }
             }
         }
-        KeyNavigation.down: Item3
+        KeyNavigation.down: item3
     }
 
     Text { x:100; y:170; text: "Blue border indicates scoped focus\nBlack border indicates NOT scoped focus\nRed box indicates active focus\nUse arrow keys to navigate\nPress \"9\" to print currently focused item" }
 
     Rectangle {
-        id: Item3
+        id: item3
         x: 10; y: 300
         width: 100; height: 100; color: "green"
         border.width: 5
         border.color: wantsFocus?"blue":"black"
 
         Keys.onDigit9Pressed: console.log("Bottom Left");
-        KeyNavigation.up: MyScope
+        KeyNavigation.up: myScope
 
         Rectangle {
             width: 50; height: 50; anchors.centerIn: parent
diff --git a/tests/auto/declarative/visual/focusscope/test3.qml b/tests/auto/declarative/visual/focusscope/test3.qml
index 4be9dc7..855bdc5 100644
--- a/tests/auto/declarative/visual/focusscope/test3.qml
+++ b/tests/auto/declarative/visual/focusscope/test3.qml
@@ -5,8 +5,8 @@ Rectangle {
     width: 800
     height: 600
 
-    ListModel {
-        id: Model
+    Listmodel {
+        id: model
         ListElement { name: "1" }
         ListElement { name: "2" }
         ListElement { name: "3" }
@@ -19,16 +19,16 @@ Rectangle {
     }
 
     Component {
-        id: VerticalDelegate
+        id: verticalDelegate
         FocusScope {
-            id: Root
+            id: root
             width: 50; height: 50; 
             Keys.onDigit9Pressed: console.log("Error - " + name)
             Rectangle { 
                 focus: true
                 Keys.onDigit9Pressed: console.log(name)
                 width: 50; height: 50; 
-                color: Root.ListView.isCurrentItem?"red":"green"
+                color: root.ListView.isCurrentItem?"red":"green"
                 Text { text: name; anchors.centerIn: parent }
             }
         }
@@ -37,8 +37,8 @@ Rectangle {
     ListView {
         width: 800; height: 50; orientation: "Horizontal"
         focus: true
-        model: Model
-        delegate: VerticalDelegate
+        model: model
+        delegate: verticalDelegate
         preferredHighlightBegin: 100
         preferredHighlightEnd: 101
         highlightRangeMode: ListView.StrictlyEnforceRange
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
index e9aae61..cc15755 100644
--- a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
@@ -15,8 +15,8 @@ Rectangle {
         ListElement { dayColor: "orange" }
     }
 
-    Flickable {
-        id: Flick
+    flickable {
+        id: flick
         height: parent.height-50
         width: parent.width; viewportHeight: column.height
 
@@ -37,10 +37,10 @@ Rectangle {
     }
     Rectangle {
         radius: 3
-        x: Flick.width-8
+        x: flick.width-8
         width: 8
-        y: Flick.visibleArea.yPosition * Flick.height
-        height: Flick.visibleArea.heightRatio * Flick.height
+        y: flick.visibleArea.yPosition * flick.height
+        height: flick.visibleArea.heightRatio * flick.height
     }
 
     // click to toggle interactive flag
@@ -51,7 +51,7 @@ Rectangle {
         color: "red"
         MouseRegion {
             anchors.fill: parent
-            onClicked: Flick.interactive = Flick.interactive ? false : true
+            onClicked: flick.interactive = flick.interactive ? false : true
         }
     }
 
@@ -64,7 +64,7 @@ Rectangle {
         color: "green"
         MouseRegion {
             anchors.fill: parent
-            onClicked: Flick.pressDelay = Flick.pressDelay > 0 ? 0 : 500
+            onClicked: flick.pressDelay = flick.pressDelay > 0 ? 0 : 500
         }
     }
 
@@ -77,12 +77,12 @@ Rectangle {
         color: "yellow"
         MouseRegion {
             anchors.fill: parent
-            onClicked: Flick.overShoot = Flick.overShoot > 0 ? 0 : 30
+            onClicked: flick.overShoot = flick.overShoot > 0 ? 0 : 30
         }
     }
 
     Rectangle {
-        width: Math.abs(Flick.verticalVelocity)/100
+        width: Math.abs(flick.verticalVelocity)/100
         height: 50
         x: 200
         y: parent.height - 50
diff --git a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml b/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
index e37f1b2..b01ddf8 100644
--- a/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
+++ b/tests/auto/declarative/visual/qmlgraphicstextedit/qt-669.qml
@@ -1,7 +1,7 @@
 import Qt 4.6
 
 Rectangle {
-    Component { id: TestableCursor
+    Component { id: testableCursor
         //Doesn't blink
         Rectangle {
             color:"black"
@@ -13,7 +13,7 @@ Rectangle {
     height:40;
     TextEdit {
         focus: true;
-        cursorDelegate: TestableCursor
+        cursorDelegate: testableCursor
         text: "Jackdaws love my big sphinx of Quartz"
     }
 }