summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-04-08 01:34:21 (GMT)
committerDmytro Poplavskiy <dmytro.poplavskiy@nokia.com>2010-04-08 01:34:21 (GMT)
commitf5ad30c5b425ea4ebaa25d0ffc3d1c3e1f96ae09 (patch)
tree057d07190ee6760926125057e5dd80284dab11b1 /src/multimedia
parent02312c82024103f99affe5ad65c377cda99e1ff3 (diff)
downloadQt-f5ad30c5b425ea4ebaa25d0ffc3d1c3e1f96ae09.zip
Qt-f5ad30c5b425ea4ebaa25d0ffc3d1c3e1f96ae09.tar.gz
Qt-f5ad30c5b425ea4ebaa25d0ffc3d1c3e1f96ae09.tar.bz2
Reimplemented event() and sceneEvent() in video item, for BC.
Reviewed-by: Andrew den Exter
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/base/qgraphicsvideoitem.cpp23
-rw-r--r--src/multimedia/base/qgraphicsvideoitem.h3
2 files changed, 24 insertions, 2 deletions
diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index d5ca9e8..f903eb7 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -410,9 +410,28 @@ void QGraphicsVideoItem::paint(
*/
QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVariant &value)
{
- return QGraphicsItem::itemChange(change, value);
+ return QGraphicsObject::itemChange(change, value);
}
-QT_END_NAMESPACE
+/*!
+ \reimp
+ \internal
+*/
+bool QGraphicsVideoItem::event(QEvent *event)
+{
+ return QGraphicsObject::event(event);
+}
+
+/*!
+ \reimp
+
+ \internal
+*/
+bool QGraphicsVideoItem::sceneEvent(QEvent *event)
+{
+ return QGraphicsObject::sceneEvent(event);
+}
+
+QT_END_NAMESPACE
#include "moc_qgraphicsvideoitem.cpp"
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;