summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2016-01-20 14:14:24 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-23 10:48:27 +0000
commit9cd2cd641cde4fd958150a6ee20645e7125580ed (patch)
tree8a72fbe02aaa98a29996e215e0c1010861aa4b7c /src/core
parentd7cdbe5596bc51d7628d0f566730d4b2d09e462e (diff)
Fix asserts in touch handling
Generate touch events with the "causesScrollingIfUncanceled" property set to true. This is checked by TouchEventQueue::TouchMoveSlopSuppressor Task-number: QTBUG-50511 Change-Id: I5260100db75ed7afdd7afeff8f530221c22090b0 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/render_widget_host_view_qt.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index fbfa12e91..4a773bc19 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -839,7 +839,9 @@ void RenderWidgetHostViewQt::processMotionEvent(const ui::MotionEvent &motionEve
if (!m_gestureProvider.OnTouchEvent(motionEvent).succeeded)
return;
- blink::WebTouchEvent touchEvent = ui::CreateWebTouchEventFromMotionEvent(motionEvent, false);
+ bool causesScrollingIfUncancelled = true;
+ blink::WebTouchEvent touchEvent = ui::CreateWebTouchEventFromMotionEvent(motionEvent,
+ causesScrollingIfUncancelled);
m_host->ForwardTouchEventWithLatencyInfo(touchEvent, CreateLatencyInfo(touchEvent));
}