3 files changed, 2 insertions, 38 deletions
diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro
index 7d6dab913..bdb616a27 100644
--- a/tests/auto/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/qmediaplayer/qmediaplayer.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += network multimediakit-private multimediakitwidgets-private
+QT += network multimediakit-private
 CONFIG += no_private_qt_headers_warning
 
 HEADERS += tst_qmediaplayer.h
diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
index fb438f626..8117ae1aa 100644
--- a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
@@ -43,7 +43,6 @@
 
 #include "tst_qmediaplayer.h"
 
-#include <qgraphicsvideoitem.h>
 #include <QtNetwork/qnetworkconfigmanager.h>
 
 // Encouraging successful diversity through copy and paste.
@@ -936,29 +935,14 @@ void tst_QMediaPlayer::testNetworkAccess()
 
 void tst_QMediaPlayer::testSetVideoOutput()
 {
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
     MockVideoSurface surface;
 
     MockMediaPlayerService service;
     MockMediaServiceProvider provider(&service);
     QMediaPlayer player(0, 0, &provider);
 
-    player.setVideoOutput(&widget);
-    QVERIFY(widget.mediaObject() == &player);
-
-    player.setVideoOutput(&item);
-    QVERIFY(widget.mediaObject() == 0);
-    QVERIFY(item.mediaObject() == &player);
-
     player.setVideoOutput(reinterpret_cast<QVideoWidget *>(0));
-    QVERIFY(item.mediaObject() == 0);
-
-    player.setVideoOutput(&widget);
-    QVERIFY(widget.mediaObject() == &player);
-
     player.setVideoOutput(reinterpret_cast<QGraphicsVideoItem *>(0));
-    QVERIFY(widget.mediaObject() == 0);
 
     player.setVideoOutput(&surface);
     QVERIFY(service.rendererControl->surface() == &surface);
@@ -969,54 +953,35 @@ void tst_QMediaPlayer::testSetVideoOutput()
     player.setVideoOutput(&surface);
     QVERIFY(service.rendererControl->surface() == &surface);
 
-    player.setVideoOutput(&widget);
+    player.setVideoOutput(reinterpret_cast<QVideoWidget *>(0));
     QVERIFY(service.rendererControl->surface() == 0);
-    QVERIFY(widget.mediaObject() == &player);
 
     player.setVideoOutput(&surface);
     QVERIFY(service.rendererControl->surface() == &surface);
-    QVERIFY(widget.mediaObject() == 0);
 }
 
 
 void tst_QMediaPlayer::testSetVideoOutputNoService()
 {
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
     MockVideoSurface surface;
 
     MockMediaServiceProvider provider(0, true);
     QMediaPlayer player(0, 0, &provider);
 
-    player.setVideoOutput(&widget);
-    QVERIFY(widget.mediaObject() == 0);
-
-    player.setVideoOutput(&item);
-    QVERIFY(item.mediaObject() == 0);
-
     player.setVideoOutput(&surface);
     // Nothing we can verify here other than it doesn't assert.
 }
 
 void tst_QMediaPlayer::testSetVideoOutputNoControl()
 {
-    QVideoWidget widget;
-    QGraphicsVideoItem item;
     MockVideoSurface surface;
 
     MockMediaPlayerService service;
     service.rendererRef = 1;
-    service.windowRef = 1;
 
     MockMediaServiceProvider provider(&service);
     QMediaPlayer player(0, 0, &provider);
 
-    player.setVideoOutput(&widget);
-    QVERIFY(widget.mediaObject() == 0);
-
-    player.setVideoOutput(&item);
-    QVERIFY(item.mediaObject() == 0);
-
     player.setVideoOutput(&surface);
     QVERIFY(service.rendererControl->surface() == 0);
 }
diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.h b/tests/auto/qmediaplayer/tst_qmediaplayer.h
index c87c65a7d..76a94cccf 100755
--- a/tests/auto/qmediaplayer/tst_qmediaplayer.h
+++ b/tests/auto/qmediaplayer/tst_qmediaplayer.h
@@ -54,7 +54,6 @@
 #include <qmediastreamscontrol.h>
 #include <qmedianetworkaccesscontrol.h>
 #include <qvideorenderercontrol.h>
-#include <qvideowindowcontrol.h>
 
 #include "mockmediaserviceprovider.h"
 #include "mockmediaplayerservice.h"