diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 14:52:52 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-02 14:52:52 +0200 |
| commit | 7238de11c5028e6f9aeaed74295049b1e172294c (patch) | |
| tree | 370099640c8018d85e8613366d1e2276ab3f5ef1 /src/quick/items/qquickflickable_p_p.h | |
| parent | d1af0a90e6663d49c3e78ac674b0a1ae040c2085 (diff) | |
| parent | 41e924eb6e1c690bc81d095fc5e8f57244aae964 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 07c434f452..33a642eb69 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -101,7 +101,7 @@ public: AxisData(QQuickFlickablePrivate *fp, void (QQuickFlickablePrivate::*func)(qreal)) : move(fp, func) , transitionToBounds(0) - , viewSize(-1), lastPos(0), startMargin(0), endMargin(0) + , viewSize(-1), lastPos(0), velocity(0), startMargin(0), endMargin(0) , origin(0) , transitionTo(0) , continuousFlickVelocity(0), velocityTime(), vTime(0) |