Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/animation/clipanimator/tst_clipanimator.cpp b/tests/auto/animation/clipanimator/tst_clipanimator.cpp
index 77f067973..615547405 100644
--- a/tests/auto/animation/clipanimator/tst_clipanimator.cpp
+++ b/tests/auto/animation/clipanimator/tst_clipanimator.cpp
@@ -28,7 +28,7 @@
 
 #include <QtTest/QTest>
 #include <Qt3DAnimation/private/clipanimator_p.h>
-#include <Qt3DAnimation/qanimationclip.h>
+#include <Qt3DAnimation/qanimationcliploader.h>
 #include <Qt3DAnimation/qclipanimator.h>
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qscene_p.h>
@@ -49,10 +49,10 @@ private Q_SLOTS:
         Qt3DAnimation::Animation::ClipAnimator backendAnimator;
         backendAnimator.setHandler(&handler);
         Qt3DAnimation::QClipAnimator animator;
-        auto clip = new Qt3DAnimation::QAnimationClip();
+        auto clip = new Qt3DAnimation::QAnimationClipLoader();
 
         animator.setClip(clip);
-        animator.setLoops(10);
+        animator.setLoopCount(10);
 
         // WHEN
         simulateInitialization(&animator, &backendAnimator);
@@ -62,7 +62,7 @@ private Q_SLOTS:
         QCOMPARE(backendAnimator.isEnabled(), animator.isEnabled());
         QCOMPARE(backendAnimator.clipId(), clip->id());
         QCOMPARE(backendAnimator.isRunning(), animator.isRunning());
-        QCOMPARE(backendAnimator.loops(), animator.loops());
+        QCOMPARE(backendAnimator.loops(), animator.loopCount());
     }
 
     void checkInitialAndCleanedUpState()
@@ -81,10 +81,10 @@ private Q_SLOTS:
 
         // GIVEN
         Qt3DAnimation::QClipAnimator animator;
-        auto clip = new Qt3DAnimation::QAnimationClip();
+        auto clip = new Qt3DAnimation::QAnimationClipLoader();
         animator.setClip(clip);
         animator.setRunning(true);
-        animator.setLoops(25);
+        animator.setLoopCount(25);
 
         // WHEN
         simulateInitialization(&animator, &backendAnimator);
@@ -116,7 +116,7 @@ private Q_SLOTS:
         QCOMPARE(backendAnimator.isEnabled(), true);
 
         // WHEN
-        auto newClip = new Qt3DAnimation::QAnimationClip();
+        auto newClip = new Qt3DAnimation::QAnimationClipLoader();
         updateChange.reset(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
         updateChange->setPropertyName("clip");
         updateChange->setValue(QVariant::fromValue(newClip->id()));