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:
  QGraphicsView: fix few artefacts that can appear if the changed() signal is connected.
  tst_qmetaobject:  fix compilation, now that wrong NOTIFY property fails
  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, 4 insertions, 4 deletions

diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 5dc0c9d..fa6a5ec 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -183,20 +183,20 @@ void tst_QGraphicsEffect::source()
     QGraphicsItem *item = new QGraphicsRectItem(0, 0, 10, 10);
     item->setGraphicsEffect(effect);
     QVERIFY(effect->source());
-    QCOMPARE(effect->source()->graphicsItem(), item);
+    QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item);
     QVERIFY(effect->m_sourceChangedFlags & QGraphicsEffect::SourceAttached);
     effect->reset();
 
     // Make sure disabling/enabling the effect doesn't change the source.
     effect->setEnabled(false);
     QVERIFY(effect->source());
-    QCOMPARE(effect->source()->graphicsItem(), item);
+    QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item);
     QVERIFY(!effect->m_sourceChangedFlags);
     effect->reset();
 
     effect->setEnabled(true);
     QVERIFY(effect->source());
-    QCOMPARE(effect->source()->graphicsItem(), item);
+    QCOMPARE(effect->source()->graphicsItem(), (const QGraphicsItem*)item);
     QVERIFY(!effect->m_sourceChangedFlags);
     effect->reset();
 
@@ -210,7 +210,7 @@ void tst_QGraphicsEffect::source()
     item->setGraphicsEffect(effect);
     QPointer<QGraphicsEffectSource> source = effect->source();
     QVERIFY(source);
-    QCOMPARE(source->graphicsItem(), item);
+    QCOMPARE(source->graphicsItem(), (const QGraphicsItem*)item);
     delete item;
     QVERIFY(!effect);
     QVERIFY(!source);