diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-06-24 04:19:45 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-06-24 04:19:45 (GMT) |
| commit | 9d6ccfea89ae99b747f70ece71185868f189d0f9 (patch) | |
| tree | 30590080c8c664a3b263a12055bfeb1bc9381091 /src/declarative/graphicsitems/qdeclarativeflickable_p.h | |
| parent | bb3ae9779730b6d4a0442ea5553b0dfab1a3da2b (diff) | |
| download | Qt-9d6ccfea89ae99b747f70ece71185868f189d0f9.zip Qt-9d6ccfea89ae99b747f70ece71185868f189d0f9.tar.gz Qt-9d6ccfea89ae99b747f70ece71185868f189d0f9.tar.bz2 | |
Expose the Flickable's internal contentItem
So that dynamically created items can be parented to the contentItem
and be flicked with the rest of the content.
Task-number: QTBUG-11674
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h index d40a0dc..be4846e 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h @@ -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) @@ -143,7 +144,7 @@ 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 |