Fixed the gesture event filtering through multiple gesture recognizers.

When there are several gesture recognizers registered for the same
gesture type, we need to know which recognizer we need to get a state
object for since those QGesture objects are tied to the recognizer that
created them.

Reviewed-by: Thomas Zander

1 files changed, 3 insertions, 2 deletions

diff --git a/src/gui/kernel/qgesturemanager_p.h b/src/gui/kernel/qgesturemanager_p.h
index 5a2816ccc1..f1282734e7 100644
--- a/src/gui/kernel/qgesturemanager_p.h
+++ b/src/gui/kernel/qgesturemanager_p.h
@@ -116,7 +116,7 @@ private:
         }
     };
 
-    QMap<ObjectGesture, QGesture *> m_objectGestures;
+    QMap<ObjectGesture, QList<QGesture *> > m_objectGestures;
     QMap<QGesture *, QGestureRecognizer *> m_gestureToRecognizer;
     QHash<QGesture *, QObject *> m_gestureOwners;
 
@@ -128,7 +128,8 @@ private:
     QMap<QGesture *, QGestureRecognizer *> m_deletedRecognizers;
     void cleanupGesturesForRemovedRecognizer(QGesture *gesture);
 
-    QGesture *getState(QObject *widget, Qt::GestureType gesture);
+    QGesture *getState(QObject *widget, QGestureRecognizer *recognizer,
+                       Qt::GestureType gesture);
     void deliverEvents(const QSet<QGesture *> &gestures,
                        QSet<QGesture *> *undeliveredGestures);
     void getGestureTargets(const QSet<QGesture*> &gestures,