diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-04 11:35:17 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-04 11:35:17 (GMT) |
| commit | b576bca55f88ed749a0a2b409be986dbf6b96b0a (patch) | |
| tree | 69789d636ff2328cfc4101851f9a28de4a2a825e /examples/animation/stickman/node.h | |
| parent | 0b8062f5fbd7622a528ce61b767d00fbcdfc74a0 (diff) | |
| parent | 9d85dcf10d580a45c261e3e1a8d8df7d41cb9437 (diff) | |
| download | Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.zip Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.gz Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples/animation/stickman/node.h')
| -rw-r--r-- | examples/animation/stickman/node.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/animation/stickman/node.h b/examples/animation/stickman/node.h index 66ee565..4360d2e 100644 --- a/examples/animation/stickman/node.h +++ b/examples/animation/stickman/node.h @@ -44,10 +44,9 @@ #include <QGraphicsItem> -class Node: public QObject, public QGraphicsItem +class Node: public QGraphicsObject { Q_OBJECT - Q_PROPERTY(QPointF position READ pos WRITE setPos) public: Node(const QPointF &pos, QGraphicsItem *parent = 0); ~Node(); |