diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2010-11-09 01:23:37 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2010-11-09 01:23:37 (GMT) |
| commit | 6b8a95b2521d843ec2b3f7c787c15b92e4ea686f (patch) | |
| tree | 346bc8925d83b2729f485d1259729fca931de07d /demos/qtdemo/itemcircleanimation.h | |
| parent | bb8f085611f4cb91b7bde7220d407948edcc572c (diff) | |
| parent | e00af84cc9230df411981d2f3b9296b61d5d1c50 (diff) | |
| download | Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.zip Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.tar.gz Qt-6b8a95b2521d843ec2b3f7c787c15b92e4ea686f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos/qtdemo/itemcircleanimation.h')
| -rw-r--r-- | demos/qtdemo/itemcircleanimation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qtdemo/itemcircleanimation.h b/demos/qtdemo/itemcircleanimation.h index 425d2f5..7276f7f 100644 --- a/demos/qtdemo/itemcircleanimation.h +++ b/demos/qtdemo/itemcircleanimation.h @@ -61,7 +61,7 @@ public: ItemCircleAnimation(QGraphicsScene *scene = 0, QGraphicsItem *parent = 0); virtual ~ItemCircleAnimation(); - // overidden methods: + // overridden methods: QRectF boundingRect() const; void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0); void hoverEnterEvent(QGraphicsSceneHoverEvent *event); |