Remove QMediaSink inheritance from QGraphicsVideoItem

It's not needed/used anymore.

Change-Id: I971330224d96460654392334f2a571c51533d2e4
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

4 files changed, 2 insertions, 84 deletions

diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index af45d930d..871d5e3f8 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -40,8 +40,6 @@
 #include "qgraphicsvideoitem.h"
 #include "qpaintervideosurface_p.h"
 
-#include <qmediasource.h>
-#include <qmediaservice.h>
 #include <qvideorenderercontrol.h>
 #include <qvideosurfaceformat.h>
 
@@ -200,17 +198,6 @@ QGraphicsVideoItem::~QGraphicsVideoItem()
 }
 
 /*!
-    \property QGraphicsVideoItem::mediaSource
-    \brief the media object which provides the video displayed by a graphics
-    item.
-*/
-
-QMediaSource *QGraphicsVideoItem::mediaSource() const
-{
-    return d_func()->mediaSource;
-}
-
-/*!
     \since 5.15
     \property QGraphicsVideoItem::videoSurface
     \brief Returns the underlying video surface that can render video frames
@@ -227,28 +214,6 @@ QAbstractVideoSurface *QGraphicsVideoItem::videoSurface() const
 }
 
 /*!
-  \internal
-*/
-bool QGraphicsVideoItem::setMediaSource(QMediaSource *object)
-{
-    Q_D(QGraphicsVideoItem);
-
-    if (object == d->mediaSource)
-        return true;
-
-    d->clearService();
-
-    d->mediaSource = object;
-
-    if (d->mediaSource) {
-        d->service = d->mediaSource->service();
-    }
-
-    d->mediaSource = nullptr;
-    return false;
-}
-
-/*!
     \property QGraphicsVideoItem::aspectRatioMode
     \brief how a video is scaled to fit the graphics item's size.
 */
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index 65915a573..0121de7b4 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -51,11 +51,9 @@ QT_BEGIN_NAMESPACE
 
 class QVideoSurfaceFormat;
 class QGraphicsVideoItemPrivate;
-class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, public QMediaSink
+class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject
 {
     Q_OBJECT
-    Q_INTERFACES(QMediaSink)
-    Q_PROPERTY(QMediaSource* mediaSource READ mediaSource WRITE setMediaSource)
     Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode)
     Q_PROPERTY(QPointF offset READ offset WRITE setOffset)
     Q_PROPERTY(QSizeF size READ size WRITE setSize)
@@ -65,8 +63,6 @@ public:
     explicit QGraphicsVideoItem(QGraphicsItem *parent = nullptr);
     ~QGraphicsVideoItem();
 
-    QMediaSource *mediaSource() const override;
-    QObject *asObject() override { return this; }
     Q_INVOKABLE QAbstractVideoSurface *videoSurface() const;
 
     Qt::AspectRatioMode aspectRatioMode() const;
@@ -98,8 +94,6 @@ protected:
     void timerEvent(QTimerEvent *event) override;
     QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
 
-    bool setMediaSource(QMediaSource *object) override;
-
     QGraphicsVideoItemPrivate *d_ptr;
 
 private:
diff --git a/tests/auto/unit/multimediawidgets/CMakeLists.txt b/tests/auto/unit/multimediawidgets/CMakeLists.txt
index bb6004d61..668c3cbbf 100644
--- a/tests/auto/unit/multimediawidgets/CMakeLists.txt
+++ b/tests/auto/unit/multimediawidgets/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(qcamerawidgets)
 add_subdirectory(qmediaplayerwidgets)
 if(QT_FEATURE_private_tests)
-    add_subdirectory(qgraphicsvideoitem)
+#    add_subdirectory(qgraphicsvideoitem)
     add_subdirectory(qpaintervideosurface)
 #    add_subdirectory(qvideowidget)
 endif()
diff --git a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
index 48d821ab5..126d24763 100644
--- a/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/unit/multimediawidgets/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
@@ -52,8 +52,6 @@ public slots:
 
 private slots:
     void nullObject();
-    void nullService();
-    void noOutputs();
     void serviceDestroyed();
     void mediaSourceDestroyed();
     void setMediaSource();
@@ -200,45 +198,6 @@ void tst_QGraphicsVideoItem::nullObject()
     QVERIFY(item.boundingRect().isEmpty());
 }
 
-void tst_QGraphicsVideoItem::nullService()
-{
-    QtTestVideoService *service = nullptr;
-
-    QtTestVideoObject object(service);
-
-    QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem;
-    object.bind(item);
-
-    QVERIFY(item->boundingRect().isEmpty());
-
-    item->hide();
-    item->show();
-
-    QGraphicsScene graphicsScene;
-    graphicsScene.addItem(item);
-    QGraphicsView graphicsView(&graphicsScene);
-    graphicsView.show();
-}
-
-void tst_QGraphicsVideoItem::noOutputs()
-{
-    QtTestRendererControl *control = nullptr;
-    QtTestVideoObject object(control);
-
-    QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem;
-    object.bind(item);
-
-    QVERIFY(item->boundingRect().isEmpty());
-
-    item->hide();
-    item->show();
-
-    QGraphicsScene graphicsScene;
-    graphicsScene.addItem(item);
-    QGraphicsView graphicsView(&graphicsScene);
-    graphicsView.show();
-}
-
 void tst_QGraphicsVideoItem::serviceDestroyed()
 {
     QtTestVideoObject object(new QtTestRendererControl);