From 3d57afaca9d9d19e42342c270c19c86128668277 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Wed, 15 Aug 2018 14:24:46 +0200
Subject: Flickable: handle the new ScrollMomentum phase in QWheelEvent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now we can tell when macOS is sending wheel events that represent
simulated momentum, and Qt::ScrollEnd is guaranteed to mean that
scrolling actually ended.  So the timer to check whether it really
ended is no longer necessary.

This reverts commit 87a4d4babe0a3d6b8a57048205eccc7105931474.

Task-number: QTBUG-63026
Task-number: QTBUG-65160
Change-Id: I0988e934b43989a3501b89d0a77eee616328ece2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/quick/items/qquickflickable_p_p.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/quick/items/qquickflickable_p_p.h')

diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index dfb943d710..c538cf7878 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -223,7 +223,6 @@ public:
     bool pixelAligned : 1;
     bool syncDrag : 1;
     QElapsedTimer timer;
-    QBasicTimer movementEndingTimer;
     qint64 lastPosTime;
     qint64 lastPressTime;
     QPointF lastPos;
-- 
cgit v1.2.3