summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2016-09-08 17:14:33 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2016-09-29 13:08:59 +0000
commit7b84962c47c9618af49526e3a2ef8c1c969d5aaa (patch)
tree3bbb101cf8ac91a1d322b9f53a8a0fbd6cfef739 /src
parent3a45458b96bdcbccc189aabf668e998ea03be46f (diff)
Flickable: do not emit movementEnded until it really does
This was occurring when using a physical mouse wheel: movementEnded was emitted, then contentYChanged would still be emitted a few more times. Task-number: QTBUG-55886 Change-Id: Ib5e833d5d84633bb07b8c240ea3ccc9977e443f8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquickflickable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 7c45d1c5ad..a5b4bb0309 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1563,7 +1563,7 @@ void QQuickFlickable::timerEvent(QTimerEvent *event)
d->movementEndingTimer.stop();
d->pressed = false;
d->stealMouse = false;
- if (!d->velocityTimeline.isActive())
+ if (!d->velocityTimeline.isActive() && !d->timeline.isActive())
movementEnding(true, true);
}
}