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/qdeclarativeflipable_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/qdeclarativeflipable_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflipable_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable_p.h b/src/declarative/graphicsitems/qdeclarativeflipable_p.h index 8b9c24c..302f083 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflipable_p.h @@ -60,8 +60,8 @@ class Q_DECLARATIVE_EXPORT QDeclarativeFlipable : public QDeclarativeItem Q_OBJECT Q_ENUMS(Side) - Q_PROPERTY(QDeclarativeItem *front READ front WRITE setFront) - Q_PROPERTY(QDeclarativeItem *back READ back WRITE setBack) + Q_PROPERTY(QGraphicsObject *front READ front WRITE setFront) + Q_PROPERTY(QGraphicsObject *back READ back WRITE setBack) Q_PROPERTY(Side side READ side NOTIFY sideChanged) //### flipAxis //### flipRotation @@ -69,11 +69,11 @@ public: QDeclarativeFlipable(QDeclarativeItem *parent=0); ~QDeclarativeFlipable(); - QDeclarativeItem *front(); - void setFront(QDeclarativeItem *); + QGraphicsObject *front(); + void setFront(QGraphicsObject *); - QDeclarativeItem *back(); - void setBack(QDeclarativeItem *); + QGraphicsObject *back(); + void setBack(QGraphicsObject *); enum Side { Front, Back }; Side side() const; |