diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-12 12:23:40 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-12 12:23:40 (GMT) |
| commit | 0f790634c57400f4ddffd36f5e3443c712d1a1c3 (patch) | |
| tree | 2b9f01a1798c5700f3c82e72a3db97dac6a625d5 /src/multimedia/base/qgraphicsvideoitem.h | |
| parent | 67e8e5baeec38d592596f259894e6dda420728ea (diff) | |
| parent | 119d7dddc8da189ccd1cbc55ed3292f311c30e0c (diff) | |
| download | Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.zip Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.gz Qt-0f790634c57400f4ddffd36f5e3443c712d1a1c3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/multimedia/base/qgraphicsvideoitem.h')
| -rw-r--r-- | src/multimedia/base/qgraphicsvideoitem.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/base/qgraphicsvideoitem.h b/src/multimedia/base/qgraphicsvideoitem.h index c339606..e6f0d81 100644 --- a/src/multimedia/base/qgraphicsvideoitem.h +++ b/src/multimedia/base/qgraphicsvideoitem.h @@ -90,6 +90,9 @@ Q_SIGNALS: void nativeSizeChanged(const QSizeF &size); protected: + bool event(QEvent *event); + bool sceneEvent(QEvent *event); + QVariant itemChange(GraphicsItemChange change, const QVariant &value); QGraphicsVideoItemPrivate *d_ptr; |