diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativesmoothedanimation')
6 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml index 3a2c4e386b..3631f971f0 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml @@ -1,3 +1,3 @@ -import QtQuick 1.0 +import QtQuick 2.0 SmoothedAnimation {} diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml index 47935d48f0..b07120234a 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 SmoothedAnimation { to: 10; duration: 300; reversingMode: SmoothedAnimation.Immediate diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml index fe44cce14b..8d5dc4a92b 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 SmoothedAnimation { to: 10; velocity: 250; reversingMode: SmoothedAnimation.Sync diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml index 65611227d0..81d36bf015 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { width: 400; height: 400; color: "blue" diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml index 5036d5f225..e136df84f6 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 Rectangle { width: 300; height: 300; diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index bab9045b9a..243f4e716b 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -42,7 +42,7 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativesmoothedanimation_p.h> -#include <private/qdeclarativerectangle_p.h> +#include <private/qsgrectangle_p.h> #include <private/qdeclarativevaluetype_p.h> #include "../../../shared/util.h" @@ -125,7 +125,7 @@ void tst_qdeclarativesmoothedanimation::disabled() void tst_qdeclarativesmoothedanimation::simpleAnimation() { - QDeclarativeRectangle rect; + QSGRectangle rect; QDeclarativeSmoothedAnimation animation; animation.setTarget(&rect); animation.setProperty("x"); @@ -155,10 +155,10 @@ void tst_qdeclarativesmoothedanimation::valueSource() QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimationValueSource.qml")); - QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create()); + QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create()); QVERIFY(rect); - QDeclarativeRectangle *theRect = rect->findChild<QDeclarativeRectangle*>("theRect"); + QSGRectangle *theRect = rect->findChild<QSGRectangle*>("theRect"); QVERIFY(theRect); QDeclarativeSmoothedAnimation *easeX = rect->findChild<QDeclarativeSmoothedAnimation*>("easeX"); @@ -187,10 +187,10 @@ void tst_qdeclarativesmoothedanimation::behavior() QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimationBehavior.qml")); - QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create()); + QSGRectangle *rect = qobject_cast<QSGRectangle*>(c.create()); QVERIFY(rect); - QDeclarativeRectangle *theRect = rect->findChild<QDeclarativeRectangle*>("theRect"); + QSGRectangle *theRect = rect->findChild<QSGRectangle*>("theRect"); QVERIFY(theRect); QDeclarativeSmoothedAnimation *easeX = rect->findChild<QDeclarativeSmoothedAnimation*>("easeX"); |