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

Conflicts:
	examples/declarative/follow/pong.qml
	examples/declarative/listview/dummydata/MyPetsModel.qml

1 files changed, 29 insertions, 20 deletions

diff --git a/examples/declarative/listview/dummydata/MyPetsModel.qml b/examples/declarative/listview/dummydata/MyPetsModel.qml
index def8cf3..1c96b7f 100644
--- a/examples/declarative/listview/dummydata/MyPetsModel.qml
+++ b/examples/declarative/listview/dummydata/MyPetsModel.qml
@@ -1,50 +1,59 @@
 // ListModel allows free form list models to be defined and populated.
 // Be sure to name the file the same as the id.
 ListModel2 {
-    id: MyPetsModel
+    id: MyListElementsModel
     ListElement {
-        name: "Rover"
-        type: "Dog"
-        age: 5
+        name: "Polly"
+        type: "Parrot"
+        age: 12
+        size: "Small"
     }
     ListElement {
-        name: "Whiskers"
-        type: "Cat"
-        age: 2
+        name: "Penny"
+        type: "Turtle"
+        age: 4
+        size: "Small"
     }
     ListElement {
         name: "Warren"
         type: "Rabbit"
         age: 2
-    }
-    ListElement {
-        name: "Polly"
-        type: "Parrot"
-        age: 12
+        size: "Small"
     }
     ListElement {
         name: "Spot"
         type: "Dog"
         age: 9
+        size: "Medium"
     }
     ListElement {
-        name: "Tiny"
-        type: "Elephant"
-        age: 15
-    }
-    ListElement {
-        name: "Penny"
-        type: "Turtle"
-        age: 4
+        name: "Whiskers"
+        type: "Cat"
+        age: 2
+        size: "Medium"
     }
     ListElement {
         name: "Joey"
         type: "Kangaroo"
         age: 1
+        size: "Medium"
     }
     ListElement {
         name: "Kimba"
         type: "Bunny"
         age: 65
+        size: "Large"
+    }
+    ListElement {
+        name: "Rover"
+        type: "Dog"
+        age: 5
+        size: "Large"
+    }
+    ListElement {
+        name: "Tiny"
+        type: "Elephant"
+        age: 15
+        size: "Large"
     }
 }