From 15d439d96c504964d70cbb09b1820a93ea86dd17 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Tue, 24 Jul 2018 15:42:14 +0200
Subject: QQMultiPointHandler: don't respond to a QWheelEvent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The most noticeable consequence was having DragHandler activate when
attempting to scroll a parent Flickable.

Task-number: QTBUG-69607
Change-Id: I5a01695de00db179ddf0b3a39bdcd5e67ba345ef
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 src/quick/handlers/qquickmultipointhandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/quick/handlers/qquickmultipointhandler.cpp b/src/quick/handlers/qquickmultipointhandler.cpp
index 9eddd90a50..4e633276ab 100644
--- a/src/quick/handlers/qquickmultipointhandler.cpp
+++ b/src/quick/handlers/qquickmultipointhandler.cpp
@@ -80,6 +80,9 @@ bool QQuickMultiPointHandler::wantsPointerEvent(QQuickPointerEvent *event)
         return true;
 #endif
 
+    if (event->asPointerScrollEvent())
+        return false;
+
     if (hasCurrentPoints(event))
         return true;
 
-- 
cgit v1.2.3