diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-05-07 10:44:01 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-05-07 10:44:01 (GMT) |
| commit | 8da0e32d111bbada65d60fa26e14ca72211517b6 (patch) | |
| tree | 1a988e6a8d4e3673b2676fd178d68a78e8d19341 /tests/auto | |
| parent | 81eebfbe01edb002d55c3504cc2558689cf0f936 (diff) | |
| parent | a99a849dffc51a76256e880a81e6829c76199559 (diff) | |
| download | Qt-8da0e32d111bbada65d60fa26e14ca72211517b6.zip Qt-8da0e32d111bbada65d60fa26e14ca72211517b6.tar.gz Qt-8da0e32d111bbada65d60fa26e14ca72211517b6.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp index f0deab5..2e5fd00 100644 --- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp +++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp @@ -624,6 +624,7 @@ QVariant xaxisQPointInterpolator(const QPointF &f, const QPointF &t, qreal progr void tst_QPropertyAnimation::interpolated() { QObject o; + o.setProperty("point", QPointF()); //this will avoid warnings o.setProperty("number", qVariantFromValue<Number>(Number(42))); QCOMPARE(qVariantValue<Number>(o.property("number")), Number(42)); { @@ -649,9 +650,9 @@ void tst_QPropertyAnimation::interpolated() anim.start(); anim.pause(); anim.setCurrentTime(100); - QCOMPARE(o.property("point").toPointF(), QPointF(10, 0)); + QCOMPARE(o.property("point"), QVariant(QPointF(10, 0))); anim.setCurrentTime(500); - QCOMPARE(o.property("point").toPointF(), QPointF(50, 0)); + QCOMPARE(o.property("point"), QVariant(QPointF(50, 0))); } { // unregister it and see if we get back the default behaviour |