diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2012-02-16 10:18:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-03 16:03:29 +0200 |
| commit | a81655579c6799671a289b20f44a9d36e7584064 (patch) | |
| tree | ccaaa7c7677a04fd1581c2b3bce20f8e3de9c5d7 /src/quick/items/qquickflickable_p_p.h | |
| parent | 50399e39a398cfd4bf0cdb6b514ad89c42fc0a20 (diff) | |
Fix emitting originYChanged signals even when originY wouldn't change
Same for originXChanged.
Conflicts:
src/quick/items/qquickflickable.cpp
src/quick/items/qquickflickable_p_p.h
Change-Id: I1a316f326b924da4722b692cf27db48312fc9236
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 49f27a48c7..ab5f03f34d 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -102,6 +102,7 @@ public: : move(fp, func) , transitionToBounds(0) , viewSize(-1), startMargin(0), endMargin(0) + , origin(0) , transitionTo(0) , continuousFlickVelocity(0), vTime(0) , smoothVelocity(fp), atEnd(false), atBeginning(true) @@ -146,6 +147,7 @@ public: qreal flickTarget; qreal startMargin; qreal endMargin; + qreal origin; qreal transitionTo; qreal continuousFlickVelocity; QElapsedTimer velocityTime; |