Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev

1 files changed, 21 insertions, 21 deletions

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 33ebc4d4..44b5938f 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2595,33 +2595,33 @@ QPointF QDeclarativeParentAnimationPrivate::computeTransformOrigin(QDeclarativeI
     }
 }
 
+struct QDeclarativeParentAnimationData : public QAbstractAnimationAction
+{
+    QDeclarativeParentAnimationData() {}
+    ~QDeclarativeParentAnimationData() { qDeleteAll(pc); }
+
+    QDeclarativeStateActions actions;
+    //### reverse should probably apply on a per-action basis
+    bool reverse;
+    QList<QDeclarativeParentChange *> pc;
+    virtual void doAction()
+    {
+        for (int ii = 0; ii < actions.count(); ++ii) {
+            const QDeclarativeAction &action = actions.at(ii);
+            if (reverse)
+                action.event->reverse();
+            else
+                action.event->execute();
+        }
+    }
+};
+
 void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                         QDeclarativeProperties &modified,
                         TransitionDirection direction)
 {
     Q_D(QDeclarativeParentAnimation);
 
-    struct QDeclarativeParentAnimationData : public QAbstractAnimationAction
-    {
-        QDeclarativeParentAnimationData() {}
-        ~QDeclarativeParentAnimationData() { qDeleteAll(pc); }
-
-        QDeclarativeStateActions actions;
-        //### reverse should probably apply on a per-action basis
-        bool reverse;
-        QList<QDeclarativeParentChange *> pc;
-        virtual void doAction()
-        {
-            for (int ii = 0; ii < actions.count(); ++ii) {
-                const QDeclarativeAction &action = actions.at(ii);
-                if (reverse)
-                    action.event->reverse();
-                else
-                    action.event->execute();
-            }
-        }
-    };
-
     QDeclarativeParentAnimationData *data = new QDeclarativeParentAnimationData;
     QDeclarativeParentAnimationData *viaData = new QDeclarativeParentAnimationData;