Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex

Painfull merge due to recent changes in QGV framework.

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/graphicsview/qgraphicsscene.h
	src/gui/graphicsview/qgraphicsscene_p.h
	src/gui/graphicsview/qgraphicsview.cpp

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index dd997c74db..4d786c7ad7 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -274,7 +274,9 @@ void tst_QGraphicsScene::sceneRect()
     QCOMPARE(scene.sceneRect(), QRectF());
 
     QGraphicsItem *item = scene.addRect(QRectF(0, 0, 10, 10));
+    qApp->processEvents();
     item->setPos(-5, -5);
+    qApp->processEvents();
 
     QCOMPARE(scene.itemAt(0, 0), item);
     QCOMPARE(scene.itemAt(10, 10), (QGraphicsItem *)0);
@@ -1319,8 +1321,9 @@ void tst_QGraphicsScene::removeItem()
     scene.removeItem(hoverItem);
     hoverItem->setAcceptsHoverEvents(false);
     scene.addItem(hoverItem);
-    qApp->processEvents(); // update
-    qApp->processEvents(); // draw
+    qApp->processEvents(); // <- delayed update is called
+    qApp->processEvents(); // <- scene schedules pending update
+    qApp->processEvents(); // <- pending update is sent to view
     QVERIFY(!hoverItem->isHovered);
 }
 
@@ -2714,6 +2717,7 @@ void tst_QGraphicsScene::update()
 
     QGraphicsRectItem *rect = new QGraphicsRectItem(0, 0, 100, 100);
     scene.addItem(rect);
+    qApp->processEvents();
     rect->setPos(-100, -100);
 
     // This function forces indexing