summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-20 09:06:30 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-20 12:27:21 +0000
commit3e503b197d8391ef5ccd5d5cce7773e7ed63eba1 (patch)
tree06949e4625771a83ee30a006a37d8f8df8ffdc25
parent09a06c717174fa718280a47021b5c4bea6772e66 (diff)
Diaglib: Add gesture events to event filter.
Task-number: QTBUG-45134 Task-number: QTBUG-45120 Change-Id: I9b2420ec302dfff173fbc8e3173d6ef0fcf095e0 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
-rw-r--r--tests/manual/diaglib/eventfilter.cpp6
-rw-r--r--tests/manual/diaglib/eventfilter.h1
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)