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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index e2575ab..51b0dae 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -72,7 +72,7 @@ struct ListModelData
     \qmlclass ListModel 
     \brief The ListModel element defines a free-form list data source.
 
-    The ListModel is a simple hierarchy of items containing data roles.
+    The ListModel is a simple hierarchy of elements containing data roles.
     For example:
 
     \code
@@ -93,8 +93,8 @@ struct ListModelData
     }
     \endcode
 
-    Item roles (properties) must begin with a lower-case letter.  The above example defines a
-    ListModel containing three items, with the roles "name" and "cost".
+    Roles (properties) must begin with a lower-case letter.  The above example defines a
+    ListModel containing three elements, with the roles "name" and "cost".
 
     The defined model can be used in views such as ListView:
     \code
diff --git a/tests/benchmarks/declarative/qmlcomponent/samegame/BoomBlock.qml b/tests/benchmarks/declarative/qmlcomponent/samegame/BoomBlock.qml
index 8a505da..7860cf4 100644
--- a/tests/benchmarks/declarative/qmlcomponent/samegame/BoomBlock.qml
+++ b/tests/benchmarks/declarative/qmlcomponent/samegame/BoomBlock.qml
@@ -42,13 +42,13 @@ Item { id:block
 
     states: [
         State{ name: "AliveState"; when: spawned == true && dying == false
-            SetProperties { target: img; opacity: 1 }
+            PropertyChanges { target: img; opacity: 1 }
         },
         State{ name: "DeathState"; when: dying == true
-            SetProperties { target: particles; count: 50 }
-            SetProperties { target: particles; opacity: 1 }
-            SetProperties { target: particles; emitting: false } // i.e. emit only once
-            SetProperties { target: img; opacity: 0 }
+            PropertyChanges { target: particles; count: 50 }
+            PropertyChanges { target: particles; opacity: 1 }
+            PropertyChanges { target: particles; emitting: false } // i.e. emit only once
+            PropertyChanges { target: img; opacity: 0 }
         }
     ]
 }