diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-06 23:16:10 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-05-08 15:07:41 +0200 |
commit | a3c9fb78cb33c29d49dbe83d0525c5935e77beed (patch) | |
tree | b01c7f709c3c48326b8d11503e5da4478b3666af /src/quick/items/qquickflickable.cpp | |
parent | 93563959cd9e64087599a829fc7d6afe22d3b487 (diff) | |
parent | cef5e9d385d0cf78e43e8ea41edf253b78f0ca13 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: Ia06843de255547174efa556b1ab76be4b4be4287
Diffstat (limited to 'src/quick/items/qquickflickable.cpp')
-rw-r--r-- | src/quick/items/qquickflickable.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 40719c6324..a631512877 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -565,18 +565,6 @@ void QQuickFlickablePrivate::updateBeginningEnd() visibleArea->updateVisible(); } -/* -XXXTODO add docs describing moving, dragging, flicking properties, e.g. - -When the user starts dragging the Flickable, the dragging and moving properties -will be true. - -If the velocity is sufficient when the drag is ended, flicking may begin. - -The moving properties will remain true until all dragging and flicking -is finished. -*/ - /*! \qmlsignal QtQuick::Flickable::dragStarted() @@ -2801,3 +2789,5 @@ void QQuickFlickable::setBoundsMovement(BoundsMovement movement) } QT_END_NAMESPACE + +#include "moc_qquickflickable_p.cpp" |