summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2009-07-22 08:35:03 (GMT)
committerAndy Shaw <qt-info@nokia.com>2009-07-22 08:35:03 (GMT)
commit6ecce8dfe0c71bc4dcc510d7920f70f7799cb0a7 (patch)
treecdefae497eb3bdbfe00898471337859c14a47369
parent220b1cbcd253c8133ad185cd2be55db584071e67 (diff)
downloadQt-6ecce8dfe0c71bc4dcc510d7920f70f7799cb0a7.zip
Qt-6ecce8dfe0c71bc4dcc510d7920f70f7799cb0a7.tar.gz
Qt-6ecce8dfe0c71bc4dcc510d7920f70f7799cb0a7.tar.bz2
Fix a potential crash due to the fact that _q_UpdateIndex() is reentered
This is confirmed to resolve a number of problems from the original reportee. It's already fixed in Qt 4.6 in a more wider fix, but this one liner is a good to have in Qt 4.5.x anyway. Task-number: 258194 Reviewed-by: alexis
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 053338b..247347a 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -542,7 +542,7 @@ void QGraphicsScenePrivate::_q_updateIndex()
// Regenerate the tree.
if (regenerateIndex) {
regenerateIndex = false;
- bspTree.initialize(q->sceneRect(), depth);
+ bspTree.initialize(sceneRect, depth);
unindexedItems = indexedItems;
lastItemCount = indexedItems.size();
q->update();