diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-06 13:27:34 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 01:01:39 +0100 |
commit | 74ff1216a449d6098975b3c9baca7abb1399211b (patch) | |
tree | f3ea86c7efb9312b88d671fdd53480f10fc38888 /tests/auto | |
parent | 814deac3b2abebc1fa60575264ecd24e5c98a36d (diff) |
Don't hide virtual method.
Task-number: QTBUG-20994
Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp | 18 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 5ae66628b2..c7a0717dd3 100644 --- a/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -120,7 +120,7 @@ void tst_qdeclarativeanimations::simpleProperty() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); QVERIFY(animation.target() == &rect); @@ -145,7 +145,7 @@ void tst_qdeclarativeanimations::simpleNumber() { QQuickRectangle rect; QDeclarativeNumberAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); QVERIFY(animation.target() == &rect); @@ -170,7 +170,7 @@ void tst_qdeclarativeanimations::simpleColor() { QQuickRectangle rect; QDeclarativeColorAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("color"); animation.setTo(QColor("red")); QVERIFY(animation.target() == &rect); @@ -207,7 +207,7 @@ void tst_qdeclarativeanimations::simpleRotation() { QQuickRectangle rect; QDeclarativeRotationAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("rotation"); animation.setTo(270); QVERIFY(animation.target() == &rect); @@ -555,7 +555,7 @@ void tst_qdeclarativeanimations::alwaysRunToEnd() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); animation.setDuration(1000); @@ -575,7 +575,7 @@ void tst_qdeclarativeanimations::complete() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setFrom(1); animation.setTo(200); @@ -596,7 +596,7 @@ void tst_qdeclarativeanimations::resume() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setFrom(10); animation.setTo(200); @@ -623,7 +623,7 @@ void tst_qdeclarativeanimations::dotProperty() { QQuickRectangle rect; QDeclarativeNumberAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("border.width"); animation.setTo(10); animation.start(); @@ -1232,7 +1232,7 @@ void tst_qdeclarativeanimations::alwaysRunToEndRestartBug() { QQuickRectangle rect; QDeclarativePropertyAnimation animation; - animation.setTarget(&rect); + animation.setTargetObject(&rect); animation.setProperty("x"); animation.setTo(200); animation.setDuration(1000); diff --git a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index f60955c58e..3d37517d10 100644 --- a/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -131,7 +131,7 @@ void tst_qdeclarativesmoothedanimation::simpleAnimation() QDeclarativeSmoothedAnimation *animation = obj->findChild<QDeclarativeSmoothedAnimation*>("anim"); QVERIFY(animation); - animation->setTarget(rect); + animation->setTargetObject(rect); animation->setProperty("x"); animation->setTo(200); animation->setDuration(250); |