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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits)
  Do not treat images in qml examples differently.
  Replace Flickable overshoot property with boundsBehavior
  Autotests and doc
  Give error on attempt to import types from too-early version number.
  Remove (undocumented) QML bindings for effects.
  De-straighten them lines.
  Doc: fix QStringList model doc (really).
  Doc: fix QStringList model docs
  Change return type to match value().
  Add duration and easing properties to AnchorAnimation.
  Autotest
  Remove dead code
  Compile on Windows (export decl fix).
  Fix versioning of Qt Declarative's in-built types
  Fixed declarative/parserstress autotest.
  Fix parsing of regular expression literals.
  Fill out QGraphicsLayout bindings
  Update test files to new syntax
  Compile without Qt3 support.
  Ensure workerscript.qml works (autotested).
  ...

1 files changed, 14 insertions, 12 deletions

diff --git a/examples/declarative/extending/coercion/person.h b/examples/declarative/extending/coercion/person.h
index 298ffb1..1c95da7 100644
--- a/examples/declarative/extending/coercion/person.h
+++ b/examples/declarative/extending/coercion/person.h
@@ -42,12 +42,12 @@
 #define PERSON_H
 
 #include <QObject>
-#include <qdeclarative.h>
 
-class Person : public QObject {
-Q_OBJECT
-Q_PROPERTY(QString name READ name WRITE setName)
-Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
+class Person : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int shoeSize READ shoeSize WRITE setShoeSize)
 public:
     Person(QObject *parent = 0);
 
@@ -60,22 +60,24 @@ private:
     QString m_name;
     int m_shoeSize;
 };
-QML_DECLARE_TYPE(Person);
+
 
 // ![0]
-class Boy : public Person {
-Q_OBJECT
+class Boy : public Person
+{
+    Q_OBJECT
 public:
     Boy(QObject * parent = 0);
 };
-QML_DECLARE_TYPE(Boy);
 
-class Girl : public Person {
-Q_OBJECT
+
+class Girl : public Person
+{
+    Q_OBJECT
 public:
     Girl(QObject * parent = 0);
 };
-QML_DECLARE_TYPE(Girl);
+
 // ![0]
 
 #endif // PERSON_H