diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-01 21:38:16 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-07 09:56:45 +0000 |
commit | 038d5651940cfcd9fad017e6a4df00389b997da3 (patch) | |
tree | 302f8ff40155c31b00f9eaf1dcdb6188ae160f48 /src/quicktemplates2/qquickrangeslider.cpp | |
parent | a4a570e813c72e308dd0897bcf256d19fee471a3 (diff) |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
-rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 3d767ed7..276e8d0c 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -328,7 +328,9 @@ public: QQuickRangeSliderNode *pressedNode(int touchId = -1) const; +#if QT_CONFIG(quicktemplates2_multitouch) bool acceptTouch(const QTouchEvent::TouchPoint &point) override; +#endif void handlePress(const QPointF &point) override; void handleMove(const QPointF &point) override; void handleRelease(const QPointF &point) override; @@ -397,6 +399,7 @@ QQuickRangeSliderNode *QQuickRangeSliderPrivate::pressedNode(int touchId) const return nullptr; } +#if QT_CONFIG(quicktemplates2_multitouch) bool QQuickRangeSliderPrivate::acceptTouch(const QTouchEvent::TouchPoint &point) { int firstId = QQuickRangeSliderNodePrivate::get(first)->touchId; @@ -409,6 +412,7 @@ bool QQuickRangeSliderPrivate::acceptTouch(const QTouchEvent::TouchPoint &point) return false; } +#endif void QQuickRangeSliderPrivate::handlePress(const QPointF &point) { @@ -986,6 +990,7 @@ void QQuickRangeSlider::mouseMoveEvent(QMouseEvent *event) QQuickControl::mouseMoveEvent(event); } +#if QT_CONFIG(quicktemplates2_multitouch) void QQuickRangeSlider::touchEvent(QTouchEvent *event) { Q_D(QQuickRangeSlider); @@ -1023,6 +1028,7 @@ void QQuickRangeSlider::touchEvent(QTouchEvent *event) break; } } +#endif void QQuickRangeSlider::mirrorChange() { |