diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:08:15 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:42:06 (GMT) |
| commit | 9ace4e68eb0636284ecf73ed82e4518bbf0208be (patch) | |
| tree | 2f62bcd7b0bad14910d9573c470c2bf25a43afe0 /src/declarative/graphicsitems/qdeclarativeflickable_p.h | |
| parent | f4c7b4f046669a4a3d6ed1e8d538e17648d27b4d (diff) | |
| download | Qt-9ace4e68eb0636284ecf73ed82e4518bbf0208be.zip Qt-9ace4e68eb0636284ecf73ed82e4518bbf0208be.tar.gz Qt-9ace4e68eb0636284ecf73ed82e4518bbf0208be.tar.bz2 | |
Port Flickable and Flipable to support QGraphicsObject.
Replacing QDeclarativeItem* members by QGraphicsObject*. Build fix too.
Reviewed-by:akennedy
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h index 7dcab98..1fa2c74 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h @@ -82,7 +82,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlickable : public QDeclarativeItem Q_PROPERTY(QDeclarativeFlickableVisibleArea *visibleArea READ visibleArea CONSTANT) Q_PROPERTY(QDeclarativeListProperty<QObject> flickableData READ flickableData) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeItem> flickableChildren READ flickableChildren) + Q_PROPERTY(QDeclarativeListProperty<QGraphicsObject> flickableChildren READ flickableChildren) Q_CLASSINFO("DefaultProperty", "flickableData") Q_ENUMS(FlickDirection) @@ -92,7 +92,7 @@ public: ~QDeclarativeFlickable(); QDeclarativeListProperty<QObject> flickableData(); - QDeclarativeListProperty<QDeclarativeItem> flickableChildren(); + QDeclarativeListProperty<QGraphicsObject> flickableChildren(); bool overShoot() const; void setOverShoot(bool); |