Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml:
  Replace QmlList* and QList* support with a single QmlListProperty type
  Rename MouseRegion -> MouseArea
  Update QmlChanges with animation API changes.
  Document the default velocity of EaseFollow
  Remove use of unexprted private classes.
  Fix compile error on Solaris
  Increase durations when testing Behaviors.
  Add cached path rounded rect painting benchmark.
  Remove use of direct event posting.  Use QTest::keyClick() for keys.

1 files changed, 5 insertions, 3 deletions

diff --git a/examples/declarative/extending/grouped/birthdayparty.h b/examples/declarative/extending/grouped/birthdayparty.h
index 3f4a3a6..fd0d955 100644
--- a/examples/declarative/extending/grouped/birthdayparty.h
+++ b/examples/declarative/extending/grouped/birthdayparty.h
@@ -49,7 +49,7 @@ class BirthdayParty : public QObject
 {
 Q_OBJECT
 Q_PROPERTY(Person *celebrant READ celebrant WRITE setCelebrant)
-Q_PROPERTY(QmlList<Person *> *guests READ guests)
+Q_PROPERTY(QmlListProperty<Person> guests READ guests)
 Q_CLASSINFO("DefaultProperty", "guests")
 public:
     BirthdayParty(QObject *parent = 0);
@@ -57,11 +57,13 @@ public:
     Person *celebrant() const;
     void setCelebrant(Person *);
 
-    QmlList<Person *> *guests();
+    QmlListProperty<Person> guests();
+    int guestCount() const;
+    Person *guest(int) const;
 
 private:
     Person *m_celebrant;
-    QmlConcreteList<Person *> m_guests;
+    QList<Person *> m_guests;
 };
 QML_DECLARE_TYPE(BirthdayParty);