diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-15 14:24:46 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-22 04:04:23 +0000 |
| commit | 3d57afaca9d9d19e42342c270c19c86128668277 (patch) | |
| tree | 6a1f955341d0e7f5b195667f781935292a5ad67f /src/quick/items/qquickflickable_p_p.h | |
| parent | 7c06b3f9018249ca313b5dd2e6d34f3da9e8835c (diff) | |
Flickable: handle the new ScrollMomentum phase in QWheelEvent
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>
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
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; |