diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-04-14 05:48:40 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-04-14 05:48:40 (GMT) |
| commit | 2333ad8b4b93337c2515bc673b100c47b45e516b (patch) | |
| tree | a338e4682dc857658824e7f07efe9ca57e4b9d0e /src/gui/graphicsview/qgraphicsitem.h | |
| parent | c6483baf226e9e698983aa596761825ad4a8a698 (diff) | |
| parent | 37581fa549c5cbe56afc68c71fa97d8f933512c0 (diff) | |
| download | Qt-2333ad8b4b93337c2515bc673b100c47b45e516b.zip Qt-2333ad8b4b93337c2515bc673b100c47b45e516b.tar.gz Qt-2333ad8b4b93337c2515bc673b100c47b45e516b.tar.bz2 | |
Merge branch '4.7' into reviews/2361
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.h
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 9cc75af..9891af3 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -554,6 +554,9 @@ class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint WRITE setTransformOriginPoint) +#ifndef QT_NO_GRAPHICSEFFECT + Q_PROPERTY(QGraphicsEffect *effect READ graphicsEffect WRITE setGraphicsEffect) +#endif Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), QDeclarativeListProperty<QGraphicsObject> children READ childrenList DESIGNABLE false NOTIFY childrenChanged) Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), qreal width READ width WRITE setWidth NOTIFY widthChanged RESET resetWidth FINAL) Q_PRIVATE_PROPERTY(QGraphicsItem::d_func(), qreal height READ height WRITE setHeight NOTIFY heightChanged RESET resetHeight FINAL) |