diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
| commit | 6a3945d3ca3185c00597dcaefb93617620973ff5 (patch) | |
| tree | 0534630f29a2d513621adf33c6fb25085fcab220 /tests/auto/qpauseanimation/tst_qpauseanimation.cpp | |
| parent | 1690ad91cc9e686e688aa7832a16cbf2c9336948 (diff) | |
| parent | 67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff) | |
| download | Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.zip Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.gz Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/qpauseanimation/tst_qpauseanimation.cpp')
| -rw-r--r-- | tests/auto/qpauseanimation/tst_qpauseanimation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp index e473176..605cee6 100644 --- a/tests/auto/qpauseanimation/tst_qpauseanimation.cpp +++ b/tests/auto/qpauseanimation/tst_qpauseanimation.cpp @@ -280,7 +280,7 @@ void tst_QPauseAnimation::sequentialPauseGroup() QVERIFY(group.state() == QAbstractAnimation::Running); QVERIFY(animation1.state() == QAbstractAnimation::Stopped); - QCOMPARE(&animation2, group.currentAnimation()); + QCOMPARE((QAbstractAnimation*)&animation2, group.currentAnimation()); QVERIFY(animation2.state() == QAbstractAnimation::Running); QVERIFY(animation3.state() == QAbstractAnimation::Stopped); @@ -292,7 +292,7 @@ void tst_QPauseAnimation::sequentialPauseGroup() QVERIFY(group.state() == QAbstractAnimation::Running); QVERIFY(animation1.state() == QAbstractAnimation::Stopped); QVERIFY(animation2.state() == QAbstractAnimation::Stopped); - QCOMPARE(&animation3, group.currentAnimation()); + QCOMPARE((QAbstractAnimation*)&animation3, group.currentAnimation()); QVERIFY(animation3.state() == QAbstractAnimation::Running); group.setCurrentTime(750); @@ -329,7 +329,7 @@ void tst_QPauseAnimation::sequentialGroupWithPause() QVERIFY(group.state() == QAbstractAnimation::Running); QVERIFY(animation.state() == QAbstractAnimation::Stopped); - QCOMPARE(&pause, group.currentAnimation()); + QCOMPARE((QAbstractAnimation*)&pause, group.currentAnimation()); QVERIFY(pause.state() == QAbstractAnimation::Running); group.setCurrentTime(600); |