Fixes a crash in gestures.

This is a partial backport of a fix that was pushed to 4.7
(734ba1f540aaedc4a3558268bd7350c0b15325a4)

Task-number: QT-3349
Reviewed-by: trustme

1 files changed, 10 insertions, 1 deletions

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 98fc10f5b1..2131993511 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -693,6 +693,14 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item)
     --selectionChanging;
     if (!selectionChanging && selectedItems.size() != oldSelectedItemsSize)
         emit q->selectionChanged();
+
+    QHash<QGesture *, QGraphicsObject *>::iterator it;
+    for (it = gestureTargets.begin(); it != gestureTargets.end();) {
+      if (it.value() == item)
+       it = gestureTargets.erase(it);
+      else
+       ++it;
+    }
 }
 
 /*!
@@ -5960,7 +5968,8 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event)
             if (gesture->state() == Qt::GestureStarted)
                 startedGestures.insert(gesture);
         } else {
-            gesturesPerItem[target].append(gesture);
+            if (index->items().contains(target))
+                gesturesPerItem[target].append(gesture);
         }
     }