Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed autotest compilation issue on solaris
  Fixed build issue on Solaris
  Remove wrong NOTIFY attribute.
  Ignore LayoutDirectionChange event in QTextControl
  Fix an obvious bug in tst_QGL::clipTest()
  moc: Error if the NOTIFY signal is invalid.
  QDateEdit/QTimeEdit:  remove duplicate properties.

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);