summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeflickable_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-05-26 22:59:03 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-05-26 22:59:03 (GMT)
commita5391f187b91aaf9d6932f2ad1e81701e6cd0352 (patch)
tree17c72d2d882d8dde18c6701b8ff03e7473ec6433 /src/declarative/graphicsitems/qdeclarativeflickable_p.h
parent8c2de8858bac1220f27596039aaa6d9441a1ba5e (diff)
downloadQt-a5391f187b91aaf9d6932f2ad1e81701e6cd0352.zip
Qt-a5391f187b91aaf9d6932f2ad1e81701e6cd0352.tar.gz
Qt-a5391f187b91aaf9d6932f2ad1e81701e6cd0352.tar.bz2
Remove deprecated Flickable::overshoot property.
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable_p.h')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable_p.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index 05887b8..d40a0dc 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -64,7 +64,6 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem
Q_PROPERTY(qreal horizontalVelocity READ horizontalVelocity NOTIFY horizontalVelocityChanged)
Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged)
- Q_PROPERTY(bool overShoot READ overShoot WRITE setOverShoot NOTIFY overShootChanged) // deprecated
Q_PROPERTY(BoundsBehavior boundsBehavior READ boundsBehavior WRITE setBoundsBehavior NOTIFY boundsBehaviorChanged)
Q_PROPERTY(qreal maximumFlickVelocity READ maximumFlickVelocity WRITE setMaximumFlickVelocity NOTIFY maximumFlickVelocityChanged)
Q_PROPERTY(qreal flickDeceleration READ flickDeceleration WRITE setFlickDeceleration NOTIFY flickDecelerationChanged)
@@ -101,9 +100,6 @@ public:
QDeclarativeListProperty<QObject> flickableData();
QDeclarativeListProperty<QGraphicsObject> flickableChildren();
- bool overShoot() const;
- void setOverShoot(bool);
-
enum BoundsBehavior { StopAtBounds, DragOverBounds, DragAndOvershootBounds };
BoundsBehavior boundsBehavior() const;
void setBoundsBehavior(BoundsBehavior);
@@ -172,7 +168,6 @@ Q_SIGNALS:
void pageChanged();
void flickableDirectionChanged();
void interactiveChanged();
- void overShootChanged();
void boundsBehaviorChanged();
void maximumFlickVelocityChanged();
void flickDecelerationChanged();