diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-30 00:16:40 +0200 |
| commit | 0bf14044178d7aa212ac7e28530f9077790a3df4 (patch) | |
| tree | 4c403571abbc5e18c6962ba67d9cb584d8e121c4 /src/quick/items/qquickflickable.cpp | |
| parent | 0aea009425242417bffdb171c8eca02ff52f4a7b (diff) | |
| parent | 79cfc8788d6267eeb263983466ba21758f618dcd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp
Change-Id: I241cd418bb7e7b95e0a0a2ee4c465d48be2a5582
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index c838eae3c7..49117d27d1 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -1573,7 +1573,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); } } @@ -1626,7 +1626,7 @@ void QQuickFlickable::viewportMoved(Qt::Orientations orient) void QQuickFlickablePrivate::viewportAxisMoved(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize, QQuickTimeLineCallback::Callback fixupCallback) { - if (pressed || calcVelocity) { + if (!scrollingPhase && (pressed || calcVelocity)) { int elapsed = data.velocityTime.restart(); if (elapsed > 0) { qreal velocity = (data.lastPos - data.move.value()) * 1000 / elapsed; |