diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-07-14 04:06:57 (GMT) |
| commit | 423e373ed0935ebe3d2f54a4c56101081c3311b5 (patch) | |
| tree | 35e27c69dee1d96775f4a921e93f5cd2e574a834 /src/declarative/graphicsitems/qdeclarativeflickable_p.h | |
| parent | a9b6c59857c28f48e093abccaf9a89755b0995bc (diff) | |
| parent | 444fa479484f80cbd5de3e9c5fa2b2e4082643dd (diff) | |
| download | Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.zip Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.gz Qt-423e373ed0935ebe3d2f54a4c56101081c3311b5.tar.bz2 | |
Merge branch '4.7' of ../oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h index d40a0dc..44f2bcf 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h @@ -52,7 +52,7 @@ QT_MODULE(Declarative) class QDeclarativeFlickablePrivate; class QDeclarativeFlickableVisibleArea; -class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem +class Q_AUTOTEST_EXPORT QDeclarativeFlickable : public QDeclarativeItem { Q_OBJECT @@ -60,6 +60,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged) Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged) Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged) + Q_PROPERTY(QDeclarativeItem *contentItem READ contentItem CONSTANT) Q_PROPERTY(qreal horizontalVelocity READ horizontalVelocity NOTIFY horizontalVelocityChanged) Q_PROPERTY(qreal verticalVelocity READ verticalVelocity NOTIFY verticalVelocityChanged) @@ -73,7 +74,6 @@ class Q_DECLARATIVE_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) @@ -111,10 +111,10 @@ public: void setContentHeight(qreal); qreal contentX() const; - void setContentX(qreal pos); + virtual void setContentX(qreal pos); qreal contentY() const; - void setContentY(qreal pos); + virtual void setContentY(qreal pos); bool isMoving() const; bool isMovingHorizontally() const; @@ -143,11 +143,9 @@ public: bool isAtYEnd() const; bool isAtYBeginning() const; - QDeclarativeItem *viewport(); + 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); |