diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:02:48 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:41:48 (GMT) |
| commit | 3ded7df045edf0639d83664605aa4236715c6d39 (patch) | |
| tree | 0fccf57ae10fb7d797a34ecb4efce60da22f14b7 /src/declarative/graphicsitems/qdeclarativeitem.h | |
| parent | 32b5fdfabf3158c7b03d1011f4551a45371b27e3 (diff) | |
| download | Qt-3ded7df045edf0639d83664605aa4236715c6d39.zip Qt-3ded7df045edf0639d83664605aa4236715c6d39.tar.gz Qt-3ded7df045edf0639d83664605aa4236715c6d39.tar.bz2 | |
Remove the children property from QDeclarativeItem.
This commit remove the children property from QDeclarativeItem because
it's now in QGraphicsObject. This commit also get rid of width and height
properties to use the one in QGraphicsObject.
Task-number:QT-2757
Reviewed-by:akennedy
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeitem.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index c88b1db..712e854 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -71,13 +71,10 @@ class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDe Q_PROPERTY(QDeclarativeItem * parent READ parentItem WRITE setParentItem NOTIFY parentChanged DESIGNABLE false FINAL) Q_PROPERTY(QDeclarativeListProperty<QObject> data READ data DESIGNABLE false) - Q_PROPERTY(QDeclarativeListProperty<QDeclarativeItem> children READ fxChildren DESIGNABLE false NOTIFY childrenChanged) Q_PROPERTY(QDeclarativeListProperty<QObject> resources READ resources DESIGNABLE false) Q_PROPERTY(QDeclarativeListProperty<QDeclarativeState> states READ states DESIGNABLE false) Q_PROPERTY(QDeclarativeListProperty<QDeclarativeTransition> transitions READ transitions DESIGNABLE false) Q_PROPERTY(QString state READ state WRITE setState NOTIFY stateChanged) - Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL) - Q_PROPERTY(qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL) Q_PROPERTY(QRectF childrenRect READ childrenRect NOTIFY childrenRectChanged DESIGNABLE false FINAL) Q_PROPERTY(QDeclarativeAnchors * anchors READ anchors DESIGNABLE false CONSTANT FINAL) Q_PROPERTY(QDeclarativeAnchorLine left READ left CONSTANT FINAL) @@ -113,7 +110,6 @@ public: void setParent(QDeclarativeItem *parent) { setParentItem(parent); } QDeclarativeListProperty<QObject> data(); - QDeclarativeListProperty<QDeclarativeItem> fxChildren(); QDeclarativeListProperty<QObject> resources(); QDeclarativeAnchors *anchors(); @@ -173,8 +169,6 @@ public: QDeclarativeAnchorLine baseline() const; Q_SIGNALS: - void widthChanged(qreal); - void heightChanged(qreal); void childrenChanged(); void childrenRectChanged(const QRectF &); void baselineOffsetChanged(qreal); @@ -235,9 +229,11 @@ QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, QDeclarativeItem *item); QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeItem) +QML_DECLARE_TYPE(QGraphicsObject) QML_DECLARE_TYPE(QGraphicsTransform) QML_DECLARE_TYPE(QGraphicsScale) QML_DECLARE_TYPE(QGraphicsRotation) +QML_DECLARE_TYPE(QGraphicsWidget) QML_DECLARE_TYPE(QAction) QT_END_HEADER |