Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

1 files changed, 3 insertions, 3 deletions

diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp
index 2e9edb1481..296d8d31e7 100644
--- a/src/widgets/kernel/qgesturemanager.cpp
+++ b/src/widgets/kernel/qgesturemanager.cpp
@@ -541,8 +541,8 @@ bool QGestureManager::filterEvent(QObject *receiver, QEvent *event)
 }
 
 void QGestureManager::getGestureTargets(const QSet<QGesture*> &gestures,
-    QMap<QWidget *, QList<QGesture *> > *conflicts,
-    QMap<QWidget *, QList<QGesture *> > *normal)
+    QHash<QWidget *, QList<QGesture *> > *conflicts,
+    QHash<QWidget *, QList<QGesture *> > *normal)
 {
     typedef QHash<Qt::GestureType, QHash<QWidget *, QGesture *> > GestureByTypes;
     GestureByTypes gestureByTypes;
@@ -588,7 +588,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures,
     if (gestures.isEmpty())
         return;
 
-    typedef QMap<QWidget *, QList<QGesture *> > GesturesPerWidget;
+    typedef QHash<QWidget *, QList<QGesture *> > GesturesPerWidget;
     GesturesPerWidget conflictedGestures;
     GesturesPerWidget normalStartedGestures;