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:
  Remove unused struct
  update Browser.qml to run again
  Update Autotests
  Probably fix compile on windows
  Fix typo in docs
  Probably fix compile
  Fix qdeclarativevaluetype::font() autotest
  Initialize member variable in QDeclarativeGridViewAttached
  Handle itemsInserted/Removed/Moved() correctly for repeater.
  Add QML support for methods returning QList<QObject *>
  Compile
  Update configure.exe to include declarative module by default
  Make QDeclarativeItem NOTIFY signals canonical
  Integrate QML's object ownership with the JS collector
  Remove unused data member.
  Fix warning.
  Fix warnings and change geometry-related functions to use reals.
  When flicking with snap, bias towards moving at least one item.
  Doc fix.

2 files changed, 3 insertions, 0 deletions

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 389e6e7..68f34ca 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -2033,6 +2033,8 @@ void QObjectPrivate::setParent_helper(QObject *o)
             }
         }
     }
+    if (!wasDeleted && declarativeData)
+        declarativeData->parentChanged(q, o);
 }
 
 /*!
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index cc5bf97..20e3da1 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -90,6 +90,7 @@ class Q_CORE_EXPORT QDeclarativeData
 public:
     virtual ~QDeclarativeData();
     virtual void destroyed(QObject *) = 0;
+    virtual void parentChanged(QObject *, QObject *) = 0;
 };
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData