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: (57 commits)
  Crash
  Cosmetic tweaks
  no need to include this private header
  fix particles plugin
  Update QmlChanges.txt
  Replace QDeclarativeContext::addDefaultObject() -> setContextObject()
  Fix test, fix warning consistency.
  Improve value type binding behavior
  Truncate title at right if too long (cannot currently ElideRight and center).
  Minor construction optimizations.
  Don't export symbols in webkit plugin.
  Move particles in their own plugin (Qt.labs.particles)
  Add a positioning 'mode' to positionViewAtIndex()
  Compile fix after e5922ab126f3532483b18720ce893d6be826d50e
  Add AnchorAnimation for animating AnchorChanges.
  Remove more accidentally submitted code
  Comment out unused method.
  Document - and use - the qmlRegisterXXX template functions
  when loading debug import plugins on Mac, try with _debug.dylib suffix
  fix inclusion of qt_targets.pri in qimportbase.pri
  ...

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