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: (132 commits)
  Fix auto test
  Fix type lookup with url
  Fix default values on Textinput
  Add an implicit import "." to types loaded from a local url
  Fix crash
  Don't use Qt3 support methods.
  Crash
  Add/delete albums in photoviewer.
  Emits itemsRemoved() in QDeclarativeListModel::remove.
  Readd the itemtree benchmarks for comparison purposes.
  Allow enum constants as list element properties.
  Compile
  Cleanup benchmark a little
  Really fix warning.
  Fix warnings.
  MouseArea works now with any QGraphicsObject
  Make states test work with smaller font size.
  Register QGraphicsWidget type.
  Add ListView and GridView.indexAt() methods to get the index at a point.
  Tests for default count(), get() values should be run on the worker
  ...

1 files changed, 13 insertions, 0 deletions

diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index ae82a90..0460312 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -393,6 +393,19 @@ public:
     QPointF computeTransformOrigin(QDeclarativeItem::TransformOrigin origin, qreal width, qreal height) const;
 };
 
+class QDeclarativeAnchorAnimationPrivate : public QDeclarativeAbstractAnimationPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeAnchorAnimation)
+public:
+    QDeclarativeAnchorAnimationPrivate() : rangeIsSet(false), va(0),
+        interpolator(QVariantAnimationPrivate::getInterpolator(QMetaType::QReal)) {}
+
+    bool rangeIsSet;
+    QDeclarativeBulkValueAnimator *va;
+    QVariantAnimation::Interpolator interpolator;
+    QList<QDeclarativeItem*> targets;
+};
+
 QT_END_NAMESPACE
 
 #endif // QDECLARATIVEANIMATION_P_H