summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicsscene.cpp
diff options
context:
space:
mode:
authorBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-08-17 11:50:47 (GMT)
committerBjørn Erik Nilsen <bjorn.nilsen@nokia.com>2009-08-17 11:50:47 (GMT)
commit17d6f2a59fe2b170087cdf7074807c6a2dce1043 (patch)
tree64af0faa3146cd516b9887c9344ebd03408bafcc /src/gui/graphicsview/qgraphicsscene.cpp
parent103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (diff)
parent3d50220423b96a84f1ca4c0f5ef9246345aad359 (diff)
downloadQt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.zip
Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.gz
Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.bz2
Merge commit 'qt/master' into kinetic-graphicseffect
Diffstat (limited to 'src/gui/graphicsview/qgraphicsscene.cpp')
-rw-r--r--src/gui/graphicsview/qgraphicsscene.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 7d0876f..e4a02e2 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
@@ -495,11 +495,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
item->d_func()->scene = 0;
// Unregister focus proxy.
- QMultiHash<QGraphicsItem *, QGraphicsItem *>::iterator it = focusProxyReverseMap.find(item);
- while (it != focusProxyReverseMap.end() && it.key() == item) {
- it.value()->d_ptr->focusProxy = 0;
- it = focusProxyReverseMap.erase(it);
- }
+ item->d_ptr->resetFocusProxy();
// Remove from parent, or unregister from toplevels.
if (QGraphicsItem *parentItem = item->parentItem()) {