From b0f391ae8f2efc272be852f951403fa8e4a8f561 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Date: Tue, 23 Jun 2009 16:57:32 +0200
Subject: Fix tst_QGraphicsItem::collidesWith_item autotest.

Avoid unwanted recursion by keeping the sceneRect variable locally. The
recursion happens if the call to sceneRect() lazily emits the
sceneRectChanged() signal.
---
 src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
index 464fe8e..8861c7b 100644
--- a/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
+++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp
@@ -157,7 +157,7 @@ void QGraphicsSceneBspTreeIndexPrivate::_q_updateIndex()
     // Regenerate the tree.
     if (regenerateIndex) {
         regenerateIndex = false;
-        bsp.initialize(q->scene()->sceneRect(), bspTreeDepth);
+        bsp.initialize(sceneRect, bspTreeDepth);
         unindexedItems = indexedItems;
         lastItemCount = indexedItems.size();
     }
@@ -689,6 +689,7 @@ void QGraphicsSceneBspTreeIndex::setBspTreeDepth(int depth)
 void QGraphicsSceneBspTreeIndex::sceneRectChanged()
 {
     Q_D(QGraphicsSceneBspTreeIndex);
+    d->sceneRect = d->scene->sceneRect();
     d->resetIndex();
 }
 
-- 
cgit v0.12