diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-07-22 13:43:43 +0200 |
| commit | 3a6f5735ee723ff998114314c5ccdf6609667f6f (patch) | |
| tree | 9c877dd1e35972fa336cea8a61986594f168b49c /src/quick/items/qquickflickable.cpp | |
| parent | 000b6330d4ca7165ff241b21ee728ed28d82fba1 (diff) | |
| parent | 17ded06804576dfde1b19f82f168f7ceb09ec92c (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4
Conflicts:
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro
Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc
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 e6b39d5380..75d509129b 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -2384,7 +2384,7 @@ void QQuickFlickable::movementEnding(bool hMovementEnding, bool vMovementEnding) } // emit moving signals - bool wasMoving = d->hData.moving || d->vData.moving; + bool wasMoving = isMoving(); if (hMovementEnding && d->hData.moving && (!d->pressed && !d->stealMouse)) { d->hData.moving = false; @@ -2397,7 +2397,7 @@ void QQuickFlickable::movementEnding(bool hMovementEnding, bool vMovementEnding) d->vMoved = false; emit movingVerticallyChanged(); } - if (wasMoving && (!d->hData.moving || !d->vData.moving)) { + if (wasMoving && !isMoving()) { emit movingChanged(); emit movementEnded(); } |