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: (25 commits)
  Fix snake demo
  Add qmlmethod Item::childAt() to delarative item
  Cursor positioning in QTextDocument after undo()
  Fix slow network access in qmlviewer (Windows)
  Don't layout multiple times when an ancestor becomes (in)visible.
  Add an example of animated item add/remove in ListView
  Add test for PropertyChanges with attached properties.
  Make declarative autotests compile on Symbian abld build system
  Accept enter key in the webbrower demo url input.
  Keep reported point/pixel size in sync.
  Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
  Ensure state operations assigned to the default state are triggered
  Add image example.
  Fix regression in input panel autotests
  Improve docs about Qml component case sensitivity.
  Add some performance tips to QML docs.
  Move QListModelInterface into util.
  Ensure ParticleMotionGravity always pulls in the right direction.
  Remove version ifdefs from Particles; only 4.7 is supported.
  Update docs for the runtime.orientation values
  ...

1 files changed, 18 insertions, 2 deletions

diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index 3b0f52e..b6d6bbb 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -96,7 +96,7 @@ private:
 };
 
 //performs an action of type QAbstractAnimationAction
-class QActionAnimation : public QAbstractAnimation
+class Q_AUTOTEST_EXPORT QActionAnimation : public QAbstractAnimation
 {
     Q_OBJECT
 public:
@@ -143,7 +143,7 @@ public:
 };
 
 //animates QDeclarativeBulkValueUpdater (assumes start and end values will be reals or compatible)
-class QDeclarativeBulkValueAnimator : public QVariantAnimation
+class Q_AUTOTEST_EXPORT QDeclarativeBulkValueAnimator : public QVariantAnimation
 {
     Q_OBJECT
 public:
@@ -378,6 +378,22 @@ public:
     QList<QDeclarativeItem*> targets;
 };
 
+class Q_AUTOTEST_EXPORT QDeclarativeAnimationPropertyUpdater : public QDeclarativeBulkValueUpdater
+{
+public:
+    QDeclarativeStateActions actions;
+    int interpolatorType;       //for Number/ColorAnimation
+    int prevInterpolatorType;   //for generic
+    QVariantAnimation::Interpolator interpolator;
+    bool reverse;
+    bool fromSourced;
+    bool fromDefined;
+    bool *wasDeleted;
+    QDeclarativeAnimationPropertyUpdater() : prevInterpolatorType(0), wasDeleted(0) {}
+    ~QDeclarativeAnimationPropertyUpdater() { if (wasDeleted) *wasDeleted = true; }
+    void setValue(qreal v);
+};
+
 QT_END_NAMESPACE
 
 #endif // QDECLARATIVEANIMATION_P_H