Rename QMediaPlayerControl to QPlatformMediaPlayer

This is the start of a larger renaming excercise, that
will hopefully bring us closer towards a final naming
convention for files and classes in the multimedia
backends.

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

43 files changed, 115 insertions, 113 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index 49dfb0b73..2668cd3fd 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -40,7 +40,7 @@
 
 #include "qdeclarativeaudio_p.h"
 
-#include <qmediaplayercontrol.h>
+#include <private/qplatformmediaplayer_p.h>
 
 #include <private/qdeclarativevideooutput_p.h>
 
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index ebae60324..e85105d44 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -61,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 class QTimerEvent;
-class QMediaPlayerControl;
+class QPlatformMediaPlayer;
 class QDeclarativeMediaBaseAnimation;
 class QDeclarativeMediaMetaData;
 
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp
index 6536bc5dc..41320edcf 100644
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -48,7 +48,7 @@
 
 #include "qdeclarativemediametadata_p.h"
 
-#include <qmediaplayercontrol.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <qvideorenderercontrol.h>
 #include <QMediaDeviceManager>
 #include <QtQml/qqmlinfo.h>
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index d68049f63..e7dcc3dd6 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule
 typeinfo plugins.qmltypes
 typeinfo plugins.qmltypes
 Video 5.0 Video.qml
+
diff --git a/src/multimedia/.prev_CMakeLists.txt b/src/multimedia/.prev_CMakeLists.txt
index 9c86565ed..8769b1f6c 100644
--- a/src/multimedia/.prev_CMakeLists.txt
+++ b/src/multimedia/.prev_CMakeLists.txt
@@ -37,7 +37,7 @@ qt_internal_add_module(Multimedia
         controls/qimageencodercontrol.cpp controls/qimageencodercontrol.h
         controls/qmediaaudioprobecontrol.cpp controls/qmediaaudioprobecontrol.h
         controls/qmediacontainercontrol.cpp controls/qmediacontainercontrol.h
-        controls/qmediaplayercontrol.cpp controls/qmediaplayercontrol.h
+        controls/qmediaplayercontrol.cpp controls/qplatformmediaplayer_p.h
         controls/qmediarecordercontrol.cpp controls/qmediarecordercontrol.h
         controls/qmediastreamscontrol.cpp controls/qmediastreamscontrol.h
         controls/qmediavideoprobecontrol.cpp controls/qmediavideoprobecontrol.h
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index e72d67228..25cde55ab 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -36,7 +36,6 @@ qt_internal_add_module(Multimedia
         controls/qcamerafocuscontrol.cpp controls/qcamerafocuscontrol.h
         controls/qcameraimagecapturecontrol.cpp controls/qcameraimagecapturecontrol.h
         controls/qcameraimageprocessingcontrol.cpp controls/qcameraimageprocessingcontrol.h
-        controls/qmediaplayercontrol.cpp controls/qmediaplayercontrol.h
         controls/qmediarecordercontrol.cpp controls/qmediarecordercontrol.h
         controls/qmediastreamscontrol.cpp controls/qmediastreamscontrol.h
         controls/qvideorenderercontrol.cpp controls/qvideorenderercontrol.h
@@ -45,6 +44,7 @@ qt_internal_add_module(Multimedia
         platform/qmediaplatformdevicemanager.cpp platform/qmediaplatformdevicemanager_p.h
         platform/qmediaplatformintegration.cpp platform/qmediaplatformintegration_p.h
         platform/qmediaplatformformatinfo.cpp  platform/qmediaplatformformatinfo_p.h
+        platform/qplatformmediaplayer.cpp platform/qplatformmediaplayer_p.h
         playback/qmediaplayer.cpp playback/qmediaplayer.h
         playback/qmediaplaylist.cpp playback/qmediaplaylist.h playback/qmediaplaylist_p.h
         playback/qplaylistfileparser.cpp playback/qplaylistfileparser_p.h
@@ -74,6 +74,7 @@ qt_internal_add_module(Multimedia
         audio
         camera
         controls
+        platform
         playback
         recording
         video
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index 663e55282..cba7f2a10 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -8,7 +8,7 @@ PUBLIC_HEADERS += \
     controls/qcamerafocuscontrol.h \
     controls/qcameraimagecapturecontrol.h \
     controls/qcameraimageprocessingcontrol.h \
-    controls/qmediaplayercontrol.h \
+    controls/qplatformmediaplayer_p.h \
     controls/qmediarecordercontrol.h \
     controls/qmediastreamscontrol.h \
     controls/qvideorenderercontrol.h \
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index 6b417cc74..4acbdc842 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -44,7 +44,7 @@
 
 #include "qmediaplaylist.h"
 #include "qmediarecorder.h"
-#include "qmediaplayercontrol.h"
+#include "qplatformmediaplayer_p.h"
 #include "qmediaplayer.h"
 #include "qvideowidget.h"
 #include "qcameraimagecapture.h"
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
index c613722bd..1d3af68d8 100644
--- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -76,7 +76,7 @@ private:
 
 
 QAndroidMediaPlayerControl::QAndroidMediaPlayerControl(QObject *parent)
-    : QMediaPlayerControl(parent),
+    : QPlatformMediaPlayer(parent),
       mMediaPlayer(new AndroidMediaPlayer),
       mCurrentState(QMediaPlayer::StoppedState),
       mCurrentMediaStatus(QMediaPlayer::NoMedia),
@@ -606,7 +606,7 @@ void QAndroidMediaPlayerControl::onError(qint32 what, qint32 extra)
         break;
     }
 
-    Q_EMIT QMediaPlayerControl::error(error, errorString);
+    Q_EMIT QPlatformMediaPlayer::error(error, errorString);
 }
 
 void QAndroidMediaPlayerControl::onBufferingChanged(qint32 percent)
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol_p.h b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
index 0cdc99688..4cf53d980 100644
--- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qglobal.h>
-#include <QMediaPlayerControl>
+#include <QPlatformMediaPlayer>
 #include <qsize.h>
 #include <qurl.h>
 
@@ -62,7 +62,7 @@ class AndroidMediaPlayer;
 class QAndroidVideoOutput;
 class QAndroidMediaPlayerVideoRendererControl;
 
-class QAndroidMediaPlayerControl : public QMediaPlayerControl
+class QAndroidMediaPlayerControl : public QPlatformMediaPlayer
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/android/qandroidintegration.cpp b/src/multimedia/platform/android/qandroidintegration.cpp
index 4e5987564..c173bf94e 100644
--- a/src/multimedia/platform/android/qandroidintegration.cpp
+++ b/src/multimedia/platform/android/qandroidintegration.cpp
@@ -85,7 +85,7 @@ QMediaPlatformCaptureInterface *QAndroidIntegration::createCaptureInterface(QMed
     return new QAndroidCaptureService(mode);
 }
 
-QMediaPlayerControl *QAndroidIntegration::createPlayer()
+QPlatformMediaPlayer *QAndroidIntegration::createPlayer()
 {
     return new QAndroidMediaPlayerControl();
 }
diff --git a/src/multimedia/platform/android/qandroidintegration_p.h b/src/multimedia/platform/android/qandroidintegration_p.h
index 36e936599..f123992b4 100644
--- a/src/multimedia/platform/android/qandroidintegration_p.h
+++ b/src/multimedia/platform/android/qandroidintegration_p.h
@@ -67,7 +67,7 @@ public:
     QMediaPlatformFormatInfo *formatInfo() override;
 
     QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override;
-    QMediaPlayerControl *createPlayer() override;
+    QPlatformMediaPlayer *createPlayer() override;
 
     QAndroidDeviceManager *m_manager = nullptr;
     QMediaPlatformFormatInfo  *m_formatInfo = nullptr;
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
index 47b47e8c6..c5d909fd1 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
@@ -43,7 +43,7 @@
 QT_USE_NAMESPACE
 
 AVFMediaPlayer::AVFMediaPlayer(QObject *parent) :
-    QMediaPlayerControl(parent)
+    QPlatformMediaPlayer(parent)
 {
     setSession(new AVFMediaPlayerSession(this));
 }
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
index 6338572e6..a2d7d7690 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
@@ -51,14 +51,14 @@
 // We mean it.
 //
 
-#include <QtMultimedia/QMediaPlayerControl>
+#include <QtMultimedia/QPlatformMediaPlayer>
 #include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
 
 class AVFMediaPlayerSession;
 
-class AVFMediaPlayer : public QMediaPlayerControl
+class AVFMediaPlayer : public QPlatformMediaPlayer
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
index 4c8fc6f48..bdca6639c 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
@@ -57,7 +57,7 @@
 #include <QtCore/QResource>
 #include <QtCore/QUrl>
 
-#include <QtMultimedia/QMediaPlayerControl>
+#include <QtMultimedia/QPlatformMediaPlayer>
 #include <QtMultimedia/QMediaPlayer>
 
 Q_FORWARD_DECLARE_OBJC_CLASS(AVAsset);
diff --git a/src/multimedia/platform/darwin/qdarwinintegration.cpp b/src/multimedia/platform/darwin/qdarwinintegration.cpp
index 9c1207c91..7a93880ed 100644
--- a/src/multimedia/platform/darwin/qdarwinintegration.cpp
+++ b/src/multimedia/platform/darwin/qdarwinintegration.cpp
@@ -75,7 +75,7 @@ QMediaPlatformCaptureInterface *QDarwinIntegration::createCaptureInterface(QMedi
     return new AVFCameraService;
 }
 
-QMediaPlayerControl *QDarwinIntegration::createPlayer()
+QPlatformMediaPlayer *QDarwinIntegration::createPlayer()
 {
     return new AVFMediaPlayer;
 }
diff --git a/src/multimedia/platform/darwin/qdarwinintegration_p.h b/src/multimedia/platform/darwin/qdarwinintegration_p.h
index 31405b62e..8e0dbc7bd 100644
--- a/src/multimedia/platform/darwin/qdarwinintegration_p.h
+++ b/src/multimedia/platform/darwin/qdarwinintegration_p.h
@@ -67,7 +67,7 @@ public:
     QMediaPlatformFormatInfo *formatInfo() override;
 
     QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) override;
-    QMediaPlayerControl *createPlayer() override;
+    QPlatformMediaPlayer *createPlayer() override;
 
     QDarwinDeviceManager *m_manager = nullptr;
     QMediaPlatformFormatInfo *m_formatInfo = nullptr;
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
index 0017df93b..de2f46715 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
@@ -56,7 +56,7 @@
 QT_BEGIN_NAMESPACE
 
 QGstreamerPlayerControl::QGstreamerPlayerControl(QObject *parent)
-    : QMediaPlayerControl(parent)
+    : QPlatformMediaPlayer(parent)
 {
     m_session = new QGstreamerPlayerSession(this);
     connect(m_session, &QGstreamerPlayerSession::positionChanged, this, &QGstreamerPlayerControl::positionChanged);
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol_p.h b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol_p.h
index 313ca6e1c..7de2dce43 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qstack.h>
-#include <qmediaplayercontrol.h>
+#include <qplatformmediaplayer_p.h>
 #include <private/qtmultimediaglobal_p.h>
 #include <qurl.h>
 
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class QGstreamerPlayerSession;
 class QGstreamerStreamsControl;
 
-class Q_MULTIMEDIA_EXPORT QGstreamerPlayerControl : public QMediaPlayerControl
+class Q_MULTIMEDIA_EXPORT QGstreamerPlayerControl : public QPlatformMediaPlayer
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
index 3fcda4754..bd42d362d 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
@@ -82,7 +82,7 @@ QMediaPlatformCaptureInterface *QGstreamerIntegration::createCaptureInterface(QM
     return new QGstreamerCaptureService(mode);
 }
 
-QMediaPlayerControl *QGstreamerIntegration::createPlayer()
+QPlatformMediaPlayer *QGstreamerIntegration::createPlayer()
 {
     return new QGstreamerPlayerControl();
 }
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
index 5e9825c9d..6eca24ebf 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
@@ -71,7 +71,7 @@ public:
 
     QAudioDecoderControl *createAudioDecoder() override;
     QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override;
-    QMediaPlayerControl *createPlayer() override;
+    QPlatformMediaPlayer *createPlayer() override;
 
     QGstreamerDeviceManager *m_manager = nullptr;
     QGstreamerFormatsInfo *m_formatsInfo = nullptr;
diff --git a/src/multimedia/platform/qmediaplatformintegration_p.h b/src/multimedia/platform/qmediaplatformintegration_p.h
index e17e9f958..5accc0423 100644
--- a/src/multimedia/platform/qmediaplatformintegration_p.h
+++ b/src/multimedia/platform/qmediaplatformintegration_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QMediaDeviceManager;
 class QMediaPlatformDeviceManager;
 class QMediaPlatformCaptureInterface;
-class QMediaPlayerControl;
+class QPlatformMediaPlayer;
 class QAudioDecoderControl;
 class QMediaPlatformFormatInfo;
 class QVideoRendererControl;
@@ -77,7 +77,7 @@ public:
 
     virtual QAudioDecoderControl *createAudioDecoder() { return nullptr; }
     virtual QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) { return nullptr; }
-    virtual QMediaPlayerControl *createPlayer() { return nullptr; }
+    virtual QPlatformMediaPlayer *createPlayer() { return nullptr; }
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
index b253ab36b..662858d61 100644
--- a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 static int idCounter = 0;
 
 MmRendererMediaPlayerControl::MmRendererMediaPlayerControl(QObject *parent)
-    : QMediaPlayerControl(parent),
+    : QPlatformMediaPlayer(parent),
       m_context(0),
       m_id(-1),
       m_connection(0),
diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
index f65db2eb4..8885ff3da 100644
--- a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
@@ -51,7 +51,7 @@
 //
 
 #include "mmrenderermetadata_p.h"
-#include <qmediaplayercontrol.h>
+#include <qplatformmediaplayer_p.h>
 #include <QtCore/qabstractnativeeventfilter.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qtimer.h>
@@ -68,7 +68,7 @@ class MmRendererCustomAudioRoleControl;
 class MmRendererPlayerVideoRendererControl;
 class MmRendererVideoWindowControl;
 
-class MmRendererMediaPlayerControl : public QMediaPlayerControl, public QAbstractNativeEventFilter
+class MmRendererMediaPlayerControl : public QPlatformMediaPlayer, public QAbstractNativeEventFilter
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
index e76da2b38..4d633f512 100644
--- a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice.cpp
@@ -74,7 +74,7 @@ void MmRendererMediaPlayerService::updateControls()
         m_mediaPlayerControl->setVideoWindowControl(m_videoWindowControl);
 }
 
-QMediaPlayerControl *MmRendererMediaPlayerService::player()
+QPlatformMediaPlayer *MmRendererMediaPlayerService::player()
 {
     if (!m_mediaPlayerControl) {
         m_mediaPlayerControl = new MmrEventMediaPlayerControl;
diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
index 206277e8b..b028fa465 100644
--- a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayerservice_p.h
@@ -67,7 +67,7 @@ public:
     ~MmRendererMediaPlayerService();
 
     // QMediaPlatformPlayerInterface
-    QMediaPlayerControl *player() override;
+    QPlatformMediaPlayer *player() override;
 //    QMediaStreamsControl *streams() override;
 
     QVideoRendererControl *createVideoRenderer() override;
diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/platform/qplatformmediaplayer.cpp
index 5eddbf164..5b24ee23b 100644
--- a/src/multimedia/controls/qmediaplayercontrol.cpp
+++ b/src/multimedia/platform/qplatformmediaplayer.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include "qmediaplayercontrol.h"
+#include "qplatformmediaplayer_p.h"
 #include "qmediaplayer.h"
 
 QT_BEGIN_NAMESPACE
 
 
 /*!
-    \class QMediaPlayerControl
+    \class QPlatformMediaPlayer
     \obsolete
     \inmodule QtMultimedia
 
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_control
 
 
-    \brief The QMediaPlayerControl class provides access to the media playing
+    \brief The QPlatformMediaPlayer class provides access to the media playing
     functionality.
 
     This control provides a means to set the \l {setMedia()}{media} to play,
@@ -71,19 +71,19 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a new media player control with the given \a parent.
 */
-QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
+QPlatformMediaPlayer::QPlatformMediaPlayer(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \fn QMediaPlayerControl::state() const
+    \fn QPlatformMediaPlayer::state() const
 
     Returns the state of a player control.
 */
 
 /*!
-    \fn QMediaPlayerControl::stateChanged(QMediaPlayer::State newState)
+    \fn QPlatformMediaPlayer::stateChanged(QMediaPlayer::State newState)
 
     Signals that the state of a player control has changed to \a newState.
 
@@ -91,14 +91,14 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::mediaStatus() const
+    \fn QPlatformMediaPlayer::mediaStatus() const
 
     Returns the status of the current media.
 */
 
 
 /*!
-    \fn QMediaPlayerControl::mediaStatusChanged(QMediaPlayer::MediaStatus status)
+    \fn QPlatformMediaPlayer::mediaStatusChanged(QMediaPlayer::MediaStatus status)
 
     Signals that the \a status of the current media has changed.
 
@@ -107,13 +107,13 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 
 
 /*!
-    \fn QMediaPlayerControl::duration() const
+    \fn QPlatformMediaPlayer::duration() const
 
     Returns the duration of the current media in milliseconds.
 */
 
 /*!
-    \fn QMediaPlayerControl::durationChanged(qint64 duration)
+    \fn QPlatformMediaPlayer::durationChanged(qint64 duration)
 
     Signals that the \a duration of the current media has changed.
 
@@ -121,20 +121,20 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::position() const
+    \fn QPlatformMediaPlayer::position() const
 
     Returns the current playback position in milliseconds.
 */
 
 /*!
-    \fn QMediaPlayerControl::setPosition(qint64 position)
+    \fn QPlatformMediaPlayer::setPosition(qint64 position)
 
     Sets the playback \a position of the current media.  This will initiate a seek and it may take
     some time for playback to reach the position set.
 */
 
 /*!
-    \fn QMediaPlayerControl::positionChanged(qint64 position)
+    \fn QPlatformMediaPlayer::positionChanged(qint64 position)
 
     Signals the playback \a position has changed.
 
@@ -145,13 +145,13 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::volume() const
+    \fn QPlatformMediaPlayer::volume() const
 
     Returns the audio volume of a player control.
 */
 
 /*!
-    \fn QMediaPlayerControl::setVolume(int volume)
+    \fn QPlatformMediaPlayer::setVolume(int volume)
 
     Sets the audio \a volume of a player control.
 
@@ -159,7 +159,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::volumeChanged(int volume)
+    \fn QPlatformMediaPlayer::volumeChanged(int volume)
 
     Signals the audio \a volume of a player control has changed.
 
@@ -167,19 +167,19 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::isMuted() const
+    \fn QPlatformMediaPlayer::isMuted() const
 
     Returns the mute state of a player control.
 */
 
 /*!
-    \fn QMediaPlayerControl::setMuted(bool mute)
+    \fn QPlatformMediaPlayer::setMuted(bool mute)
 
     Sets the \a mute state of a player control.
 */
 
 /*!
-    \fn QMediaPlayerControl::mutedChanged(bool mute)
+    \fn QPlatformMediaPlayer::mutedChanged(bool mute)
 
     Signals a change in the \a mute status of a player control.
 
@@ -187,14 +187,14 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::bufferStatus() const
+    \fn QPlatformMediaPlayer::bufferStatus() const
 
     Returns the buffering progress of the current media.  Progress is measured in the percentage
     of the buffer filled.
 */
 
 /*!
-    \fn QMediaPlayerControl::bufferStatusChanged(int percentFilled)
+    \fn QPlatformMediaPlayer::bufferStatusChanged(int percentFilled)
 
     Signal the amount of the local buffer filled as a percentage by \a percentFilled.
 
@@ -202,7 +202,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::isAudioAvailable() const
+    \fn QPlatformMediaPlayer::isAudioAvailable() const
 
     Identifies if there is audio output available for the current media.
 
@@ -210,7 +210,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::audioAvailableChanged(bool audioAvailable)
+    \fn QPlatformMediaPlayer::audioAvailableChanged(bool audioAvailable)
 
     Signals that there has been a change in the availability of audio output \a audioAvailable.
 
@@ -218,7 +218,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::isVideoAvailable() const
+    \fn QPlatformMediaPlayer::isVideoAvailable() const
 
     Identifies if there is video output available for the current media.
 
@@ -226,7 +226,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::videoAvailableChanged(bool videoAvailable)
+    \fn QPlatformMediaPlayer::videoAvailableChanged(bool videoAvailable)
 
     Signal that the availability of visual content has changed to \a videoAvailable.
 
@@ -234,7 +234,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::isSeekable() const
+    \fn QPlatformMediaPlayer::isSeekable() const
 
     Identifies if the current media is seekable.
 
@@ -242,7 +242,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::seekableChanged(bool seekable)
+    \fn QPlatformMediaPlayer::seekableChanged(bool seekable)
 
     Signals that the \a seekable state of a player control has changed.
 
@@ -250,7 +250,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::availablePlaybackRanges() const
+    \fn QPlatformMediaPlayer::availablePlaybackRanges() const
 
     Returns a range of times in milliseconds that can be played back.
 
@@ -260,33 +260,33 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::availablePlaybackRangesChanged(const QMediaTimeRange &ranges)
+    \fn QPlatformMediaPlayer::availablePlaybackRangesChanged(const QMediaTimeRange &ranges)
 
     Signals that the available media playback \a ranges have changed.
 
-    \sa QMediaPlayerControl::availablePlaybackRanges()
+    \sa QPlatformMediaPlayer::availablePlaybackRanges()
 */
 
 /*!
-    \fn qreal QMediaPlayerControl::playbackRate() const
+    \fn qreal QPlatformMediaPlayer::playbackRate() const
 
     Returns the rate of playback.
 */
 
 /*!
-    \fn QMediaPlayerControl::setPlaybackRate(qreal rate)
+    \fn QPlatformMediaPlayer::setPlaybackRate(qreal rate)
 
     Sets the \a rate of playback.
 */
 
 /*!
-    \fn QMediaPlayerControl::media() const
+    \fn QPlatformMediaPlayer::media() const
 
     Returns the current media source.
 */
 
 /*!
-    \fn QMediaPlayerControl::mediaStream() const
+    \fn QPlatformMediaPlayer::mediaStream() const
 
     Returns the current media stream. This is only a valid if a stream was passed to setMedia().
 
@@ -294,7 +294,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::setMedia(const QUrl &media, QIODevice *stream)
+    \fn QPlatformMediaPlayer::setMedia(const QUrl &media, QIODevice *stream)
 
     Sets the current \a media source.  If a \a stream is supplied; data will be read from that
     instead of attempting to resolve the media source.  The media source may still be used to
@@ -313,13 +313,13 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::mediaChanged(const QUrl& content)
+    \fn QPlatformMediaPlayer::mediaChanged(const QUrl& content)
 
     Signals that the current media \a content has changed.
 */
 
 /*!
-    \fn QMediaPlayerControl::play()
+    \fn QPlatformMediaPlayer::play()
 
     Starts playback of the current media.
 
@@ -330,7 +330,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::pause()
+    \fn QPlatformMediaPlayer::pause()
 
     Pauses playback of the current media.
 
@@ -341,7 +341,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::stop()
+    \fn QPlatformMediaPlayer::stop()
 
     Stops playback of the current media.
 
@@ -350,37 +350,37 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QAudio::Role QMediaPlayerControl::audioRole() const
+    \fn QAudio::Role QPlatformMediaPlayer::audioRole() const
 
     Returns the audio role of the media played by the media service.
 */
 
 /*!
-    \fn void QMediaPlayerControl::setAudioRole(QAudio::Role role)
+    \fn void QPlatformMediaPlayer::setAudioRole(QAudio::Role role)
 
     Sets the audio \a role of the media played by the media service.
 */
 
 /*!
-    \fn QList<QAudio::Role> QMediaPlayerControl::supportedAudioRoles() const
+    \fn QList<QAudio::Role> QPlatformMediaPlayer::supportedAudioRoles() const
 
     Returns a list of audio roles that the media service supports.
 */
 
 /*!
-    \fn QAudio::Role QMediaPlayerControl::customAudioRole() const
+    \fn QAudio::Role QPlatformMediaPlayer::customAudioRole() const
 
     Returns the audio role of the media played by the media service.
 */
 
 /*!
-    \fn void QMediaPlayerControl::setCustomAudioRole(const QString &role)
+    \fn void QPlatformMediaPlayer::setCustomAudioRole(const QString &role)
 
     Sets the audio \a role of the media played by the media service.
 */
 
 /*!
-    \fn QStringList QMediaPlayerControl::supportedCustomAudioRoles() const
+    \fn QStringList QPlatformMediaPlayer::supportedCustomAudioRoles() const
 
     Returns a list of custom audio roles that the media service supports. An
     empty list may indicate that the supported custom audio roles aren't known.
@@ -388,17 +388,17 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::error(int error, const QString &errorString)
+    \fn QPlatformMediaPlayer::error(int error, const QString &errorString)
 
     Signals that an \a error has occurred.  The \a errorString provides a more detailed explanation.
 */
 
 /*!
-    \fn QMediaPlayerControl::playbackRateChanged(qreal rate)
+    \fn QPlatformMediaPlayer::playbackRateChanged(qreal rate)
 
     Signal emitted when playback rate changes to \a rate.
 */
 
 QT_END_NAMESPACE
 
-#include "moc_qmediaplayercontrol.cpp"
+#include "moc_qplatformmediaplayer_p.cpp"
diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/platform/qplatformmediaplayer_p.h
index 15a6e3e2d..9169d7c89 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/platform/qplatformmediaplayer_p.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 class QMediaStreamsControl;
 
-class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformMediaPlayer : public QObject
 {
     Q_OBJECT
 
@@ -127,7 +127,7 @@ Q_SIGNALS:
     void metaDataChanged();
 
 protected:
-    explicit QMediaPlayerControl(QObject *parent = nullptr);
+    explicit QPlatformMediaPlayer(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
index 1ff6e25bd..02105c877 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp
+++ b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
@@ -45,7 +45,7 @@
 //#define DEBUG_MEDIAFOUNDATION
 
 MFPlayerControl::MFPlayerControl()
-    : QMediaPlayerControl()
+    : QPlatformMediaPlayer()
     , m_state(QMediaPlayer::StoppedState)
     , m_stateDirty(false)
     , m_videoAvailable(false)
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol_p.h b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
index 4170bfc8b..5414b34b7 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol_p.h
+++ b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
@@ -52,7 +52,7 @@
 //
 
 #include "QUrl.h"
-#include "qmediaplayercontrol.h"
+#include "qplatformmediaplayer_p.h"
 
 #include <QtCore/qcoreevent.h>
 
@@ -60,7 +60,7 @@
 
 QT_USE_NAMESPACE
 
-class MFPlayerControl : public QMediaPlayerControl
+class MFPlayerControl : public QPlatformMediaPlayer
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/windows/player/mfplayersession.cpp b/src/multimedia/platform/windows/player/mfplayersession.cpp
index 5d8dcd1e6..36857b452 100644
--- a/src/multimedia/platform/windows/player/mfplayersession.cpp
+++ b/src/multimedia/platform/windows/player/mfplayersession.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qmediaplayercontrol.h"
+#include "qplatformmediaplayer_p.h"
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdatetime.h>
diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp
index 190e1dd32..ff6f65644 100644
--- a/src/multimedia/platform/windows/qwindowsintegration.cpp
+++ b/src/multimedia/platform/windows/qwindowsintegration.cpp
@@ -88,7 +88,7 @@ QAudioDecoderControl *QWindowsIntegration::createAudioDecoder()
     return new MFAudioDecoderControl;
 }
 
-QMediaPlayerControl *QWindowsIntegration::createPlayer()
+QPlatformMediaPlayer *QWindowsIntegration::createPlayer()
 {
     return new MFPlayerControl;
 }
diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h
index 8207f2ba2..23e7a941b 100644
--- a/src/multimedia/platform/windows/qwindowsintegration_p.h
+++ b/src/multimedia/platform/windows/qwindowsintegration_p.h
@@ -71,7 +71,7 @@ public:
     QMediaPlatformFormatInfo *formatInfo() override;
 
     QAudioDecoderControl *createAudioDecoder() override;
-    QMediaPlayerControl *createPlayer() override;
+    QPlatformMediaPlayer *createPlayer() override;
 
     QWindowsDeviceManager *m_manager = nullptr;
     QWindowsFormatInfo *m_formatInfo = nullptr;
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 7ba09dc4f..c31139f6b 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -41,7 +41,7 @@
 #include "qvideosurfaces_p.h"
 
 #include "private/qobject_p.h"
-#include <qmediaplayercontrol.h>
+#include <qplatformmediaplayer_p.h>
 #include <private/qmediaplatformintegration_p.h>
 
 #include <QtCore/qcoreevent.h>
@@ -91,7 +91,7 @@ class QMediaPlayerPrivate : public QObjectPrivate
 
 public:
     QMediaPlayerPrivate() : notifyTimer(nullptr) {}
-    QMediaPlayerControl* control = nullptr;
+    QPlatformMediaPlayer* control = nullptr;
     QString errorString;
 
     QPointer<QObject> videoOutput;
@@ -284,16 +284,16 @@ QMediaPlayer::QMediaPlayer(QObject *parent):
             SLOT(_q_mediaStatusChanged(QMediaPlayer::MediaStatus)));
     connect(d->control, SIGNAL(error(int,QString)), SLOT(_q_error(int,QString)));
 
-    connect(d->control, &QMediaPlayerControl::durationChanged, this, &QMediaPlayer::durationChanged);
-    connect(d->control, &QMediaPlayerControl::positionChanged, this, &QMediaPlayer::positionChanged);
-    connect(d->control, &QMediaPlayerControl::audioAvailableChanged, this, &QMediaPlayer::audioAvailableChanged);
-    connect(d->control, &QMediaPlayerControl::videoAvailableChanged, this, &QMediaPlayer::videoAvailableChanged);
-    connect(d->control, &QMediaPlayerControl::volumeChanged, this, &QMediaPlayer::volumeChanged);
-    connect(d->control, &QMediaPlayerControl::mutedChanged, this, &QMediaPlayer::mutedChanged);
-    connect(d->control, &QMediaPlayerControl::seekableChanged, this, &QMediaPlayer::seekableChanged);
-    connect(d->control, &QMediaPlayerControl::playbackRateChanged, this, &QMediaPlayer::playbackRateChanged);
-    connect(d->control, &QMediaPlayerControl::bufferStatusChanged, this, &QMediaPlayer::bufferStatusChanged);
-    connect(d->control, &QMediaPlayerControl::metaDataChanged, this, &QMediaPlayer::metaDataChanged);
+    connect(d->control, &QPlatformMediaPlayer::durationChanged, this, &QMediaPlayer::durationChanged);
+    connect(d->control, &QPlatformMediaPlayer::positionChanged, this, &QMediaPlayer::positionChanged);
+    connect(d->control, &QPlatformMediaPlayer::audioAvailableChanged, this, &QMediaPlayer::audioAvailableChanged);
+    connect(d->control, &QPlatformMediaPlayer::videoAvailableChanged, this, &QMediaPlayer::videoAvailableChanged);
+    connect(d->control, &QPlatformMediaPlayer::volumeChanged, this, &QMediaPlayer::volumeChanged);
+    connect(d->control, &QPlatformMediaPlayer::mutedChanged, this, &QMediaPlayer::mutedChanged);
+    connect(d->control, &QPlatformMediaPlayer::seekableChanged, this, &QMediaPlayer::seekableChanged);
+    connect(d->control, &QPlatformMediaPlayer::playbackRateChanged, this, &QMediaPlayer::playbackRateChanged);
+    connect(d->control, &QPlatformMediaPlayer::bufferStatusChanged, this, &QMediaPlayer::bufferStatusChanged);
+    connect(d->control, &QPlatformMediaPlayer::metaDataChanged, this, &QMediaPlayer::metaDataChanged);
 
     d->state = d->control->state();
     d->status = d->control->mediaStatus();
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index 73b8bfe27..4bd658e35 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
@@ -39,7 +39,7 @@
 
 #include "qmediaplaylist.h"
 #include "qmediaplaylist_p.h"
-#include "qmediaplayercontrol.h"
+#include "qplatformmediaplayer_p.h"
 #include "qplaylistfileparser_p.h"
 
 #include <QtCore/qlist.h>
diff --git a/src/multimedia/playback/qmediaplaylist_p.h b/src/multimedia/playback/qmediaplaylist_p.h
index 2a789aec0..f6644fac9 100644
--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
@@ -53,7 +53,7 @@
 
 #include "qmediaplaylist.h"
 #include "qmediaplayer.h"
-#include "qmediaplayercontrol.h"
+#include "qplatformmediaplayer_p.h"
 #include "qplaylistfileparser_p.h"
 
 #include <QtCore/qdebug.h>
diff --git a/tests/auto/unit/mockbackend/mockmediaplayer.h b/tests/auto/unit/mockbackend/mockmediaplayer.h
index 8263f935d..8c78bad61 100644
--- a/tests/auto/unit/mockbackend/mockmediaplayer.h
+++ b/tests/auto/unit/mockbackend/mockmediaplayer.h
@@ -29,17 +29,17 @@
 #ifndef MOCKMEDIAPLAYER_H
 #define MOCKMEDIAPLAYER_H
 
-#include "qmediaplayercontrol.h"
+#include "private/qplatformmediaplayer_p.h"
 #include "mockmediastreamscontrol.h"
 #include <qurl.h>
 
-class MockMediaPlayer : public QMediaPlayerControl
+class MockMediaPlayer : public QPlatformMediaPlayer
 {
     friend class MockMediaPlayerService;
 
 public:
     MockMediaPlayer()
-        : QMediaPlayerControl(0)
+        : QPlatformMediaPlayer(0)
         , _state(QMediaPlayer::StoppedState)
         , _mediaStatus(QMediaPlayer::NoMedia)
         , _error(QMediaPlayer::NoError)
diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp
index 348933fd7..f76ab52c2 100644
--- a/tests/auto/unit/mockbackend/qmockintegration.cpp
+++ b/tests/auto/unit/mockbackend/qmockintegration.cpp
@@ -72,7 +72,7 @@ QAudioDecoderControl *QMockIntegration::createAudioDecoder()
     return m_lastAudioDecoderControl;
 }
 
-QMediaPlayerControl *QMockIntegration::createPlayer()
+QPlatformMediaPlayer *QMockIntegration::createPlayer()
 {
     if (m_flags & NoPlayerInterface)
         m_lastPlayer = nullptr;
diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h
index 391bac4dd..e70380404 100644
--- a/tests/auto/unit/mockbackend/qmockintegration_p.h
+++ b/tests/auto/unit/mockbackend/qmockintegration_p.h
@@ -70,7 +70,7 @@ public:
     QMediaPlatformFormatInfo *formatInfo() override { return nullptr; }
 
     QAudioDecoderControl *createAudioDecoder() override;
-    QMediaPlayerControl *createPlayer() override;
+    QPlatformMediaPlayer *createPlayer() override;
     QMediaPlatformCaptureInterface *createCaptureInterface(QMediaRecorder::CaptureMode mode) override;
 
     enum Flag {
diff --git a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
index 2a22321f8..4c9ea8dc0 100644
--- a/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
+++ b/tests/auto/unit/multimedia/qmediaplayer/tst_qmediaplayer.cpp
@@ -35,7 +35,7 @@
 
 #include <qabstractvideosurface.h>
 #include <qmediaplayer.h>
-#include <qmediaplayercontrol.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <qmediaplaylist.h>
 #include <qmediastreamscontrol.h>
 #include <qvideorenderercontrol.h>
diff --git a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp
index cc9b0f653..6d0b5291b 100644
--- a/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qmediaplayerwidgets/tst_qmediaplayerwidgets.cpp
@@ -35,7 +35,7 @@
 #include <qgraphicsvideoitem.h>
 #include <qabstractvideosurface.h>
 #include <qmediaplayer.h>
-#include <qmediaplayercontrol.h>
+#include <private/qplatformmediaplayer_p.h>
 
 #include "mockvideosurface.h"
 #include "qmockintegration_p.h"
diff --git a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index 99422d6b0..0282e6df3 100644
--- a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -37,7 +37,7 @@
 #include "qmockintegration_p.h"
 
 #include <QtMultimedia/qmediametadata.h>
-#include <qmediaplayercontrol.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <private/qdeclarativevideooutput_p.h>
 #include <QAbstractVideoSurface>
 
diff --git a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
index 27585facc..ac2c78b55 100644
--- a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
+++ b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
@@ -35,7 +35,7 @@
 
 #include <qabstractvideosurface.h>
 #include <qgraphicsvideoitem.h>
-#include <qmediaplayercontrol.h>
+#include <qplatformmediaplayer_p.h>
 #include <qmediaservice.h>
 #include <qvideorenderercontrol.h>
 #include <qvideowindowcontrol.h>
@@ -70,12 +70,12 @@ private:
 
 Q_DECLARE_METATYPE(QDeclarativeVideo::Error);
 
-class QtTestMediaPlayerControl : public QMediaPlayerControl
+class QtTestMediaPlayerControl : public QPlatformMediaPlayer
 {
     Q_OBJECT
 public:
     QtTestMediaPlayerControl(QObject *parent = 0)
-        : QMediaPlayerControl(parent)
+        : QPlatformMediaPlayer(parent)
         , m_state(QMediaPlayer::StoppedState)
         , m_mediaStatus(QMediaPlayer::NoMedia)
         , m_duration(0)
@@ -260,7 +260,7 @@ public:
 
     QObject *requestControl(const char *name)
     {
-        if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
+        if (qstrcmp(name, QPlatformMediaPlayer_iid) == 0)
             return playerControl;
         else if (qstrcmp(name, QVideoRendererControl_iid) == 0)
             return rendererControl;