diff options
| author | aavit <qt-info@nokia.com> | 2010-03-31 12:00:03 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-03-31 12:00:03 (GMT) |
| commit | 85313fec454f77322deb7041726573e14f6a262a (patch) | |
| tree | e0151a738a3acc91e16411869e160042e63bbc9a /src/declarative/graphicsitems/qdeclarativeflipable_p.h | |
| parent | 2fe059c863377befdcf65084a07a7f4841beef0d (diff) | |
| parent | 93ae014d7ee06a6ebb701420fffef5895cd731c4 (diff) | |
| download | Qt-85313fec454f77322deb7041726573e14f6a262a.zip Qt-85313fec454f77322deb7041726573e14f6a262a.tar.gz Qt-85313fec454f77322deb7041726573e14f6a262a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
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; |