Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/manual/diaglib/eventfilter.cpp b/tests/manual/diaglib/eventfilter.cpp
index cf0715e117..b35d29cc8a 100644
--- a/tests/manual/diaglib/eventfilter.cpp
+++ b/tests/manual/diaglib/eventfilter.cpp
@@ -140,6 +140,12 @@ void EventFilter::init(EventCategories eventCategories)
         m_eventTypes << QEvent::InputMethodQuery;
 #endif
     }
+#ifndef QT_NO_GESTURES
+    if (eventCategories & GestureEvents) {
+        m_eventTypes << QEvent::Gesture << QEvent::GestureOverride
+            << QEvent::NativeGesture;
+    }
+#endif
 }
 
 static inline bool matchesType(const QObject *o, EventFilter::ObjectTypes types)
diff --git a/tests/manual/diaglib/eventfilter.h b/tests/manual/diaglib/eventfilter.h
index 3b3674d8ad..954c55a557 100644
--- a/tests/manual/diaglib/eventfilter.h
+++ b/tests/manual/diaglib/eventfilter.h
@@ -59,6 +59,7 @@ public:
         InputMethodEvents  = 0x00400,
         TimerEvents        = 0x00800,
         ObjectEvents       = 0x01000,
+        GestureEvents      = 0x02000,
         AllEvents          = 0xFFFFF
     };
     Q_DECLARE_FLAGS(EventCategories, EventCategory)