diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:35:10 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:35:10 (GMT) |
| commit | 47862497693ffac597557f940535909df549d897 (patch) | |
| tree | 955c2c9d0f014e79ec6f3fe801f2e2baa4b4bfa1 /src/declarative/graphicsitems/qdeclarativeflickable_p_p.h | |
| parent | fb94bfda66ac8767c96cb521a1f77c6b8be5bb95 (diff) | |
| download | Qt-47862497693ffac597557f940535909df549d897.zip Qt-47862497693ffac597557f940535909df549d897.tar.gz Qt-47862497693ffac597557f940535909df549d897.tar.bz2 | |
Replace Flickable overshoot property with boundsBehavior
Task-number: QTBUG-9993
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h index 1a04091..01cfb18 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h @@ -131,7 +131,6 @@ public: AxisData vData; QDeclarativeTimeLine timeline; - bool overShoot : 1; bool flicked : 1; bool moving : 1; bool stealMouse : 1; @@ -160,6 +159,7 @@ public: QDeclarativeTimeLine velocityTimeline; QDeclarativeFlickableVisibleArea *visibleArea; QDeclarativeFlickable::FlickDirection flickDirection; + QDeclarativeFlickable::BoundsBehavior boundsBehavior; void handleMousePressEvent(QGraphicsSceneMouseEvent *); void handleMouseMoveEvent(QGraphicsSceneMouseEvent *); |