diff options
author | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-03-29 03:58:00 (GMT) |
---|---|---|
committer | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-03-30 03:54:12 (GMT) |
commit | e2f9d31227e9a2126a99503c4285efaf8d894dd9 (patch) | |
tree | 3250f95680545f97a7a909ad553b1bf386b35cb6 /tests/auto/declarative | |
parent | 7a060ca401b4e260fd08c854213024b050a67ff2 (diff) | |
download | Qt-e2f9d31227e9a2126a99503c4285efaf8d894dd9.zip Qt-e2f9d31227e9a2126a99503c4285efaf8d894dd9.tar.gz Qt-e2f9d31227e9a2126a99503c4285efaf8d894dd9.tar.bz2 |
Finished file rename of qdeclarative easefollow to smoothedanimation
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/declarative.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml (renamed from tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml (renamed from tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml (renamed from tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml (renamed from tests/auto/declarative/qdeclarativeeasefollow/data/easefollowBehavior.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml (renamed from tests/auto/declarative/qdeclarativeeasefollow/data/easefollowValueSource.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro (renamed from tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro) | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp (renamed from tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp) | 34 | ||||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.0.png) | bin | 1305 -> 1305 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.1.png) | bin | 1306 -> 1306 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.2.png) | bin | 1305 -> 1305 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.3.png) | bin | 1303 -> 1303 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.4.png) | bin | 1303 -> 1303 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.5.png) | bin | 1305 -> 1305 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.6.png) | bin | 1306 -> 1306 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml (renamed from tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/easefollow.qml) | 0 |
17 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 6c5a75f..bebc54e 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -13,7 +13,6 @@ SUBDIRS += \ qdeclarativedebugclient \ # Cover qdeclarativedebugservice \ # Cover qdeclarativedom \ # Cover - qdeclarativeeasefollow \ # Cover qdeclarativeecmascript \ # Cover qdeclarativeengine \ # Cover qdeclarativeerror \ # Cover @@ -47,6 +46,7 @@ SUBDIRS += \ qdeclarativepixmapcache \ # Cover qdeclarativepropertymap \ # Cover qdeclarativeqt \ # Cover + qdeclarativesmoothedanimation \ # Cover qdeclarativespringfollow \ # Cover qdeclarativestates \ # Cover qdeclarativesystempalette \ # Cover diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml index cfece41..cfece41 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow1.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml index 74a110d..74a110d 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow2.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml index 3111e82..3111e82 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollow3.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollowBehavior.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml index eb06344..eb06344 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollowBehavior.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml diff --git a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollowValueSource.qml b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml index 9ae744c..9ae744c 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/data/easefollowValueSource.qml +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml diff --git a/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 71df4f4..b41b23a 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/qdeclarativeeasefollow.pro +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -2,7 +2,7 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativeeasefollow.cpp +SOURCES += tst_qdeclarativesmoothedanimation.cpp # Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index 401688b..7cf318a 100644 --- a/tests/auto/declarative/qdeclarativeeasefollow/tst_qdeclarativeeasefollow.cpp +++ b/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -41,16 +41,16 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <private/qdeclarativeeasefollow_p.h> +#include <private/qdeclarativesmoothedanimation_p.h> #include <private/qdeclarativerectangle_p.h> #include <private/qdeclarativevaluetype_p.h> #include "../../../shared/util.h" -class tst_qdeclarativeeasefollow : public QObject +class tst_qdeclarativesmoothedanimation : public QObject { Q_OBJECT public: - tst_qdeclarativeeasefollow(); + tst_qdeclarativesmoothedanimation(); private slots: void defaultValues(); @@ -64,14 +64,14 @@ private: QDeclarativeEngine engine; }; -tst_qdeclarativeeasefollow::tst_qdeclarativeeasefollow() +tst_qdeclarativesmoothedanimation::tst_qdeclarativesmoothedanimation() { } -void tst_qdeclarativeeasefollow::defaultValues() +void tst_qdeclarativesmoothedanimation::defaultValues() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow1.qml")); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimation1.qml")); QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create()); QVERIFY(obj != 0); @@ -85,10 +85,10 @@ void tst_qdeclarativeeasefollow::defaultValues() delete obj; } -void tst_qdeclarativeeasefollow::values() +void tst_qdeclarativesmoothedanimation::values() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow2.qml")); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimation2.qml")); QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create()); QVERIFY(obj != 0); @@ -102,10 +102,10 @@ void tst_qdeclarativeeasefollow::values() delete obj; } -void tst_qdeclarativeeasefollow::disabled() +void tst_qdeclarativesmoothedanimation::disabled() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollow3.qml")); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimation3.qml")); QDeclarativeSmoothedAnimation *obj = qobject_cast<QDeclarativeSmoothedAnimation*>(c.create()); QVERIFY(obj != 0); @@ -118,7 +118,7 @@ void tst_qdeclarativeeasefollow::disabled() delete obj; } -void tst_qdeclarativeeasefollow::simpleAnimation() +void tst_qdeclarativesmoothedanimation::simpleAnimation() { QDeclarativeRectangle rect; QDeclarativeSmoothedAnimation animation; @@ -144,11 +144,11 @@ void tst_qdeclarativeeasefollow::simpleAnimation() QCOMPARE(rect.x(), qreal(100)); } -void tst_qdeclarativeeasefollow::valueSource() +void tst_qdeclarativesmoothedanimation::valueSource() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollowValueSource.qml")); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimationValueSource.qml")); QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create()); QVERIFY(rect); @@ -174,11 +174,11 @@ void tst_qdeclarativeeasefollow::valueSource() QTRY_COMPARE(theRect->y(), qreal(200)); } -void tst_qdeclarativeeasefollow::behavior() +void tst_qdeclarativesmoothedanimation::behavior() { QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/easefollowBehavior.qml")); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/smoothedanimationBehavior.qml")); QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create()); QVERIFY(rect); @@ -202,6 +202,6 @@ void tst_qdeclarativeeasefollow::behavior() QTRY_COMPARE(theRect->y(), qreal(200)); } -QTEST_MAIN(tst_qdeclarativeeasefollow) +QTEST_MAIN(tst_qdeclarativesmoothedanimation) -#include "tst_qdeclarativeeasefollow.moc" +#include "tst_qdeclarativesmoothedanimation.moc" diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.0.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png Binary files differindex 21b6afb..21b6afb 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.0.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.0.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png Binary files differindex bb8a02b..bb8a02b 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.1.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.1.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.2.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png Binary files differindex da60237..da60237 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.2.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.3.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png Binary files differindex 3e943e8..3e943e8 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.3.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.4.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png Binary files differindex 4fbaf26..4fbaf26 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.4.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.4.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.5.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png Binary files differindex c10d196..c10d196 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.5.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.5.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png Binary files differindex a672c06..a672c06 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.6.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.6.png diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml index 029a2fc..029a2fc 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/data/easefollow.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/data/easefollow.qml diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/easefollow.qml b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml index ee94857..ee94857 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeeasefollow/easefollow.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativesmoothedanimation/smoothedanimation.qml |