1 files changed, 5 insertions, 10 deletions

diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index c4188044cf..cd27c9c5be 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -136,18 +136,13 @@ Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *r
         ++m_lastCustomGestureId;
         type = Qt::GestureType(m_lastCustomGestureId);
     }
-    m_recognizers.insertMulti(type, recognizer);
+    m_recognizers.insert(type, recognizer);
     return type;
 }
 
 void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type)
 {
     QList<QGestureRecognizer *> list = m_recognizers.values(type);
-    while (QGestureRecognizer *recognizer = m_recognizers.take(type)) {
-        // ensuring an entry exists causes the recognizer to be deleted on destruction of the manager
-        auto &gestures = m_obsoleteGestures[recognizer];
-        Q_UNUSED(gestures);
-    }
     foreach (QGesture *g, m_gestureToRecognizer.keys()) {
         QGestureRecognizer *recognizer = m_gestureToRecognizer.value(g);
         if (list.contains(recognizer)) {
@@ -522,7 +517,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
         for(ContextIterator it = w->d_func()->gestureContext.constBegin(),
             e = w->d_func()->gestureContext.constEnd(); it != e; ++it) {
             types.insert(it.key(), 0);
-            contexts.insertMulti(w, it.key());
+            contexts.insert(w, it.key());
         }
     }
     // find all gesture contexts for the widget tree
@@ -534,7 +529,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event)
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
                     types.insert(it.key(), 0);
-                    contexts.insertMulti(w, it.key());
+                    contexts.insert(w, it.key());
                 }
             }
         }
@@ -556,7 +551,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
         for(ContextIterator it = item->QGraphicsItem::d_func()->gestureContext.constBegin(),
             e = item->QGraphicsItem::d_func()->gestureContext.constEnd(); it != e; ++it) {
             types.insert(it.key(), 0);
-            contexts.insertMulti(item, it.key());
+            contexts.insert(item, it.key());
         }
     }
     // find all gesture contexts for the graphics object tree
@@ -569,7 +564,7 @@ bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event)
             if (!(it.value() & Qt::DontStartGestureOnChildren)) {
                 if (!types.contains(it.key())) {
                     types.insert(it.key(), 0);
-                    contexts.insertMulti(item, it.key());
+                    contexts.insert(item, it.key());
                 }
             }
         }