diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-08-19 16:05:12 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-01 03:24:14 (GMT) |
| commit | 4df48a10ae79c694cf3c39aa4dbe25c6b6b99847 (patch) | |
| tree | e7b6aeb1fbd0889965096263bff51cc53933464d | |
| parent | bc697e5b2e8c92d308176a704ed919d146f6963c (diff) | |
| download | Qt-4df48a10ae79c694cf3c39aa4dbe25c6b6b99847.zip Qt-4df48a10ae79c694cf3c39aa4dbe25c6b6b99847.tar.gz Qt-4df48a10ae79c694cf3c39aa4dbe25c6b6b99847.tar.bz2 | |
Fixed build issue on Solaris
Task-number: QTBUG-12994
(cherry picked from commit d30921f13dc74a3e05a3f29c0c45147823f2a064)
| -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); |