From 038d5651940cfcd9fad017e6a4df00389b997da3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 1 Jun 2017 21:38:16 +0200 Subject: Let users disable the multi-touch support The newly added multi-touch support can create issues, especially together with Flickable that is unfortunately still not properly touch-compatible. The implementation is still based on synthesized mouse events, so things like Flickable::pressDelay that intercepts mouse presses and re-sends sends them after a delay, does not play well with touch-enabled controls. The easiest way we can disable the whole thing is to make multi- touch support a configurable feature, the same way hover support is. ./configure -no-feature-quicktemplates2-multitouch [...] Qt Quick Templates 2: Hover support .......................... yes Multi-touch support .................... no [ChangeLog][Templates] Added a configure feature for disabling multi- touch support (configure -no-feature-quicktemplates2-multitouch). Task-number: QTBUG-61144 Change-Id: I0003ae925c2a499ecb3e2a5b720088bd963d9ad3 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickpopup_p_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/quicktemplates2/qquickpopup_p_p.h') diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h index 316ea5bd..ce64d49e 100644 --- a/src/quicktemplates2/qquickpopup_p_p.h +++ b/src/quicktemplates2/qquickpopup_p_p.h @@ -99,7 +99,9 @@ public: bool contains(const QPointF &scenePos) const; +#if QT_CONFIG(quicktemplates2_multitouch) virtual bool acceptTouch(const QTouchEvent::TouchPoint &point); +#endif virtual bool blockInput(QQuickItem *item, const QPointF &point) const; virtual bool handlePress(QQuickItem* item, const QPointF &point, ulong timestamp); @@ -108,7 +110,9 @@ public: virtual void handleUngrab(); bool handleMouseEvent(QQuickItem *item, QMouseEvent *event); +#if QT_CONFIG(quicktemplates2_multitouch) bool handleTouchEvent(QQuickItem *item, QTouchEvent *event); +#endif virtual void reposition(); virtual void resizeOverlay(); -- cgit v1.2.3