diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-13 15:50:40 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-09-13 16:03:52 +0200 |
| commit | 5d9fb4b86ffd604e65ade61a252037dca224af53 (patch) | |
| tree | b891096134180c5bf5eb512b09b69158e2a876fc /tests/auto/qsequentialanimationgroup | |
| parent | 548155fec3a8b575215625d4fd767e63c20f6b84 (diff) | |
| download | qt4-tools-5d9fb4b86ffd604e65ade61a252037dca224af53.tar.gz | |
tests: fix compilation with suncc
Patch derived from the tasks
Task-number: QTBUG-12997
Task-number: QTBUG-12984
Task-number: QTBUG-12985
Task-number: QTBUG-12990
Task-number: QTBUG-12999
Diffstat (limited to 'tests/auto/qsequentialanimationgroup')
| -rw-r--r-- | tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index e154528ea2..e16be8b93a 100644 --- a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -381,7 +381,7 @@ void tst_QSequentialAnimationGroup::setCurrentTimeWithUncontrolledAnimation() QCOMPARE(a1_s_o2->currentLoopTime(), 250); QCOMPARE(notTimeDriven->currentLoopTime(), 0); QCOMPARE(loopsForever->currentLoopTime(), 0); - QCOMPARE(group.currentAnimation(), notTimeDriven); + QCOMPARE(group.currentAnimation(), static_cast<QAbstractAnimation *>(notTimeDriven)); // Current time = 505 group.setCurrentTime(505); @@ -391,7 +391,7 @@ void tst_QSequentialAnimationGroup::setCurrentTimeWithUncontrolledAnimation() QCOMPARE(a1_s_o2->currentLoopTime(), 250); QCOMPARE(notTimeDriven->currentLoopTime(), 5); QCOMPARE(loopsForever->currentLoopTime(), 0); - QCOMPARE(group.currentAnimation(), notTimeDriven); + QCOMPARE(group.currentAnimation(), static_cast<QAbstractAnimation *>(notTimeDriven)); QCOMPARE(sequence->state(), QAnimationGroup::Stopped); QCOMPARE(a1_s_o1->state(), QAnimationGroup::Stopped); QCOMPARE(a1_s_o2->state(), QAnimationGroup::Stopped); |