Remove deprecated Flickable::overshoot property.

2 files changed, 0 insertions, 24 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 560d586..1dde510 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1026,24 +1026,6 @@ QDeclarativeListProperty<QGraphicsObject> QDeclarativeFlickable::flickableChildr
     return QGraphicsItemPrivate::get(d->viewport)->childrenList();
 }
 
-bool QDeclarativeFlickable::overShoot() const
-{
-    Q_D(const QDeclarativeFlickable);
-    return d->boundsBehavior == DragAndOvershootBounds;
-}
-
-void QDeclarativeFlickable::setOverShoot(bool o)
-{
-    Q_D(QDeclarativeFlickable);
-    if ((o && d->boundsBehavior == DragAndOvershootBounds)
-        || (!o && d->boundsBehavior == StopAtBounds))
-        return;
-    qmlInfo(this) << "overshoot is deprecated and will be removed imminently - use boundsBehavior.";
-    d->boundsBehavior = o ? DragAndOvershootBounds : StopAtBounds;
-    emit boundsBehaviorChanged();
-    emit overShootChanged();
-}
-
 /*!
     \qmlproperty enumeration Flickable::boundsBehavior
     This property holds whether the surface may be dragged
@@ -1078,7 +1060,6 @@ void QDeclarativeFlickable::setBoundsBehavior(BoundsBehavior b)
         return;
     d->boundsBehavior = b;
     emit boundsBehaviorChanged();
-    emit overShootChanged();
 }
 
 /*!
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();