diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-07 03:30:11 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-13 04:43:41 (GMT) |
| commit | 957751d93aeb8d5c2703fa3d13d8b3a0e0334d51 (patch) | |
| tree | f9c26387d30f1f1e7518d05c6c7d14f78f82d3e6 /src | |
| parent | 8b19260629f9d83db7803a80c6856aa9c2bd280b (diff) | |
| download | Qt-957751d93aeb8d5c2703fa3d13d8b3a0e0334d51.zip Qt-957751d93aeb8d5c2703fa3d13d8b3a0e0334d51.tar.gz Qt-957751d93aeb8d5c2703fa3d13d8b3a0e0334d51.tar.bz2 | |
Remove deprecated Flickable.flickDirection
(cherry picked from commit e3bc34b40559e0cb88363039ee61300478e7c700)
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/QmlChanges.txt | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable.cpp | 12 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p.h | 3 |
3 files changed, 1 insertions, 16 deletions
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt index a0e013f..259d9a9 100644 --- a/src/declarative/QmlChanges.txt +++ b/src/declarative/QmlChanges.txt @@ -1,5 +1,5 @@ ============================================================================= -The changes below are pre Qt 4.7.0 RC +The changes below are pre Qt 4.7.0 beta 2 QDeclarativeView - initialSize() function added diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index a40546f..70cbf74 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -641,18 +641,6 @@ void QDeclarativeFlickable::setFlickableDirection(FlickableDirection direction) } } -QDeclarativeFlickable::FlickableDirection QDeclarativeFlickable::flickDirection() const -{ - qmlInfo(this) << "'flickDirection' is deprecated. Please use 'flickableDirection' instead."; - return flickableDirection(); -} - -void QDeclarativeFlickable::setFlickDirection(FlickableDirection direction) -{ - qmlInfo(this) << "'flickDirection' is deprecated. Please use 'flickableDirection' instead."; - setFlickableDirection(direction); -} - void QDeclarativeFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEvent *event) { if (interactive && timeline.isActive() && (qAbs(hData.velocity) > 10 || qAbs(vData.velocity) > 10)) diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h index 47746c6..44f2bcf 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h @@ -74,7 +74,6 @@ class Q_AUTOTEST_EXPORT QDeclarativeFlickable : public QDeclarativeItem Q_PROPERTY(bool flicking READ isFlicking NOTIFY flickingChanged) Q_PROPERTY(bool flickingHorizontally READ isFlickingHorizontally NOTIFY flickingHorizontallyChanged) Q_PROPERTY(bool flickingVertically READ isFlickingVertically NOTIFY flickingVerticallyChanged) - Q_PROPERTY(FlickableDirection flickDirection READ flickDirection WRITE setFlickDirection NOTIFY flickableDirectionChanged) // deprecated Q_PROPERTY(FlickableDirection flickableDirection READ flickableDirection WRITE setFlickableDirection NOTIFY flickableDirectionChanged) Q_PROPERTY(bool interactive READ isInteractive WRITE setInteractive NOTIFY interactiveChanged) @@ -147,8 +146,6 @@ public: QDeclarativeItem *contentItem(); enum FlickableDirection { AutoFlickDirection=0x00, HorizontalFlick=0x01, VerticalFlick=0x02, HorizontalAndVerticalFlick=0x03 }; - FlickableDirection flickDirection() const; // deprecated - void setFlickDirection(FlickableDirection); // deprecated FlickableDirection flickableDirection() const; void setFlickableDirection(FlickableDirection); |