Rename backend classes as a next step in consistent class naming

Remove the Control* naming convention of the backend classes and rename to QPlatformFoo. Make headers private. Change-Id: Ic7310c7a22cfcf247d823eb984c09e8a9378c9a9 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
author: Doris Verria <doris.verria@qt.io> 2021-02-24 18:29:56 +0100
committer: Lars Knoll <lars.knoll@qt.io> 2021-03-05 12:34:22 +0000
commit: 967570004e2a0dde043970021c5c32312feee4ed (patch)
tree: f0a1fb6aa47eb9f21937a4334b2d441d80e58a4b
parent: 55928daa35a34dcd9b2e281bd449744e6bc6bad3 (diff)
129 files changed, 720 insertions, 725 deletions
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp
index a14847642..eac84cbef 100644
--- a/src/imports/multimedia/qdeclarativetorch.cpp
+++ b/src/imports/multimedia/qdeclarativetorch.cpp
@@ -39,7 +39,7 @@
 
 #include <QDebug>
 #include <private/qplatformmediacapture_p.h>
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 
 #include "qdeclarativetorch_p.h"
 
@@ -151,7 +151,7 @@ int QDeclarativeTorch::power() const
     if (!m_exposure)
         return 0;
 
-    return m_exposure->requestedValue(QCameraExposureControl::TorchPower).toInt();
+    return m_exposure->requestedValue(QPlatformCameraExposure::TorchPower).toInt();
 }
 
 /*!
@@ -165,13 +165,13 @@ void QDeclarativeTorch::setPower(int power)
 
     power = qBound(0, power, 100);
     if (this->power() != power)
-        m_exposure->setValue(QCameraExposureControl::TorchPower, power);
+        m_exposure->setValue(QPlatformCameraExposure::TorchPower, power);
 }
 
 /* Check for changes in flash power */
 void QDeclarativeTorch::parameterChanged(int parameter)
 {
-    if (parameter == QCameraExposureControl::TorchPower)
+    if (parameter == QPlatformCameraExposure::TorchPower)
         emit powerChanged();
 }
 
diff --git a/src/imports/multimedia/qdeclarativetorch_p.h b/src/imports/multimedia/qdeclarativetorch_p.h
index 2180a5311..8c8f8b088 100644
--- a/src/imports/multimedia/qdeclarativetorch_p.h
+++ b/src/imports/multimedia/qdeclarativetorch_p.h
@@ -55,7 +55,7 @@
 #include <QtCore/QObject>
 #include <QtQml/qqml.h>
 #include <qcamera.h>
-#include <qcameraexposurecontrol.h>
+#include <private/qplatformcameraexposure_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -88,7 +88,7 @@ private slots:
 
 private:
     QCamera *m_camera = nullptr;
-    QCameraExposureControl *m_exposure = nullptr;
+    QPlatformCameraExposure *m_exposure = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/.prev_CMakeLists.txt b/src/multimedia/.prev_CMakeLists.txt
index 8769b1f6c..a5ae043a4 100644
--- a/src/multimedia/.prev_CMakeLists.txt
+++ b/src/multimedia/.prev_CMakeLists.txt
@@ -27,18 +27,18 @@ qt_internal_add_module(Multimedia
         camera/qcameraimageprocessing.cpp camera/qcameraimageprocessing.h
         camera/qcamerainfo.cpp camera/qcamerainfo.h camera/qcamerainfo_p.h
         camera/qcameraviewfindersettings.cpp camera/qcameraviewfindersettings.h
-        controls/qaudiodecodercontrol.cpp controls/qaudiodecodercontrol.h
+        controls/qplatformaudiodecoder.cpp controls/qplatformaudiodecoder_p.h
         controls/qaudioencodersettingscontrol.cpp controls/qaudioencodersettingscontrol.h
-        controls/qcameracontrol.cpp controls/qcameracontrol.h
-        controls/qcameraexposurecontrol.cpp controls/qcameraexposurecontrol.h
-        controls/qcamerafocuscontrol.cpp controls/qcamerafocuscontrol.h
-        controls/qcameraimagecapturecontrol.cpp controls/qcameraimagecapturecontrol.h
-        controls/qcameraimageprocessingcontrol.cpp controls/qcameraimageprocessingcontrol.h
+        controls/qplatformcamera.cpp controls/qplatformcamera_p.h
+        controls/qplatformcameraexposure.cpp controls/qplatformcameraexposure_p.h
+        controls/qplatformcamerafocus.cpp controls/qplatformcamerafocus_p.h
+        controls/qplatformcameraimagecapture.cpp controls/qplatformcameraimagecapture_p.h
+        controls/qplatformcameraimageprocessing.cpp controls/qplatformcameraimageprocessing_p.h
         controls/qimageencodercontrol.cpp controls/qimageencodercontrol.h
         controls/qmediaaudioprobecontrol.cpp controls/qmediaaudioprobecontrol.h
         controls/qmediacontainercontrol.cpp controls/qmediacontainercontrol.h
         controls/qmediaplayercontrol.cpp controls/qplatformmediaplayer_p.h
-        controls/qmediarecordercontrol.cpp controls/qmediarecordercontrol.h
+        controls/qplatformmediarecorder.cpp controls/qplatformmediarecorder_p.h
         controls/qmediastreamscontrol.cpp controls/qmediastreamscontrol.h
         controls/qmediavideoprobecontrol.cpp controls/qmediavideoprobecontrol.h
         controls/qmetadatareadercontrol.cpp controls/qmetadatareadercontrol.h
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 687347cff..56824fa52 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -30,14 +30,14 @@ qt_internal_add_module(Multimedia
         camera/qcameraimagecapture.cpp camera/qcameraimagecapture.h
         camera/qcameraimageprocessing.cpp camera/qcameraimageprocessing.h
         camera/qcamerainfo.cpp camera/qcamerainfo.h camera/qcamerainfo_p.h
-        controls/qaudiodecodercontrol.cpp controls/qaudiodecodercontrol.h
-        controls/qcameracontrol.cpp controls/qcameracontrol.h
-        controls/qcameraexposurecontrol.cpp controls/qcameraexposurecontrol.h
-        controls/qcamerafocuscontrol.cpp controls/qcamerafocuscontrol.h
-        controls/qcameraimagecapturecontrol.cpp controls/qcameraimagecapturecontrol.h
-        controls/qcameraimageprocessingcontrol.cpp controls/qcameraimageprocessingcontrol.h
-        controls/qmediarecordercontrol.cpp controls/qmediarecordercontrol.h
         controls/qvideowindowcontrol.cpp controls/qvideowindowcontrol.h
+        platform/qplatformaudiodecoder.cpp platform/qplatformaudiodecoder_p.h
+        platform/qplatformcamera.cpp platform/qplatformcamera_p.h
+        platform/qplatformcameraexposure.cpp platform/qplatformcameraexposure_p.h
+        platform/qplatformcamerafocus.cpp platform/qplatformcamerafocus_p.h
+        platform/qplatformcameraimagecapture.cpp platform/qplatformcameraimagecapture_p.h
+        platform/qplatformcameraimageprocessing.cpp platform/qplatformcameraimageprocessing_p.h
+        platform/qplatformmediarecorder.cpp platform/qplatformmediarecorder_p.h
         platform/qplatformmediacapture.cpp platform/qplatformmediacapture_p.h
         platform/qplatformmediadevicemanager.cpp platform/qplatformmediadevicemanager_p.h
         platform/qplatformmediaformatinfo.cpp  platform/qplatformmediaformatinfo_p.h
diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp
index 7f228bada..82dfdf422 100644
--- a/src/multimedia/audio/qaudiodecoder.cpp
+++ b/src/multimedia/audio/qaudiodecoder.cpp
@@ -40,7 +40,7 @@
 #include "qtmultimediaglobal_p.h"
 #include "qaudiodecoder.h"
 
-#include "qaudiodecodercontrol.h"
+#include "private/qplatformaudiodecoder_p.h"
 
 #include <private/qplatformmediaintegration_p.h>
 #include <private/qobject_p.h>
@@ -80,7 +80,7 @@ class QAudioDecoderPrivate : public QObjectPrivate
     Q_DECLARE_NON_CONST_PUBLIC(QAudioDecoder)
 
 public:
-    QAudioDecoderControl *control = nullptr;
+    QPlatformAudioDecoder *control = nullptr;
     QAudioDecoder::State state = QAudioDecoder::StoppedState;
     QAudioDecoder::Error error = QAudioDecoder::NoError;
     QString errorString;
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 13d956857..5820d4fbc 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -41,11 +41,11 @@
 #include "qcamera_p.h"
 
 #include <qcamerainfo.h>
-#include <qcameracontrol.h>
-#include <qcameraexposurecontrol.h>
-#include <qcamerafocuscontrol.h>
-#include <qcameraimageprocessingcontrol.h>
-#include <qcameraimagecapturecontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamerafocus_p.h>
+#include <private/qplatformcameraimageprocessing_p.h>
+#include <private/qplatformcameraimagecapture_p.h>
 #include <private/qplatformmediaintegration_p.h>
 #include <private/qplatformmediacapture_p.h>
 #include <qmediadevicemanager.h>
@@ -123,7 +123,7 @@ void QCameraPrivate::_q_preparePropertyChange(int changeType)
     if (control->state() != QCamera::ActiveState)
         return;
 
-    if (control->canChangeProperty(QCameraControl::PropertyChangeType(changeType), status))
+    if (control->canChangeProperty(QPlatformCamera::PropertyChangeType(changeType), status))
         return;
 
     restartPending = true;
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index 272f39cd2..24f5e92cb 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -57,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QCameraControl;
+class QPlatformCamera;
 class QPlatformMediaCapture;
 
 class QCameraPrivate : public QObjectPrivate
@@ -79,7 +79,7 @@ public:
     void clear();
 
     QPlatformMediaCapture *captureInterface = nullptr;
-    QCameraControl *control = nullptr;
+    QPlatformCamera *control = nullptr;
 
     QCameraExposure *cameraExposure = nullptr;
     QCameraFocus *cameraFocus = nullptr;
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index b18337792..4da90e0d2 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -41,8 +41,8 @@
 #include "private/qobject_p.h"
 
 #include <qcamera.h>
-#include <qcameraexposurecontrol.h>
-#include <qcameracontrol.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamera_p.h>
 
 #include <QtCore/QMetaObject>
 #include <QtCore/QDebug>
@@ -67,22 +67,22 @@ class QCameraExposurePrivate
 {
     Q_DECLARE_PUBLIC(QCameraExposure)
 public:
-    void init(QCameraControl *cameraControl);
+    void init(QPlatformCamera *cameraControl);
     QCameraExposure *q_ptr;
 
-    template<typename T> T actualExposureParameter(QCameraExposureControl::ExposureParameter parameter, const T &defaultValue) const;
-    template<typename T> T requestedExposureParameter(QCameraExposureControl::ExposureParameter parameter, const T &defaultValue) const;
-    template<typename T> void setExposureParameter(QCameraExposureControl::ExposureParameter parameter, const T &value);
-    void resetExposureParameter(QCameraExposureControl::ExposureParameter parameter);
+    template<typename T> T actualExposureParameter(QPlatformCameraExposure::ExposureParameter parameter, const T &defaultValue) const;
+    template<typename T> T requestedExposureParameter(QPlatformCameraExposure::ExposureParameter parameter, const T &defaultValue) const;
+    template<typename T> void setExposureParameter(QPlatformCameraExposure::ExposureParameter parameter, const T &value);
+    void resetExposureParameter(QPlatformCameraExposure::ExposureParameter parameter);
 
     QCamera *camera;
-    QCameraExposureControl *exposureControl;
+    QPlatformCameraExposure *exposureControl;
 
     void _q_exposureParameterChanged(int parameter);
     void _q_exposureParameterRangeChanged(int parameter);
 };
 
-void QCameraExposurePrivate::init(QCameraControl *cameraControl)
+void QCameraExposurePrivate::init(QPlatformCamera *cameraControl)
 {
     Q_Q(QCameraExposure);
 
@@ -99,7 +99,7 @@ void QCameraExposurePrivate::init(QCameraControl *cameraControl)
 }
 
 template<typename T>
-T QCameraExposurePrivate::actualExposureParameter(QCameraExposureControl::ExposureParameter parameter, const T &defaultValue) const
+T QCameraExposurePrivate::actualExposureParameter(QPlatformCameraExposure::ExposureParameter parameter, const T &defaultValue) const
 {
     QVariant value = exposureControl ? exposureControl->actualValue(parameter) : QVariant();
 
@@ -107,7 +107,7 @@ T QCameraExposurePrivate::actualExposureParameter(QCameraExposureControl::Exposu
 }
 
 template<typename T>
-T QCameraExposurePrivate::requestedExposureParameter(QCameraExposureControl::ExposureParameter parameter, const T &defaultValue) const
+T QCameraExposurePrivate::requestedExposureParameter(QPlatformCameraExposure::ExposureParameter parameter, const T &defaultValue) const
 {
     QVariant value = exposureControl ? exposureControl->requestedValue(parameter) : QVariant();
 
@@ -115,13 +115,13 @@ T QCameraExposurePrivate::requestedExposureParameter(QCameraExposureControl::Exp
 }
 
 template<typename T>
-void QCameraExposurePrivate::setExposureParameter(QCameraExposureControl::ExposureParameter parameter, const T &value)
+void QCameraExposurePrivate::setExposureParameter(QPlatformCameraExposure::ExposureParameter parameter, const T &value)
 {
     if (exposureControl)
         exposureControl->setValue(parameter, QVariant::fromValue<T>(value));
 }
 
-void QCameraExposurePrivate::resetExposureParameter(QCameraExposureControl::ExposureParameter parameter)
+void QCameraExposurePrivate::resetExposureParameter(QPlatformCameraExposure::ExposureParameter parameter)
 {
     if (exposureControl)
         exposureControl->setValue(parameter, QVariant());
@@ -134,21 +134,21 @@ void QCameraExposurePrivate::_q_exposureParameterChanged(int parameter)
 
 #if DEBUG_EXPOSURE_CHANGES
     qDebug() << "Exposure parameter changed:"
-             << QCameraExposureControl::ExposureParameter(parameter)
-             << exposureControl->actualValue(QCameraExposureControl::ExposureParameter(parameter));
+             << QPlatformCameraExposure::ExposureParameter(parameter)
+             << exposureControl->actualValue(QPlatformCameraExposure::ExposureParameter(parameter));
 #endif
 
     switch (parameter) {
-    case QCameraExposureControl::ISO:
+    case QPlatformCameraExposure::ISO:
         emit q->isoSensitivityChanged(q->isoSensitivity());
         break;
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         emit q->apertureChanged(q->aperture());
         break;
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ShutterSpeed:
         emit q->shutterSpeedChanged(q->shutterSpeed());
         break;
-    case QCameraExposureControl::ExposureCompensation:
+    case QPlatformCameraExposure::ExposureCompensation:
         emit q->exposureCompensationChanged(q->exposureCompensation());
         break;
     }
@@ -159,10 +159,10 @@ void QCameraExposurePrivate::_q_exposureParameterRangeChanged(int parameter)
     Q_Q(QCameraExposure);
 
     switch (parameter) {
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         emit q->apertureRangeChanged();
         break;
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ShutterSpeed:
         emit q->shutterSpeedRangeChanged();
         break;
     }
@@ -172,7 +172,7 @@ void QCameraExposurePrivate::_q_exposureParameterRangeChanged(int parameter)
     Construct a QCameraExposure from service \a provider and \a parent.
 */
 
-QCameraExposure::QCameraExposure(QCamera *parent, QCameraControl *cameraControl):
+QCameraExposure::QCameraExposure(QCamera *parent, QPlatformCamera *cameraControl):
     QObject(parent), d_ptr(new QCameraExposurePrivate)
 {
     Q_D(QCameraExposure);
@@ -250,12 +250,12 @@ bool QCameraExposure::isFlashReady() const
 
 QCameraExposure::ExposureMode QCameraExposure::exposureMode() const
 {
-    return d_func()->actualExposureParameter<QCameraExposure::ExposureMode>(QCameraExposureControl::ExposureMode, QCameraExposure::ExposureAuto);
+    return d_func()->actualExposureParameter<QCameraExposure::ExposureMode>(QPlatformCameraExposure::ExposureMode, QCameraExposure::ExposureAuto);
 }
 
 void QCameraExposure::setExposureMode(QCameraExposure::ExposureMode mode)
 {
-    d_func()->setExposureParameter<QCameraExposure::ExposureMode>(QCameraExposureControl::ExposureMode, mode);
+    d_func()->setExposureParameter<QCameraExposure::ExposureMode>(QPlatformCameraExposure::ExposureMode, mode);
 }
 
 /*!
@@ -268,7 +268,7 @@ bool QCameraExposure::isExposureModeSupported(QCameraExposure::ExposureMode mode
         return false;
 
     bool continuous = false;
-    return d_func()->exposureControl->supportedParameterRange(QCameraExposureControl::ExposureMode, &continuous)
+    return d_func()->exposureControl->supportedParameterRange(QPlatformCameraExposure::ExposureMode, &continuous)
             .contains(QVariant::fromValue<QCameraExposure::ExposureMode>(mode));
 }
 
@@ -281,17 +281,17 @@ bool QCameraExposure::isExposureModeSupported(QCameraExposure::ExposureMode mode
 
 qreal QCameraExposure::exposureCompensation() const
 {
-    return d_func()->actualExposureParameter<qreal>(QCameraExposureControl::ExposureCompensation, 0.0);
+    return d_func()->actualExposureParameter<qreal>(QPlatformCameraExposure::ExposureCompensation, 0.0);
 }
 
 void QCameraExposure::setExposureCompensation(qreal ev)
 {
-    d_func()->setExposureParameter<qreal>(QCameraExposureControl::ExposureCompensation, ev);
+    d_func()->setExposureParameter<qreal>(QPlatformCameraExposure::ExposureCompensation, ev);
 }
 
 int QCameraExposure::isoSensitivity() const
 {
-    return d_func()->actualExposureParameter<int>(QCameraExposureControl::ISO, -1);
+    return d_func()->actualExposureParameter<int>(QPlatformCameraExposure::ISO, -1);
 }
 
 /*!
@@ -300,7 +300,7 @@ int QCameraExposure::isoSensitivity() const
 */
 int QCameraExposure::requestedIsoSensitivity() const
 {
-    return d_func()->requestedExposureParameter<int>(QCameraExposureControl::ISO, -1);
+    return d_func()->requestedExposureParameter<int>(QPlatformCameraExposure::ISO, -1);
 }
 
 /*!
@@ -312,7 +312,7 @@ int QCameraExposure::requestedIsoSensitivity() const
 QList<int> QCameraExposure::supportedIsoSensitivities(bool *continuous) const
 {
     QList<int> res;
-    QCameraExposureControl *control = d_func()->exposureControl;
+    QPlatformCameraExposure *control = d_func()->exposureControl;
 
     bool tmp = false;
     if (!continuous)
@@ -321,7 +321,7 @@ QList<int> QCameraExposure::supportedIsoSensitivities(bool *continuous) const
     if (!control)
         return res;
 
-    const auto range = control->supportedParameterRange(QCameraExposureControl::ISO, continuous);
+    const auto range = control->supportedParameterRange(QPlatformCameraExposure::ISO, continuous);
     for (const QVariant &value : range) {
         bool ok = false;
         int intValue = value.toInt(&ok);
@@ -341,7 +341,7 @@ QList<int> QCameraExposure::supportedIsoSensitivities(bool *continuous) const
 
 void QCameraExposure::setManualIsoSensitivity(int iso)
 {
-    d_func()->setExposureParameter<int>(QCameraExposureControl::ISO, iso);
+    d_func()->setExposureParameter<int>(QPlatformCameraExposure::ISO, iso);
 }
 
 /*!
@@ -351,7 +351,7 @@ void QCameraExposure::setManualIsoSensitivity(int iso)
 
 void QCameraExposure::setAutoIsoSensitivity()
 {
-    d_func()->resetExposureParameter(QCameraExposureControl::ISO);
+    d_func()->resetExposureParameter(QPlatformCameraExposure::ISO);
 }
 
 /*!
@@ -384,7 +384,7 @@ void QCameraExposure::setAutoIsoSensitivity()
 
 qreal QCameraExposure::aperture() const
 {
-    return d_func()->actualExposureParameter<qreal>(QCameraExposureControl::Aperture, -1.0);
+    return d_func()->actualExposureParameter<qreal>(QPlatformCameraExposure::Aperture, -1.0);
 }
 
 /*!
@@ -393,7 +393,7 @@ qreal QCameraExposure::aperture() const
 */
 qreal QCameraExposure::requestedAperture() const
 {
-    return d_func()->requestedExposureParameter<qreal>(QCameraExposureControl::Aperture, -1.0);
+    return d_func()->requestedExposureParameter<qreal>(QPlatformCameraExposure::Aperture, -1.0);
 }
 
 
@@ -408,7 +408,7 @@ qreal QCameraExposure::requestedAperture() const
 QList<qreal> QCameraExposure::supportedApertures(bool * continuous) const
 {
     QList<qreal> res;
-    QCameraExposureControl *control = d_func()->exposureControl;
+    QPlatformCameraExposure *control = d_func()->exposureControl;
 
     bool tmp = false;
     if (!continuous)
@@ -417,7 +417,7 @@ QList<qreal> QCameraExposure::supportedApertures(bool * continuous) const
     if (!control)
         return res;
 
-    const auto range = control->supportedParameterRange(QCameraExposureControl::Aperture, continuous);
+    const auto range = control->supportedParameterRange(QPlatformCameraExposure::Aperture, continuous);
     for (const QVariant &value : range) {
         bool ok = false;
         qreal realValue = value.toReal(&ok);
@@ -437,7 +437,7 @@ QList<qreal> QCameraExposure::supportedApertures(bool * continuous) const
 
 void QCameraExposure::setManualAperture(qreal aperture)
 {
-    d_func()->setExposureParameter<qreal>(QCameraExposureControl::Aperture, aperture);
+    d_func()->setExposureParameter<qreal>(QPlatformCameraExposure::Aperture, aperture);
 }
 
 /*!
@@ -447,7 +447,7 @@ void QCameraExposure::setManualAperture(qreal aperture)
 
 void QCameraExposure::setAutoAperture()
 {
-    d_func()->resetExposureParameter(QCameraExposureControl::Aperture);
+    d_func()->resetExposureParameter(QPlatformCameraExposure::Aperture);
 }
 
 /*!
@@ -456,7 +456,7 @@ void QCameraExposure::setAutoAperture()
 
 qreal QCameraExposure::shutterSpeed() const
 {
-    return d_func()->actualExposureParameter<qreal>(QCameraExposureControl::ShutterSpeed, -1.0);
+    return d_func()->actualExposureParameter<qreal>(QPlatformCameraExposure::ShutterSpeed, -1.0);
 }
 
 /*!
@@ -465,7 +465,7 @@ qreal QCameraExposure::shutterSpeed() const
 */
 qreal QCameraExposure::requestedShutterSpeed() const
 {
-    return d_func()->requestedExposureParameter<qreal>(QCameraExposureControl::ShutterSpeed, -1.0);
+    return d_func()->requestedExposureParameter<qreal>(QPlatformCameraExposure::ShutterSpeed, -1.0);
 }
 
 /*!
@@ -477,7 +477,7 @@ qreal QCameraExposure::requestedShutterSpeed() const
 QList<qreal> QCameraExposure::supportedShutterSpeeds(bool *continuous) const
 {
     QList<qreal> res;
-    QCameraExposureControl *control = d_func()->exposureControl;
+    QPlatformCameraExposure *control = d_func()->exposureControl;
 
     bool tmp = false;
     if (!continuous)
@@ -486,7 +486,7 @@ QList<qreal> QCameraExposure::supportedShutterSpeeds(bool *continuous) const
     if (!control)
         return res;
 
-    const auto range = control->supportedParameterRange(QCameraExposureControl::ShutterSpeed, continuous);
+    const auto range = control->supportedParameterRange(QPlatformCameraExposure::ShutterSpeed, continuous);
     for (const QVariant &value : range) {
         bool ok = false;
         qreal realValue = value.toReal(&ok);
@@ -505,7 +505,7 @@ QList<qreal> QCameraExposure::supportedShutterSpeeds(bool *continuous) const
 
 void QCameraExposure::setManualShutterSpeed(qreal seconds)
 {
-    d_func()->setExposureParameter<qreal>(QCameraExposureControl::ShutterSpeed, seconds);
+    d_func()->setExposureParameter<qreal>(QPlatformCameraExposure::ShutterSpeed, seconds);
 }
 
 /*!
@@ -514,7 +514,7 @@ void QCameraExposure::setManualShutterSpeed(qreal seconds)
 
 void QCameraExposure::setAutoShutterSpeed()
 {
-    d_func()->resetExposureParameter(QCameraExposureControl::ShutterSpeed);
+    d_func()->resetExposureParameter(QPlatformCameraExposure::ShutterSpeed);
 }
 
 
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index 9c3e8cbff..b157e7a46 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 
 class QCamera;
-class QCameraControl;
+class QPlatformCamera;
 class QCameraExposurePrivate;
 
 class Q_MULTIMEDIA_EXPORT QCameraExposure : public QObject
@@ -158,7 +158,7 @@ protected:
 private:
     friend class QCamera;
     friend class QCameraPrivate;
-    explicit QCameraExposure(QCamera *parent, QCameraControl *cameraControl);
+    explicit QCameraExposure(QCamera *parent, QPlatformCamera *cameraControl);
 
     Q_DISABLE_COPY(QCameraExposure)
     Q_DECLARE_PRIVATE(QCameraExposure)
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 74d2f4454..56a5ac108 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -41,10 +41,10 @@
 #include "private/qobject_p.h"
 
 #include <qcamera.h>
-#include <qcameracontrol.h>
-#include <qcameraexposurecontrol.h>
-#include <qcamerafocuscontrol.h>
-#include <qcameraimagecapturecontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamerafocus_p.h>
+#include <private/qplatformcameraimagecapture_p.h>
 
 #include <QtCore/QDebug>
 
@@ -244,18 +244,18 @@ class QCameraFocusPrivate : public QObjectPrivate
 {
     Q_DECLARE_NON_CONST_PUBLIC(QCameraFocus)
 public:
-    void init(QCameraControl *cameraControl);
+    void init(QPlatformCamera *cameraControl);
 
     QCamera *camera;
 
-    QCameraFocusControl *focusControl;
+    QPlatformCameraFocus *focusControl;
     bool available;
     float zoomFactor = 1.;
 };
 
 #undef Q_DECLARE_NON_CONST_PUBLIC
 
-void QCameraFocusPrivate::init(QCameraControl *cameraControl)
+void QCameraFocusPrivate::init(QPlatformCamera *cameraControl)
 {
     Q_Q(QCameraFocus);
 
@@ -276,7 +276,7 @@ void QCameraFocusPrivate::init(QCameraControl *cameraControl)
     Construct a QCameraFocus for \a camera.
 */
 
-QCameraFocus::QCameraFocus(QCamera *camera, QCameraControl *cameraControl)
+QCameraFocus::QCameraFocus(QCamera *camera, QPlatformCamera *cameraControl)
     : QObject(*new QCameraFocusPrivate, camera)
 {
     Q_D(QCameraFocus);
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 5abe80b27..b6218d784 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 
 
 class QCamera;
-class QCameraControl;
+class QPlatformCamera;
 
 class QCameraFocusZoneData;
 
@@ -154,7 +154,7 @@ protected:
 private:
     friend class QCamera;
     friend class QCameraPrivate;
-    QCameraFocus(QCamera *camera, QCameraControl *cameraControl);
+    QCameraFocus(QCamera *camera, QPlatformCamera *cameraControl);
 
     Q_DISABLE_COPY(QCameraFocus)
     Q_DECLARE_PRIVATE(QCameraFocus)
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 369f207f0..347d14c2f 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 #include <qcameraimagecapture.h>
-#include <qcameraimagecapturecontrol.h>
+#include <private/qplatformcameraimagecapture_p.h>
 #include <qmediaencodersettings.h>
 #include <qmediametadata.h>
 #include <private/qplatformmediacapture_p.h>
 
 #include "private/qobject_p.h"
 #include <qcamera.h>
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qurl.h>
 #include <QtCore/qstringlist.h>
@@ -85,7 +85,7 @@ class QCameraImageCapturePrivate
 public:
     QCamera *camera = nullptr;
 
-    QCameraImageCaptureControl *control = nullptr;
+    QPlatformCameraImageCapture *control = nullptr;
 
     QCameraImageCapture::Error error = QCameraImageCapture::NoError;
     QString errorString;
@@ -163,7 +163,7 @@ QCameraImageCapture::QCameraImageCapture(QCamera *camera)
         }
     }
 
-    // without QCameraImageCaptureControl discard the camera
+    // without QPlatformCameraImageCapture discard the camera
     d->camera = nullptr;
     d->control = nullptr;
 }
@@ -256,7 +256,7 @@ void QCameraImageCapture::setEncodingSettings(const QImageEncoderSettings &setti
             QMetaObject::invokeMethod(camera,
                                       "_q_preparePropertyChange",
                                       Qt::DirectConnection,
-                                      Q_ARG(int, QCameraControl::ImageEncodingSettings));
+                                      Q_ARG(int, QPlatformCamera::ImageEncodingSettings));
         }
 
         d->control->setImageSettings(settings);
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 0b4cd959b..ba132c776 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -40,8 +40,8 @@
 #include "qcameraimageprocessing.h"
 #include "private/qobject_p.h"
 
-#include <qcameracontrol.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 
 #include <QtCore/QDebug>
 
@@ -74,20 +74,20 @@ QT_BEGIN_NAMESPACE
 
     For more information on image processing of camera frames, see \l {camera_image_processing}{Camera Image Processing}.
 
-    \sa QCameraImageProcessingControl
+    \sa QPlatformCameraImageProcessing
 */
 
 class QCameraImageProcessingPrivate : public QObjectPrivate
 {
 public:
-    void init(QCameraControl *cameraControl);
+    void init(QPlatformCamera *cameraControl);
 
     QCamera *camera;
-    QCameraImageProcessingControl *imageControl;
+    QPlatformCameraImageProcessing *imageControl;
 };
 
 
-void QCameraImageProcessingPrivate::init(QCameraControl *cameraControl)
+void QCameraImageProcessingPrivate::init(QPlatformCamera *cameraControl)
 {
     imageControl = cameraControl->imageProcessingControl();
 }
@@ -96,7 +96,7 @@ void QCameraImageProcessingPrivate::init(QCameraControl *cameraControl)
     Construct a QCameraImageProcessing for \a camera.
 */
 
-QCameraImageProcessing::QCameraImageProcessing(QCamera *camera, QCameraControl *cameraControl)
+QCameraImageProcessing::QCameraImageProcessing(QCamera *camera, QPlatformCamera *cameraControl)
     : QObject(*new QCameraImageProcessingPrivate, camera)
 {
     Q_D(QCameraImageProcessing);
@@ -130,7 +130,7 @@ QCameraImageProcessing::WhiteBalanceMode QCameraImageProcessing::whiteBalanceMod
     Q_D(const QCameraImageProcessing);
     if (!d->imageControl)
         return WhiteBalanceAuto;
-    return d->imageControl->parameter(QCameraImageProcessingControl::WhiteBalancePreset)
+    return d->imageControl->parameter(QPlatformCameraImageProcessing::WhiteBalancePreset)
             .value<QCameraImageProcessing::WhiteBalanceMode>();
 }
 
@@ -143,7 +143,7 @@ void QCameraImageProcessing::setWhiteBalanceMode(QCameraImageProcessing::WhiteBa
     Q_D(QCameraImageProcessing);
     if (d->imageControl)
         d->imageControl->setParameter(
-                QCameraImageProcessingControl::WhiteBalancePreset,
+                QPlatformCameraImageProcessing::WhiteBalancePreset,
                 QVariant::fromValue<QCameraImageProcessing::WhiteBalanceMode>(mode));
 }
 
@@ -157,7 +157,7 @@ bool QCameraImageProcessing::isWhiteBalanceModeSupported(QCameraImageProcessing:
     if (!d->imageControl)
         return false;
     return d->imageControl->isParameterValueSupported(
-                QCameraImageProcessingControl::WhiteBalancePreset,
+                QPlatformCameraImageProcessing::WhiteBalancePreset,
                 QVariant::fromValue<QCameraImageProcessing::WhiteBalanceMode>(mode));
 
 }
@@ -174,7 +174,7 @@ qreal QCameraImageProcessing::manualWhiteBalance() const
     if (!d->imageControl)
         return 0.;
 
-    return d->imageControl->parameter(QCameraImageProcessingControl::ColorTemperature).toReal();
+    return d->imageControl->parameter(QPlatformCameraImageProcessing::ColorTemperature).toReal();
 }
 
 /*!
@@ -187,7 +187,7 @@ void QCameraImageProcessing::setManualWhiteBalance(qreal colorTemperature)
     Q_D(QCameraImageProcessing);
     if (d->imageControl)
         d->imageControl->setParameter(
-                QCameraImageProcessingControl::ColorTemperature,
+                QPlatformCameraImageProcessing::ColorTemperature,
                 QVariant(colorTemperature));
 }
 
@@ -199,7 +199,7 @@ qreal QCameraImageProcessing::brightness() const
     Q_D(const QCameraImageProcessing);
     if (!d->imageControl)
         return 0.;
-    return d->imageControl->parameter(QCameraImageProcessingControl::BrightnessAdjustment).toReal();
+    return d->imageControl->parameter(QPlatformCameraImageProcessing::BrightnessAdjustment).toReal();
 }
 
 /*!
@@ -211,7 +211,7 @@ void QCameraImageProcessing::setBrightness(qreal value)
 {
     Q_D(QCameraImageProcessing);
     if (d->imageControl)
-        d->imageControl->setParameter(QCameraImageProcessingControl::BrightnessAdjustment,
+        d->imageControl->setParameter(QPlatformCameraImageProcessing::BrightnessAdjustment,
                                          QVariant(value));
 }
 
@@ -223,7 +223,7 @@ qreal QCameraImageProcessing::contrast() const
     Q_D(const QCameraImageProcessing);
     if (!d->imageControl)
         return 0.;
-    return d->imageControl->parameter(QCameraImageProcessingControl::ContrastAdjustment).toReal();
+    return d->imageControl->parameter(QPlatformCameraImageProcessing::ContrastAdjustment).toReal();
 }
 
 /*!
@@ -235,7 +235,7 @@ void QCameraImageProcessing::setContrast(qreal value)
 {
     Q_D(QCameraImageProcessing);
     if (d->imageControl)
-        d->imageControl->setParameter(QCameraImageProcessingControl::ContrastAdjustment,
+        d->imageControl->setParameter(QPlatformCameraImageProcessing::ContrastAdjustment,
                                          QVariant(value));
 }
 
@@ -247,7 +247,7 @@ qreal QCameraImageProcessing::saturation() const
     Q_D(const QCameraImageProcessing);
     if (!d->imageControl)
         return 0.;
-    return d->imageControl->parameter(QCameraImageProcessingControl::SaturationAdjustment).toReal();
+    return d->imageControl->parameter(QPlatformCameraImageProcessing::SaturationAdjustment).toReal();
 }
 
 /*!
@@ -260,7 +260,7 @@ void QCameraImageProcessing::setSaturation(qreal value)
 {
     Q_D(QCameraImageProcessing);
     if (d->imageControl)
-        d->imageControl->setParameter(QCameraImageProcessingControl::SaturationAdjustment,
+        d->imageControl->setParameter(QPlatformCameraImageProcessing::SaturationAdjustment,
                                          QVariant(value));
 }
 
@@ -308,7 +308,7 @@ QCameraImageProcessing::ColorFilter QCameraImageProcessing::colorFilter() const
     Q_D(const QCameraImageProcessing);
     if (!d->imageControl)
         return ColorFilterNone;
-    return d->imageControl->parameter(QCameraImageProcessingControl::ColorFilter)
+    return d->imageControl->parameter(QPlatformCameraImageProcessing::ColorFilter)
             .value<QCameraImageProcessing::ColorFilter>();
 }
 
@@ -324,7 +324,7 @@ void QCameraImageProcessing::setColorFilter(QCameraImageProcessing::ColorFilter
     Q_D(QCameraImageProcessing);
     if (d->imageControl)
         d->imageControl->setParameter(
-                    QCameraImageProcessingControl::ColorFilter,
+                    QPlatformCameraImageProcessing::ColorFilter,
                     QVariant::fromValue<QCameraImageProcessing::ColorFilter>(filter));
 }
 
@@ -340,7 +340,7 @@ bool QCameraImageProcessing::isColorFilterSupported(QCameraImageProcessing::Colo
     if (!d->imageControl)
         return false;
     return d->imageControl->isParameterValueSupported(
-                QCameraImageProcessingControl::ColorFilter,
+                QPlatformCameraImageProcessing::ColorFilter,
                 QVariant::fromValue<QCameraImageProcessing::ColorFilter>(filter));
 
 }
diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index 785f81c2e..73d299a43 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
 
 
 class QCamera;
-class QCameraControl;
+class QPlatformCamera;
 
 class QCameraImageProcessingPrivate;
 class Q_MULTIMEDIA_EXPORT QCameraImageProcessing : public QObject
@@ -116,7 +116,7 @@ protected:
 private:
     friend class QCamera;
     friend class QCameraPrivate;
-    QCameraImageProcessing(QCamera *camera, QCameraControl *cameraControl);
+    QCameraImageProcessing(QCamera *camera, QPlatformCamera *cameraControl);
 
     Q_DISABLE_COPY(QCameraImageProcessing)
     Q_DECLARE_PRIVATE(QCameraImageProcessing)
diff --git a/src/multimedia/controls/controls.pri b/src/multimedia/controls/controls.pri
index 1d317c439..fb826abdc 100644
--- a/src/multimedia/controls/controls.pri
+++ b/src/multimedia/controls/controls.pri
@@ -2,25 +2,7 @@
 INCLUDEPATH += controls
 
 PUBLIC_HEADERS += \
-    controls/qaudiodecodercontrol.h \
-    controls/qcameracontrol.h \
-    controls/qcameraexposurecontrol.h \
-    controls/qcamerafocuscontrol.h \
-    controls/qcameraimagecapturecontrol.h \
-    controls/qcameraimageprocessingcontrol.h \
-    controls/qplatformmediaplayer_p.h \
-    controls/qmediarecordercontrol.h \
-    controls/qvideorenderercontrol.h \
     controls/qvideowindowcontrol.h \
 
 SOURCES += \
-    controls/qcameracontrol.cpp \
-    controls/qcameraexposurecontrol.cpp \
-    controls/qcamerafocuscontrol.cpp \
-    controls/qcameraimagecapturecontrol.cpp \
-    controls/qcameraimageprocessingcontrol.cpp \
-    controls/qmediaplayercontrol.cpp \
-    controls/qmediarecordercontrol.cpp \
-    controls/qvideorenderercontrol.cpp \
     controls/qvideowindowcontrol.cpp \
-    controls/qaudiodecodercontrol.cpp \
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
index 0e932c8e9..6b1aec554 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
@@ -50,7 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 QAndroidCameraControl::QAndroidCameraControl(QAndroidCameraSession *session)
-    : QCameraControl(0)
+    : QPlatformCamera(0)
     , m_cameraSession(session)
 
 {
@@ -107,26 +107,26 @@ bool QAndroidCameraControl::canChangeProperty(PropertyChangeType changeType, QCa
     Q_UNUSED(status);
 
     switch (changeType) {
-    case QCameraControl::ImageEncodingSettings:
-    case QCameraControl::VideoEncodingSettings:
-    case QCameraControl::Viewfinder:
+    case QPlatformCamera::ImageEncodingSettings:
+    case QPlatformCamera::VideoEncodingSettings:
+    case QPlatformCamera::Viewfinder:
         return true;
     default:
         return false;
     }
 }
 
-QCameraFocusControl *QAndroidCameraControl::focusControl()
+QPlatformCameraFocus *QAndroidCameraControl::focusControl()
 {
     return m_cameraSession->focusControl();
 }
 
-QCameraExposureControl *QAndroidCameraControl::exposureControl()
+QPlatformCameraExposure *QAndroidCameraControl::exposureControl()
 {
     return m_cameraSession->exposureControl();
 }
 
-QCameraImageProcessingControl *QAndroidCameraControl::imageProcessingControl()
+QPlatformCameraImageProcessing *QAndroidCameraControl::imageProcessingControl()
 {
     return m_cameraSession->imageProcessingControl();
 }
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
index f6f0d2fe7..abeeb942b 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
@@ -52,14 +52,14 @@
 // We mean it.
 //
 
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 class QAndroidCameraVideoRendererControl;
 
-class QAndroidCameraControl : public QCameraControl
+class QAndroidCameraControl : public QPlatformCamera
 {
     Q_OBJECT
 public:
@@ -75,9 +75,9 @@ public:
 
     bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
 
-    QCameraFocusControl *focusControl() override;
-    QCameraExposureControl *exposureControl() override;
-    QCameraImageProcessingControl *imageProcessingControl() override;
+    QPlatformCameraFocus *focusControl() override;
+    QPlatformCameraExposure *exposureControl() override;
+    QPlatformCameraImageProcessing *imageProcessingControl() override;
 
     void setVideoSurface(QAbstractVideoSurface *surface) override;
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol.cpp
index e2c1d09c1..1d9521d39 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol.cpp
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 QAndroidCameraExposureControl::QAndroidCameraExposureControl(QAndroidCameraSession *session)
-    : QCameraExposureControl()
+    : QPlatformCameraExposure()
     , m_session(session)
     , m_minExposureCompensationIndex(0)
     , m_maxExposureCompensationIndex(0)
@@ -65,17 +65,17 @@ bool QAndroidCameraExposureControl::isParameterSupported(ExposureParameter param
         return false;
 
     switch (parameter) {
-    case QCameraExposureControl::ISO:
+    case QPlatformCameraExposure::ISO:
         return false;
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         return false;
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ShutterSpeed:
         return false;
-    case QCameraExposureControl::ExposureCompensation:
+    case QPlatformCameraExposure::ExposureCompensation:
         return !m_supportedExposureCompensations.isEmpty();
-    case QCameraExposureControl::TorchPower:
+    case QPlatformCameraExposure::TorchPower:
         return false;
-    case QCameraExposureControl::ExposureMode:
+    case QPlatformCameraExposure::ExposureMode:
         return !m_supportedExposureModes.isEmpty();
     default:
         return false;
@@ -90,9 +90,9 @@ QVariantList QAndroidCameraExposureControl::supportedParameterRange(ExposurePara
     if (continuous)
         *continuous = false;
 
-    if (parameter == QCameraExposureControl::ExposureCompensation)
+    if (parameter == QPlatformCameraExposure::ExposureCompensation)
         return m_supportedExposureCompensations;
-    else if (parameter == QCameraExposureControl::ExposureMode)
+    else if (parameter == QPlatformCameraExposure::ExposureMode)
         return m_supportedExposureModes;
 
     return QVariantList();
@@ -100,9 +100,9 @@ QVariantList QAndroidCameraExposureControl::supportedParameterRange(ExposurePara
 
 QVariant QAndroidCameraExposureControl::requestedValue(ExposureParameter parameter) const
 {
-    if (parameter == QCameraExposureControl::ExposureCompensation)
+    if (parameter == QPlatformCameraExposure::ExposureCompensation)
         return QVariant::fromValue(m_requestedExposureCompensation);
-    else if (parameter == QCameraExposureControl::ExposureMode)
+    else if (parameter == QPlatformCameraExposure::ExposureMode)
         return QVariant::fromValue(m_requestedExposureMode);
 
     return QVariant();
@@ -110,9 +110,9 @@ QVariant QAndroidCameraExposureControl::requestedValue(ExposureParameter paramet
 
 QVariant QAndroidCameraExposureControl::actualValue(ExposureParameter parameter) const
 {
-    if (parameter == QCameraExposureControl::ExposureCompensation)
+    if (parameter == QPlatformCameraExposure::ExposureCompensation)
         return QVariant::fromValue(m_actualExposureCompensation);
-    else if (parameter == QCameraExposureControl::ExposureMode)
+    else if (parameter == QPlatformCameraExposure::ExposureMode)
         return QVariant::fromValue(m_actualExposureMode);
 
     return QVariant();
@@ -123,11 +123,11 @@ bool QAndroidCameraExposureControl::setValue(ExposureParameter parameter, const
     if (!value.isValid())
         return false;
 
-    if (parameter == QCameraExposureControl::ExposureCompensation) {
+    if (parameter == QPlatformCameraExposure::ExposureCompensation) {
         qreal expComp = value.toReal();
         if (!qFuzzyCompare(m_requestedExposureCompensation, expComp)) {
             m_requestedExposureCompensation = expComp;
-            emit requestedValueChanged(QCameraExposureControl::ExposureCompensation);
+            emit requestedValueChanged(QPlatformCameraExposure::ExposureCompensation);
         }
 
         if (!m_session->camera())
@@ -140,17 +140,17 @@ bool QAndroidCameraExposureControl::setValue(ExposureParameter parameter, const
             m_session->camera()->setExposureCompensation(expCompIndex);
             if (!qFuzzyCompare(m_actualExposureCompensation, comp)) {
                 m_actualExposureCompensation = expCompIndex * m_exposureCompensationStep;
-                emit actualValueChanged(QCameraExposureControl::ExposureCompensation);
+                emit actualValueChanged(QPlatformCameraExposure::ExposureCompensation);
             }
 
             return true;
         }
 
-    } else if (parameter == QCameraExposureControl::ExposureMode) {
+    } else if (parameter == QPlatformCameraExposure::ExposureMode) {
         QCameraExposure::ExposureMode expMode = value.value<QCameraExposure::ExposureMode>();
         if (m_requestedExposureMode != expMode) {
             m_requestedExposureMode = expMode;
-            emit requestedValueChanged(QCameraExposureControl::ExposureMode);
+            emit requestedValueChanged(QPlatformCameraExposure::ExposureMode);
         }
 
         if (!m_session->camera())
@@ -216,7 +216,7 @@ bool QAndroidCameraExposureControl::setValue(ExposureParameter parameter, const
             }
 
             m_session->camera()->setSceneMode(sceneMode);
-            emit actualValueChanged(QCameraExposureControl::ExposureMode);
+            emit actualValueChanged(QPlatformCameraExposure::ExposureMode);
 
             return true;
         }
@@ -234,7 +234,7 @@ void QAndroidCameraExposureControl::onCameraOpened()
     if (m_minExposureCompensationIndex != 0 || m_maxExposureCompensationIndex != 0) {
         for (int i = m_minExposureCompensationIndex; i <= m_maxExposureCompensationIndex; ++i)
             m_supportedExposureCompensations.append(i * m_exposureCompensationStep);
-        emit parameterRangeChanged(QCameraExposureControl::ExposureCompensation);
+        emit parameterRangeChanged(QPlatformCameraExposure::ExposureCompensation);
     }
 
     m_supportedExposureModes.clear();
@@ -275,11 +275,11 @@ void QAndroidCameraExposureControl::onCameraOpened()
             else if (sceneMode == QLatin1String("barcode"))
                 m_supportedExposureModes << QVariant::fromValue(QCameraExposure::ExposureBarcode);
         }
-        emit parameterRangeChanged(QCameraExposureControl::ExposureMode);
+        emit parameterRangeChanged(QPlatformCameraExposure::ExposureMode);
     }
 
-    setValue(QCameraExposureControl::ExposureCompensation, QVariant::fromValue(m_requestedExposureCompensation));
-    setValue(QCameraExposureControl::ExposureMode, QVariant::fromValue(m_requestedExposureMode));
+    setValue(QPlatformCameraExposure::ExposureCompensation, QVariant::fromValue(m_requestedExposureCompensation));
+    setValue(QPlatformCameraExposure::ExposureMode, QVariant::fromValue(m_requestedExposureMode));
 
     m_supportedFlashModes.clear();
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
index a274196c5..a67bdaee3 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraexposurecontrol_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include <qcameraexposurecontrol.h>
+#include <private/qplatformcameraexposure_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 
-class QAndroidCameraExposureControl : public QCameraExposureControl
+class QAndroidCameraExposureControl : public QPlatformCameraExposure
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol.cpp
index 452784937..abb6812ab 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol.cpp
@@ -60,7 +60,7 @@ static QRect adjustedArea(const QRectF &area)
 }
 
 QAndroidCameraFocusControl::QAndroidCameraFocusControl(QAndroidCameraSession *session)
-    : QCameraFocusControl()
+    : QPlatformCameraFocus()
     , m_session(session)
     , m_focusMode(QCameraFocus::AutoFocus)
     , m_focusPointMode(QCameraFocus::FocusPointAuto)
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
index 79ab30f4f..9cf984616 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerafocuscontrol_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include <qcamerafocuscontrol.h>
+#include <private/qplatformcamerafocus_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 
-class QAndroidCameraFocusControl : public QCameraFocusControl
+class QAndroidCameraFocusControl : public QPlatformCameraFocus
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
index 9885be05b..7f8b108b6 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
@@ -44,7 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 QAndroidCameraImageCaptureControl::QAndroidCameraImageCaptureControl(QAndroidCameraSession *session)
-    : QCameraImageCaptureControl()
+    : QPlatformCameraImageCapture()
     , m_session(session)
 {
     connect(m_session, SIGNAL(readyForCaptureChanged(bool)), this, SIGNAL(readyForCaptureChanged(bool)));
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
index 58dc73e98..6d0973918 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include <qcameraimagecapturecontrol.h>
+#include <private/qplatformcameraimagecapture_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 
-class QAndroidCameraImageCaptureControl : public QCameraImageCaptureControl
+class QAndroidCameraImageCaptureControl : public QPlatformCameraImageCapture
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp
index f35e6cf6e..db5894de5 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol.cpp
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 QAndroidCameraImageProcessingControl::QAndroidCameraImageProcessingControl(QAndroidCameraSession *session)
-    : QCameraImageProcessingControl()
+    : QPlatformCameraImageProcessing()
     , m_session(session)
     , m_whiteBalanceMode(QCameraImageProcessing::WhiteBalanceAuto)
 {
@@ -55,7 +55,7 @@ QAndroidCameraImageProcessingControl::QAndroidCameraImageProcessingControl(QAndr
 
 bool QAndroidCameraImageProcessingControl::isParameterSupported(ProcessingParameter parameter) const
 {
-    return parameter == QCameraImageProcessingControl::WhiteBalancePreset
+    return parameter == QPlatformCameraImageProcessing::WhiteBalancePreset
             && m_session->camera()
             && !m_supportedWhiteBalanceModes.isEmpty();
 }
@@ -63,14 +63,14 @@ bool QAndroidCameraImageProcessingControl::isParameterSupported(ProcessingParame
 bool QAndroidCameraImageProcessingControl::isParameterValueSupported(ProcessingParameter parameter,
                                                                      const QVariant &value) const
 {
-    return parameter == QCameraImageProcessingControl::WhiteBalancePreset
+    return parameter == QPlatformCameraImageProcessing::WhiteBalancePreset
             && m_session->camera()
             && m_supportedWhiteBalanceModes.contains(value.value<QCameraImageProcessing::WhiteBalanceMode>());
 }
 
 QVariant QAndroidCameraImageProcessingControl::parameter(ProcessingParameter parameter) const
 {
-    if (parameter != QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter != QPlatformCameraImageProcessing::WhiteBalancePreset)
         return QVariant();
 
     return QVariant::fromValue(m_whiteBalanceMode);
@@ -78,7 +78,7 @@ QVariant QAndroidCameraImageProcessingControl::parameter(ProcessingParameter par
 
 void QAndroidCameraImageProcessingControl::setParameter(ProcessingParameter parameter, const QVariant &value)
 {
-    if (parameter != QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter != QPlatformCameraImageProcessing::WhiteBalancePreset)
         return;
 
     QCameraImageProcessing::WhiteBalanceMode mode = value.value<QCameraImageProcessing::WhiteBalanceMode>();
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
index f0c378f4a..d13b4da96 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameraimageprocessingcontrol_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 
-class QAndroidCameraImageProcessingControl : public QCameraImageProcessingControl
+class QAndroidCameraImageProcessingControl : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
index fad33fe09..a7768a364 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
@@ -75,17 +75,17 @@ QAndroidCaptureService::~QAndroidCaptureService()
     delete m_cameraSession;
 }
 
-QCameraControl *QAndroidCaptureService::cameraControl()
+QPlatformCamera *QAndroidCaptureService::cameraControl()
 {
     return m_cameraControl;
 }
 
-QCameraImageCaptureControl *QAndroidCaptureService::imageCaptureControl()
+QPlatformCameraImageCapture *QAndroidCaptureService::imageCaptureControl()
 {
     return m_imageCaptureControl;
 }
 
-QMediaRecorderControl *QAndroidCaptureService::mediaRecorderControl()
+QPlatformMediaRecorder *QAndroidCaptureService::mediaRecorderControl()
 {
     return m_recorderControl;
 }
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
index 709018a08..36589cb6f 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -71,9 +71,9 @@ public:
     explicit QAndroidCaptureService(QMediaRecorder::CaptureMode mode);
     virtual ~QAndroidCaptureService();
 
-    QCameraControl *cameraControl() override;
-    QCameraImageCaptureControl *imageCaptureControl() override;
-    QMediaRecorderControl *mediaRecorderControl() override;
+    QPlatformCamera *cameraControl() override;
+    QPlatformCameraImageCapture *imageCaptureControl() override;
+    QPlatformMediaRecorder *mediaRecorderControl() override;
 
     bool m_videoEnabled = false;
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp
index fd77523f9..b0f1a2b20 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 QAndroidMediaRecorderControl::QAndroidMediaRecorderControl(QAndroidCaptureSession *session)
-    : QMediaRecorderControl()
+    : QPlatformMediaRecorder()
     , m_session(session)
 {
     connect(m_session, SIGNAL(stateChanged(QMediaRecorder::State)), this, SIGNAL(stateChanged(QMediaRecorder::State)));
diff --git a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h
index 0ef2370c8..b1e29f3fc 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidmediarecordercontrol_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCaptureSession;
 
-class QAndroidMediaRecorderControl : public QMediaRecorderControl
+class QAndroidMediaRecorderControl : public QPlatformMediaRecorder
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/darwin/camera/avfcameracontrol.mm b/src/multimedia/platform/darwin/camera/avfcameracontrol.mm
index aa64ea425..8f4c04378 100644
--- a/src/multimedia/platform/darwin/camera/avfcameracontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameracontrol.mm
@@ -50,7 +50,7 @@
 QT_USE_NAMESPACE
 
 AVFCameraControl::AVFCameraControl(AVFCameraService *service, QObject *parent)
-   : QCameraControl(parent)
+   : QPlatformCamera(parent)
    , m_session(service->session())
    , m_service(service)
    , m_state(QCamera::UnloadedState)
@@ -107,7 +107,7 @@ void AVFCameraControl::updateStatus()
     }
 }
 
-bool AVFCameraControl::canChangeProperty(QCameraControl::PropertyChangeType changeType, QCamera::Status status) const
+bool AVFCameraControl::canChangeProperty(QPlatformCamera::PropertyChangeType changeType, QCamera::Status status) const
 {
     Q_UNUSED(changeType);
     Q_UNUSED(status);
@@ -197,17 +197,17 @@ AVCaptureConnection *AVFCameraControl::videoConnection() const
 }
 
 
-QCameraFocusControl *AVFCameraControl::focusControl()
+QPlatformCameraFocus *AVFCameraControl::focusControl()
 {
     return m_service->cameraFocusControl();
 }
 
-QCameraExposureControl *AVFCameraControl::exposureControl()
+QPlatformCameraExposure *AVFCameraControl::exposureControl()
 {
     return m_service->cameraExposureControl();
 }
 
-QCameraImageProcessingControl *AVFCameraControl::imageProcessingControl()
+QPlatformCameraImageProcessing *AVFCameraControl::imageProcessingControl()
 {
     return m_service->cameraImageProcessingControl();
 }
diff --git a/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h b/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h
index 5f9aff0d6..5a61dc34b 100644
--- a/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameracontrol_p.h
@@ -53,7 +53,7 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMultimedia/qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,7 +62,7 @@ class AVFCameraService;
 @class AVCaptureDeviceFormat;
 @class AVCaptureConnection;
 
-class AVFCameraControl : public QCameraControl
+class AVFCameraControl : public QPlatformCamera
 {
 Q_OBJECT
 public:
@@ -78,9 +78,9 @@ public:
 
     bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const override;
 
-    QCameraFocusControl *focusControl() override;
-    QCameraExposureControl *exposureControl() override;
-    QCameraImageProcessingControl *imageProcessingControl() override;
+    QPlatformCameraFocus *focusControl() override;
+    QPlatformCameraExposure *exposureControl() override;
+    QPlatformCameraImageProcessing *imageProcessingControl() override;
 
     // "Converters":
     static QVideoFrame::PixelFormat QtPixelFormatFromCVFormat(unsigned avPixelFormat);
diff --git a/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol.mm b/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol.mm
index a0b2ae06d..3abb04650 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol.mm
@@ -173,7 +173,7 @@ void qt_set_exposure_bias(QPointer<AVFCameraService> service, QPointer<AVFCamera
         if (service) {
             if (control) {
                 if (service->session() && service->session()->videoCaptureDevice() == device)
-                    Q_EMIT control->actualValueChanged(int(QCameraExposureControl::ExposureCompensation));
+                    Q_EMIT control->actualValueChanged(int(QPlatformCameraExposure::ExposureCompensation));
             }
         }
         device = nil;
@@ -198,9 +198,9 @@ void qt_set_duration_iso(QPointer<AVFCameraService> service, QPointer<AVFCameraE
             if (control) {
                 if (service->session() && service->session()->videoCaptureDevice() == device) {
                     if (setDuration)
-                        Q_EMIT control->actualValueChanged(int(QCameraExposureControl::ShutterSpeed));
+                        Q_EMIT control->actualValueChanged(int(QPlatformCameraExposure::ShutterSpeed));
                     if (setISO)
-                        Q_EMIT control->actualValueChanged(int(QCameraExposureControl::ISO));
+                        Q_EMIT control->actualValueChanged(int(QPlatformCameraExposure::ISO));
                 }
             }
         }
@@ -235,10 +235,10 @@ bool AVFCameraExposureControl::isParameterSupported(ExposureParameter parameter)
         return false;
 
     // These are the parameters we have an API to support:
-    return parameter == QCameraExposureControl::ISO
-           || parameter == QCameraExposureControl::ShutterSpeed
-           || parameter == QCameraExposureControl::ExposureCompensation
-           || parameter == QCameraExposureControl::ExposureMode;
+    return parameter == QPlatformCameraExposure::ISO
+           || parameter == QPlatformCameraExposure::ShutterSpeed
+           || parameter == QPlatformCameraExposure::ExposureCompensation
+           || parameter == QPlatformCameraExposure::ExposureMode;
 #else
     Q_UNUSED(parameter);
     return false;
@@ -262,7 +262,7 @@ QVariantList AVFCameraExposureControl::supportedParameterRange(ExposureParameter
 
     AVCaptureDeviceFormat *activeFormat = captureDevice.activeFormat;
 
-    if (parameter == QCameraExposureControl::ISO) {
+    if (parameter == QPlatformCameraExposure::ISO) {
         if (!activeFormat) {
             qDebugCamera() << Q_FUNC_INFO << "failed to obtain capture device format";
             return parameterRange;
@@ -277,12 +277,12 @@ QVariantList AVFCameraExposureControl::supportedParameterRange(ExposureParameter
         parameterRange << QVariant(int(activeFormat.maxISO));
         if (continuous)
             *continuous = true;
-    } else if (parameter == QCameraExposureControl::ExposureCompensation) {
+    } else if (parameter == QPlatformCameraExposure::ExposureCompensation) {
         parameterRange << captureDevice.minExposureTargetBias;
         parameterRange << captureDevice.maxExposureTargetBias;
         if (continuous)
             *continuous = true;
-    } else if (parameter == QCameraExposureControl::ShutterSpeed) {
+    } else if (parameter == QPlatformCameraExposure::ShutterSpeed) {
         if (!activeFormat) {
             qDebugCamera() << Q_FUNC_INFO << "failed to obtain capture device format";
             return parameterRange;
@@ -294,7 +294,7 @@ QVariantList AVFCameraExposureControl::supportedParameterRange(ExposureParameter
 
         if (continuous)
             *continuous = true;
-    } else if (parameter == QCameraExposureControl::ExposureMode) {
+    } else if (parameter == QPlatformCameraExposure::ExposureMode) {
         if ([captureDevice isExposureModeSupported:AVCaptureExposureModeCustom])
             parameterRange << QVariant::fromValue(QCameraExposure::ExposureManual);
 
@@ -315,16 +315,16 @@ QVariant AVFCameraExposureControl::requestedValue(ExposureParameter parameter) c
         return QVariant();
     }
 
-    if (parameter == QCameraExposureControl::ExposureMode)
+    if (parameter == QPlatformCameraExposure::ExposureMode)
         return m_requestedMode;
 
-    if (parameter == QCameraExposureControl::ExposureCompensation)
+    if (parameter == QPlatformCameraExposure::ExposureCompensation)
         return m_requestedCompensation;
 
-    if (parameter == QCameraExposureControl::ShutterSpeed)
+    if (parameter == QPlatformCameraExposure::ShutterSpeed)
         return m_requestedShutterSpeed;
 
-    if (parameter == QCameraExposureControl::ISO)
+    if (parameter == QPlatformCameraExposure::ISO)
         return m_requestedISO;
 
     return QVariant();
@@ -340,20 +340,20 @@ QVariant AVFCameraExposureControl::actualValue(ExposureParameter parameter) cons
         return QVariant();
     }
 
-    if (parameter == QCameraExposureControl::ExposureMode) {
+    if (parameter == QPlatformCameraExposure::ExposureMode) {
         // This code expects exposureMode to be continuous by default ...
         if (captureDevice.exposureMode == AVCaptureExposureModeContinuousAutoExposure)
             return QVariant::fromValue(QCameraExposure::ExposureAuto);
         return QVariant::fromValue(QCameraExposure::ExposureManual);
     }
 
-    if (parameter == QCameraExposureControl::ExposureCompensation)
+    if (parameter == QPlatformCameraExposure::ExposureCompensation)
         return captureDevice.exposureTargetBias;
 
-    if (parameter == QCameraExposureControl::ShutterSpeed)
+    if (parameter == QPlatformCameraExposure::ShutterSpeed)
         return qreal(CMTimeGetSeconds(captureDevice.exposureDuration));
 
-    if (parameter == QCameraExposureControl::ISO) {
+    if (parameter == QPlatformCameraExposure::ISO) {
         if (captureDevice.activeFormat && qt_check_ISO_range(captureDevice.activeFormat)
             && qt_check_ISO_conversion(captureDevice.ISO)) {
             // Can be represented as int ...
@@ -371,13 +371,13 @@ QVariant AVFCameraExposureControl::actualValue(ExposureParameter parameter) cons
 
 bool AVFCameraExposureControl::setValue(ExposureParameter parameter, const QVariant &value)
 {
-    if (parameter == QCameraExposureControl::ExposureMode)
+    if (parameter == QPlatformCameraExposure::ExposureMode)
         return setExposureMode(value);
-    else if (parameter == QCameraExposureControl::ExposureCompensation)
+    else if (parameter == QPlatformCameraExposure::ExposureCompensation)
         return setExposureCompensation(value);
-    else if (parameter == QCameraExposureControl::ShutterSpeed)
+    else if (parameter == QPlatformCameraExposure::ShutterSpeed)
         return setShutterSpeed(value);
-    else if (parameter == QCameraExposureControl::ISO)
+    else if (parameter == QPlatformCameraExposure::ISO)
         return setISO(value);
 
     return false;
@@ -401,7 +401,7 @@ bool AVFCameraExposureControl::setExposureMode(const QVariant &value)
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     if (!captureDevice) {
         m_requestedMode = value;
-        Q_EMIT requestedValueChanged(int(QCameraExposureControl::ExposureMode));
+        Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ExposureMode));
         return true;
     }
 
@@ -420,8 +420,8 @@ bool AVFCameraExposureControl::setExposureMode(const QVariant &value)
 
     m_requestedMode = value;
     [captureDevice setExposureMode:avMode];
-    Q_EMIT requestedValueChanged(int(QCameraExposureControl::ExposureMode));
-    Q_EMIT actualValueChanged(int(QCameraExposureControl::ExposureMode));
+    Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ExposureMode));
+    Q_EMIT actualValueChanged(int(QPlatformCameraExposure::ExposureMode));
 
     return true;
 #else
@@ -443,7 +443,7 @@ bool AVFCameraExposureControl::setExposureCompensation(const QVariant &value)
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     if (!captureDevice) {
         m_requestedCompensation = value;
-        Q_EMIT requestedValueChanged(int(QCameraExposureControl::ExposureCompensation));
+        Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ExposureCompensation));
         return true;
     }
 
@@ -462,7 +462,7 @@ bool AVFCameraExposureControl::setExposureCompensation(const QVariant &value)
 
     qt_set_exposure_bias(m_service, this, captureDevice, bias);
     m_requestedCompensation = value;
-    Q_EMIT requestedValueChanged(int(QCameraExposureControl::ExposureCompensation));
+    Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ExposureCompensation));
 
     return true;
 #else
@@ -486,7 +486,7 @@ bool AVFCameraExposureControl::setShutterSpeed(const QVariant &value)
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     if (!captureDevice) {
         m_requestedShutterSpeed = value;
-        Q_EMIT requestedValueChanged(int(QCameraExposureControl::ShutterSpeed));
+        Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ShutterSpeed));
         return true;
     }
 
@@ -509,7 +509,7 @@ bool AVFCameraExposureControl::setShutterSpeed(const QVariant &value)
     qt_set_duration_iso(m_service, this, captureDevice, newDuration, AVCaptureISOCurrent);
 
     m_requestedShutterSpeed = value;
-    Q_EMIT requestedValueChanged(int(QCameraExposureControl::ShutterSpeed));
+    Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ShutterSpeed));
 
     return true;
 #else
@@ -532,7 +532,7 @@ bool AVFCameraExposureControl::setISO(const QVariant &value)
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     if (!captureDevice) {
         m_requestedISO = value;
-        Q_EMIT requestedValueChanged(int(QCameraExposureControl::ISO));
+        Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ISO));
         return true;
     }
 
@@ -553,7 +553,7 @@ bool AVFCameraExposureControl::setISO(const QVariant &value)
     qt_set_duration_iso(m_service, this, captureDevice, AVCaptureExposureDurationCurrent, value.toInt());
 
     m_requestedISO = value;
-    Q_EMIT requestedValueChanged(int(QCameraExposureControl::ISO));
+    Q_EMIT requestedValueChanged(int(QPlatformCameraExposure::ISO));
 
     return true;
 #else
@@ -575,10 +575,10 @@ void AVFCameraExposureControl::cameraStateChanged(QCamera::State newState)
         return;
     }
 
-    Q_EMIT parameterRangeChanged(int(QCameraExposureControl::ExposureCompensation));
-    Q_EMIT parameterRangeChanged(int(QCameraExposureControl::ExposureMode));
-    Q_EMIT parameterRangeChanged(int(QCameraExposureControl::ShutterSpeed));
-    Q_EMIT parameterRangeChanged(int(QCameraExposureControl::ISO));
+    Q_EMIT parameterRangeChanged(int(QPlatformCameraExposure::ExposureCompensation));
+    Q_EMIT parameterRangeChanged(int(QPlatformCameraExposure::ExposureMode));
+    Q_EMIT parameterRangeChanged(int(QPlatformCameraExposure::ShutterSpeed));
+    Q_EMIT parameterRangeChanged(int(QPlatformCameraExposure::ISO));
 
     const AVFConfigurationLock lock(captureDevice);
 
@@ -651,7 +651,7 @@ void AVFCameraExposureControl::cameraStateChanged(QCamera::State newState)
         }
 
         [captureDevice setExposureMode:avMode];
-        Q_EMIT actualValueChanged(int(QCameraExposureControl::ExposureMode));
+        Q_EMIT actualValueChanged(int(QPlatformCameraExposure::ExposureMode));
     }
 #endif
 
diff --git a/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol_p.h b/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol_p.h
index 9cf60a7b8..8ecffbada 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameraexposurecontrol_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qcameraexposurecontrol.h>
+#include <private/qplatformcameraexposure_p.h>
 #include <QtMultimedia/qcameraexposure.h>
 
 #include <QtCore/qglobal.h>
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class AVFCameraSession;
 class AVFCameraService;
 
-class AVFCameraExposureControl : public QCameraExposureControl
+class AVFCameraExposureControl : public QPlatformCameraExposure
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/darwin/camera/avfcamerafocuscontrol_p.h b/src/multimedia/platform/darwin/camera/avfcamerafocuscontrol_p.h
index e1f8d9aec..7ba753c7d 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerafocuscontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcamerafocuscontrol_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qglobal.h>
 
-#include <qcamerafocuscontrol.h>
+#include <private/qplatformcamerafocus_p.h>
 
 #include <AVFoundation/AVFoundation.h>
 
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class AVFCameraService;
 class AVFCameraSession;
 
-class AVFCameraFocusControl : public QCameraFocusControl
+class AVFCameraFocusControl : public QPlatformCameraFocus
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol.mm b/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol.mm
index 07082b125..6a55807b7 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol.mm
@@ -149,32 +149,31 @@ AVFCameraImageProcessingControl::~AVFCameraImageProcessingControl()
 }
 
 bool AVFCameraImageProcessingControl::isParameterSupported(
-        QCameraImageProcessingControl::ProcessingParameter parameter) const
+        QPlatformCameraImageProcessing::ProcessingParameter parameter) const
 {
 #ifdef Q_OS_IOS
-    return (parameter == QCameraImageProcessingControl::WhiteBalancePreset
-            || parameter == QCameraImageProcessingControl::ColorTemperature)
+    return (parameter == QPlatformCameraImageProcessing::WhiteBalancePreset
+            || parameter == QPlatformCameraImageProcessing::ColorTemperature)
             && m_session->videoCaptureDevice();
 #else
-    return parameter == QCameraImageProcessingControl::WhiteBalancePreset
+    return parameter == QPlatformCameraImageProcessing::WhiteBalancePreset
             && m_session->videoCaptureDevice();
 #endif
 }
 
 bool AVFCameraImageProcessingControl::isParameterValueSupported(
-        QCameraImageProcessingControl::ProcessingParameter parameter,
+        QPlatformCameraImageProcessing::ProcessingParameter parameter,
         const QVariant &value) const
 {
     AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
     Q_ASSERT(captureDevice);
 
-    if (parameter == QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter == QPlatformCameraImageProcessing::WhiteBalancePreset)
         return isWhiteBalanceModeSupported(
             value.value<QCameraImageProcessing::WhiteBalanceMode>());
 
 #ifdef Q_OS_IOS
-    if (parameter == QCameraImageProcessing::ColorTemperature) {
-        AVCaptureWhiteBalanceGains gains;
+    if (parameter == QPlatformCameraImageProcessing::ColorTemperature)
         return avf_convert_temp_and_tint_to_wb_gains(
             captureDevice, value.value<float>(), .0, gains);
     }
@@ -184,13 +183,13 @@ bool AVFCameraImageProcessingControl::isParameterValueSupported(
 }
 
 QVariant AVFCameraImageProcessingControl::parameter(
-        QCameraImageProcessingControl::ProcessingParameter parameter) const
+        QPlatformCameraImageProcessing::ProcessingParameter parameter) const
 {
-    if (parameter == QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter == QPlatformCameraImageProcessing::WhiteBalancePreset)
         return QVariant::fromValue(m_whiteBalanceMode);
 
 #ifdef Q_OS_IOS
-    if (parameter == QCameraImageProcessingControl::ColorTemperature)
+    if (parameter == QPlatformCameraImageProcessing::ColorTemperature)
         return QVariant::fromValue(m_colorTemperature);
 #endif
 
@@ -198,15 +197,15 @@ QVariant AVFCameraImageProcessingControl::parameter(
 }
 
 void AVFCameraImageProcessingControl::setParameter(
-        QCameraImageProcessingControl::ProcessingParameter parameter,
+        QPlatformCameraImageProcessing::ProcessingParameter parameter,
         const QVariant &value)
 {
     bool result = false;
-    if (parameter == QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter == QPlatformCameraImageProcessing::WhiteBalancePreset)
         result = setWhiteBalanceMode(value.value<QCameraImageProcessing::WhiteBalanceMode>());
 
 #ifdef Q_OS_IOS
-    else if (parameter == QCameraImageProcessingControl::ColorTemperature)
+    else if (parameter == QPlatformCameraImageProcessing::ColorTemperature)
         result = setColorTemperature(value.value<float>());
 #endif
 
diff --git a/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol_p.h b/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol_p.h
index c5af430c4..3bc477cb2 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameraimageprocessingcontrol_p.h
@@ -53,14 +53,14 @@
 
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qcamera.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class AVFCameraSession;
 class AVFCameraService;
 
-class AVFCameraImageProcessingControl : public QCameraImageProcessingControl
+class AVFCameraImageProcessingControl : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
index ce4d592cc..2dd507552 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
@@ -102,22 +102,22 @@ AVFCameraService::~AVFCameraService()
     delete m_session;
 }
 
-QCameraControl *AVFCameraService::cameraControl()
+QPlatformCamera *AVFCameraService::cameraControl()
 {
     return m_cameraControl;
 }
 
-QCameraImageCaptureControl *AVFCameraService::imageCaptureControl()
+QPlatformCameraImageCapture *AVFCameraService::imageCaptureControl()
 {
     return m_imageCaptureControl;
 }
 
-QMediaRecorderControl *AVFCameraService::mediaRecorderControl()
+QPlatformMediaRecorder *AVFCameraService::mediaRecorderControl()
 {
     return m_recorderControl;
 }
 
-QCameraImageProcessingControl *AVFCameraService::cameraImageProcessingControl() const
+QPlatformCameraImageProcessing *AVFCameraService::cameraImageProcessingControl() const
 {
     return m_cameraImageProcessingControl;
 }
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
index 80efa5832..4369df8b1 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
@@ -57,9 +57,9 @@
 
 
 QT_BEGIN_NAMESPACE
-class QCameraControl;
-class QMediaRecorderControl;
-class QCameraImageProcessingControl;
+class QPlatformCamera;
+class QPlatformMediaRecorder;
+class QPlatformCameraImageProcessing;
 class AVFCameraControl;
 class AVFImageCaptureControl;
 class AVFCameraSession;
@@ -76,22 +76,22 @@ public:
     AVFCameraService();
     ~AVFCameraService();
 
-    QCameraControl *cameraControl() override;
-    QCameraImageCaptureControl *imageCaptureControl() override;
-    QMediaRecorderControl *mediaRecorderControl() override;
+    QPlatformCamera *cameraControl() override;
+    QPlatformCameraImageCapture *imageCaptureControl() override;
+    QPlatformMediaRecorder *mediaRecorderControl() override;
 
     AVFCameraSession *session() const { return m_session; }
     AVFCameraControl *avfCameraControl() const { return m_cameraControl; }
-    QMediaRecorderControl *recorderControl() const { return m_recorderControl; }
+    QPlatformMediaRecorder *recorderControl() const { return m_recorderControl; }
     AVFImageCaptureControl *avfImageCaptureControl() const { return m_imageCaptureControl; }
     AVFCameraFocusControl *cameraFocusControl() const { return m_cameraFocusControl; }
     AVFCameraExposureControl *cameraExposureControl() const { return m_cameraExposureControl; }
-    QCameraImageProcessingControl *cameraImageProcessingControl() const;
+    QPlatformCameraImageProcessing *cameraImageProcessingControl() const;
 
 private:
     AVFCameraSession *m_session;
     AVFCameraControl *m_cameraControl;
-    QMediaRecorderControl *m_recorderControl;
+    QPlatformMediaRecorder *m_recorderControl;
     AVFImageCaptureControl *m_imageCaptureControl;
     AVFCameraFocusControl *m_cameraFocusControl;
     AVFCameraExposureControl *m_cameraExposureControl;
diff --git a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm
index 8b0bad60b..f124dffe3 100644
--- a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol.mm
@@ -53,7 +53,7 @@
 QT_USE_NAMESPACE
 
 AVFImageCaptureControl::AVFImageCaptureControl(AVFCameraService *service, QObject *parent)
-   : QCameraImageCaptureControl(parent)
+   : QPlatformCameraImageCapture(parent)
    , m_service(service)
    , m_session(service->session())
    , m_cameraControl(service->avfCameraControl())
diff --git a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h
index 64cab6e2e..37e6654b8 100644
--- a/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfimagecapturecontrol_p.h
@@ -56,13 +56,13 @@
 #include <QtCore/qqueue.h>
 #include <QtCore/qsemaphore.h>
 #include <QtCore/qsharedpointer.h>
-#include <QtMultimedia/qcameraimagecapturecontrol.h>
+#include <private/qplatformcameraimagecapture_p.h>
 #include "avfcamerasession_p.h"
 #include "avfstoragelocation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class AVFImageCaptureControl : public QCameraImageCaptureControl
+class AVFImageCaptureControl : public QPlatformCameraImageCapture
 {
 Q_OBJECT
 public:
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
index b96e92edd..4b178ff44 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol.mm
@@ -51,7 +51,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qmimetype.h>
 #include <QtCore/qfileinfo.h>
-#include <QtMultimedia/qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 #include <CoreAudio/CoreAudio.h>
 
 QT_USE_NAMESPACE
@@ -126,7 +126,7 @@ QT_USE_NAMESPACE
 
 
 AVFMediaRecorderControl::AVFMediaRecorderControl(AVFCameraService *service, QObject *parent)
-   : QMediaRecorderControl(parent)
+   : QPlatformMediaRecorder(parent)
    , m_cameraControl(service->avfCameraControl())
    , m_session(service->session())
    , m_connected(false)
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios.mm b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios.mm
index c33b66ad0..f55470227 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios.mm
@@ -84,7 +84,7 @@ bool qt_file_exists(NSURL *fileURL)
 }
 
 AVFMediaRecorderControlIOS::AVFMediaRecorderControlIOS(AVFCameraService *service, QObject *parent)
-    : QMediaRecorderControl(parent)
+    : QPlatformMediaRecorder(parent)
     , m_service(service)
     , m_state(QMediaRecorder::StoppedState)
     , m_lastStatus(QMediaRecorder::UnloadedStatus)
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios_p.h b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios_p.h
index f550e59c2..290cab6e9 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios_p.h
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_ios_p.h
@@ -55,7 +55,7 @@
 #include "avfstoragelocation.h"
 #include "avfcamerautility.h"
 
-#include <QtMultimedia/qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include <private/qvideooutputorientationhandler_p.h>
 
 #include <QtCore/qglobal.h>
@@ -69,7 +69,7 @@ class AVFCameraService;
 class QString;
 class QUrl;
 
-class AVFMediaRecorderControlIOS : public QMediaRecorderControl
+class AVFMediaRecorderControlIOS : public QPlatformMediaRecorder
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h
index 90cdf402e..31d1093a6 100644
--- a/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h
+++ b/src/multimedia/platform/darwin/camera/avfmediarecordercontrol_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qurl.h>
-#include <QtMultimedia/qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 
 #import <AVFoundation/AVFoundation.h>
 #include "avfstoragelocation_p.h"
@@ -69,7 +69,7 @@ class AVFCameraSession;
 class AVFCameraControl;
 class AVFCameraService;
 
-class AVFMediaRecorderControl : public QMediaRecorderControl
+class AVFMediaRecorderControl : public QPlatformMediaRecorder
 {
 Q_OBJECT
 public:
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
index b857309c3..ab7115277 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qplatformmediaplayer_p.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <QtCore/QObject>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayersession_p.h
index 0b8dd176c..a42ec9205 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 <qplatformmediaplayer_p.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <QtMultimedia/QMediaPlayer>
 
 Q_FORWARD_DECLARE_OBJC_CLASS(AVAsset);
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp
index 7c0d5cb87..a346e6b1d 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol.cpp
@@ -72,7 +72,7 @@ typedef enum {
 } GstPlayFlags;
 
 QGstreamerAudioDecoderControl::QGstreamerAudioDecoderControl(QObject *parent)
-    : QAudioDecoderControl(parent),
+    : QPlatformAudioDecoder(parent),
      m_state(QAudioDecoder::StoppedState),
      m_pendingState(QAudioDecoder::StoppedState),
      m_busHelper(nullptr),
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
index fd6821f8e..106a872b0 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodecodercontrol_p.h
@@ -54,7 +54,7 @@
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <QObject>
 #include <QtCore/qmutex.h>
-#include "qaudiodecodercontrol.h"
+#include "private/qplatformaudiodecoder_p.h"
 #include <private/qgstreamerbushelper_p.h>
 #include "qaudiodecoder.h"
 
@@ -71,7 +71,7 @@ class QGstreamerBusHelper;
 class QGstreamerMessage;
 
 class QGstreamerAudioDecoderControl
-        : public QAudioDecoderControl,
+        : public QPlatformAudioDecoder,
           public QGstreamerBusMessageFilter
 {
     Q_OBJECT
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
index 31ae1f6dd..11dc0f092 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 #define ENUM_NAME(c,e,v) (c::staticMetaObject.enumerator(c::staticMetaObject.indexOfEnumerator(e)).valueToKey((v)))
 
 CameraBinControl::CameraBinControl(CameraBinSession *session)
-    :QCameraControl(session),
+    :QPlatformCamera(session),
     m_session(session),
     m_state(QCamera::UnloadedState),
     m_reloadPending(false),
@@ -187,11 +187,11 @@ bool CameraBinControl::canChangeProperty(PropertyChangeType changeType, QCamera:
     Q_UNUSED(status);
 
     switch (changeType) {
-    case QCameraControl::Viewfinder:
+    case QPlatformCamera::Viewfinder:
         return true;
-    case QCameraControl::CaptureMode:
-    case QCameraControl::ImageEncodingSettings:
-    case QCameraControl::VideoEncodingSettings:
+    case QPlatformCamera::CaptureMode:
+    case QPlatformCamera::ImageEncodingSettings:
+    case QPlatformCamera::VideoEncodingSettings:
     default:
         return status != QCamera::ActiveStatus;
     }
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
index cbee17cf3..a169a83e6 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabincontrol_p.h
@@ -54,12 +54,12 @@
 
 #include <QHash>
 #include <qbasictimer.h>
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 #include "camerabinsession.h"
 
 QT_BEGIN_NAMESPACE
 
-class CameraBinControl : public QCameraControl
+class CameraBinControl : public QPlatformCamera
 {
     Q_OBJECT
     Q_PROPERTY(bool viewfinderColorSpaceConversion READ viewfinderColorSpaceConversion WRITE setViewfinderColorSpaceConversion)
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinexposure.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure.cpp
index 740532d22..5168190ba 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinexposure.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 CameraBinExposure::CameraBinExposure(CameraBinSession *session)
-    :QCameraExposureControl(session),
+    :QPlatformCameraExposure(session),
      m_session(session)
 {
 }
@@ -58,10 +58,10 @@ CameraBinExposure::~CameraBinExposure()
 bool CameraBinExposure::isParameterSupported(ExposureParameter parameter) const
 {
     switch (parameter) {
-    case QCameraExposureControl::ExposureCompensation:
-    case QCameraExposureControl::ISO:
-    case QCameraExposureControl::Aperture:
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ExposureCompensation:
+    case QPlatformCameraExposure::ISO:
+    case QPlatformCameraExposure::Aperture:
+    case QPlatformCameraExposure::ShutterSpeed:
         return true;
     default:
         return false;
@@ -76,15 +76,15 @@ QVariantList CameraBinExposure::supportedParameterRange(ExposureParameter parame
 
     QVariantList res;
     switch (parameter) {
-    case QCameraExposureControl::ExposureCompensation:
+    case QPlatformCameraExposure::ExposureCompensation:
         if (continuous)
             *continuous = true;
         res << -2.0 << 2.0;
         break;
-    case QCameraExposureControl::ISO:
+    case QPlatformCameraExposure::ISO:
         res << 100 << 200 << 400;
         break;
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         res << 2.8;
         break;
     default:
@@ -102,28 +102,28 @@ QVariant CameraBinExposure::requestedValue(ExposureParameter parameter) const
 QVariant CameraBinExposure::actualValue(ExposureParameter parameter) const
 {
     switch (parameter) {
-    case QCameraExposureControl::ExposureCompensation:
+    case QPlatformCameraExposure::ExposureCompensation:
     {
         gfloat ev;
         gst_photography_get_ev_compensation(m_session->photography(), &ev);
         return QVariant(ev);
     }
-    case QCameraExposureControl::ISO:
+    case QPlatformCameraExposure::ISO:
     {
         guint isoSpeed = 0;
         gst_photography_get_iso_speed(m_session->photography(), &isoSpeed);
         return QVariant(isoSpeed);
     }
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         return QVariant(2.8);
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ShutterSpeed:
     {
         guint32 shutterSpeed = 0;
         gst_photography_get_exposure(m_session->photography(), &shutterSpeed);
 
         return QVariant(shutterSpeed/1000000.0);
     }
-    case QCameraExposureControl::ExposureMode:
+    case QPlatformCameraExposure::ExposureMode:
     {
         GstPhotographySceneMode sceneMode;
         gst_photography_get_scene_mode(m_session->photography(), &sceneMode);
@@ -178,19 +178,19 @@ bool CameraBinExposure::setValue(ExposureParameter parameter, const QVariant& va
     QVariant oldValue = actualValue(parameter);
 
     switch (parameter) {
-    case QCameraExposureControl::ExposureCompensation:
+    case QPlatformCameraExposure::ExposureCompensation:
         gst_photography_set_ev_compensation(m_session->photography(), value.toReal());
         break;
-    case QCameraExposureControl::ISO:
+    case QPlatformCameraExposure::ISO:
         gst_photography_set_iso_speed(m_session->photography(), value.toInt());
         break;
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         gst_photography_set_aperture(m_session->photography(), guint(value.toReal()*1000000));
         break;
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ShutterSpeed:
         gst_photography_set_exposure(m_session->photography(), guint(value.toReal()*1000000));
         break;
-    case QCameraExposureControl::ExposureMode:
+    case QPlatformCameraExposure::ExposureMode:
     {
         QCameraExposure::ExposureMode mode = value.value<QCameraExposure::ExposureMode>();
         GstPhotographySceneMode sceneMode;
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinexposure_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure_p.h
index 113187bc8..afe31dc28 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinexposure_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinexposure_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qcamera.h>
-#include <qcameraexposurecontrol.h>
+#include <private/qplatformcameraexposure_p.h>
 
 #include <gst/gst.h>
 #include <glib.h>
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class CameraBinSession;
 
-class CameraBinExposure : public QCameraExposureControl
+class CameraBinExposure : public QPlatformCameraExposure
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinfocus.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus.cpp
index 235bde6b5..9350fc3bb 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinfocus.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus.cpp
@@ -56,7 +56,7 @@
 QT_BEGIN_NAMESPACE
 
 CameraBinFocus::CameraBinFocus(CameraBinSession *session)
-    :QCameraFocusControl(session),
+    :QPlatformCameraFocus(session),
      QGstreamerBufferProbe(ProbeBuffers),
      m_session(session),
      m_cameraStatus(QCamera::UnloadedStatus),
@@ -408,7 +408,7 @@ void CameraBinFocus::timerEvent(QTimerEvent *event)
             emit focusZonesChanged();
         }
     } else {
-        QCameraFocusControl::timerEvent(event);
+        QPlatformCameraFocus::timerEvent(event);
     }
 }
 
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinfocus_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus_p.h
index 4f18adbca..2736c39b1 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinfocus_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinfocus_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qcamera.h>
-#include <qcamerafocuscontrol.h>
+#include <private/qplatformcamerafocus_p.h>
 
 #include <private/qgstreamerbufferprobe_p.h>
 
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
 class CameraBinSession;
 
 class CameraBinFocus
-    : public QCameraFocusControl
+    : public QPlatformCameraFocus
     , QGstreamerBufferProbe
 {
     Q_OBJECT
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing.cpp
index 7a647c8b1..c2253b4fa 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing.cpp
@@ -50,7 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 CameraBinImageProcessing::CameraBinImageProcessing(CameraBinSession *session)
-    : QCameraImageProcessingControl(session)
+    : QPlatformCameraImageProcessing(session)
     , m_session(session)
     , m_whiteBalanceMode(QCameraImageProcessing::WhiteBalanceAuto)
 #if QT_CONFIG(linux_v4l)
@@ -120,11 +120,11 @@ void CameraBinImageProcessing::updateColorBalanceValues()
         }
 
         if (!g_ascii_strcasecmp (channel->label, "brightness")) {
-            m_values[QCameraImageProcessingControl::BrightnessAdjustment] = scaledValue;
+            m_values[QPlatformCameraImageProcessing::BrightnessAdjustment] = scaledValue;
         } else if (!g_ascii_strcasecmp (channel->label, "contrast")) {
-            m_values[QCameraImageProcessingControl::ContrastAdjustment] = scaledValue;
+            m_values[QPlatformCameraImageProcessing::ContrastAdjustment] = scaledValue;
         } else if (!g_ascii_strcasecmp (channel->label, "saturation")) {
-            m_values[QCameraImageProcessingControl::SaturationAdjustment] = scaledValue;
+            m_values[QPlatformCameraImageProcessing::SaturationAdjustment] = scaledValue;
         }
     }
 }
@@ -193,19 +193,19 @@ bool CameraBinImageProcessing::isWhiteBalanceModeSupported(QCameraImageProcessin
 #endif
 }
 
-bool CameraBinImageProcessing::isParameterSupported(QCameraImageProcessingControl::ProcessingParameter parameter) const
+bool CameraBinImageProcessing::isParameterSupported(QPlatformCameraImageProcessing::ProcessingParameter parameter) const
 {
 #if QT_CONFIG(gstreamer_photography)
-    if (parameter == QCameraImageProcessingControl::WhiteBalancePreset
-            || parameter == QCameraImageProcessingControl::ColorFilter) {
+    if (parameter == QPlatformCameraImageProcessing::WhiteBalancePreset
+            || parameter == QPlatformCameraImageProcessing::ColorFilter) {
         if (m_session->photography())
             return true;
     }
 #endif
 
-    if (parameter == QCameraImageProcessingControl::Contrast
-            || parameter == QCameraImageProcessingControl::Brightness
-            || parameter == QCameraImageProcessingControl::Saturation) {
+    if (parameter == QPlatformCameraImageProcessing::Contrast
+            || parameter == QPlatformCameraImageProcessing::Brightness
+            || parameter == QPlatformCameraImageProcessing::Saturation) {
         if (GST_IS_COLOR_BALANCE(m_session->cameraBin()))
             return true;
     }
@@ -218,7 +218,7 @@ bool CameraBinImageProcessing::isParameterSupported(QCameraImageProcessingContro
     return false;
 }
 
-bool CameraBinImageProcessing::isParameterValueSupported(QCameraImageProcessingControl::ProcessingParameter parameter, const QVariant &value) const
+bool CameraBinImageProcessing::isParameterValueSupported(QPlatformCameraImageProcessing::ProcessingParameter parameter, const QVariant &value) const
 {
     switch (parameter) {
     case ContrastAdjustment:
@@ -265,10 +265,10 @@ bool CameraBinImageProcessing::isParameterValueSupported(QCameraImageProcessingC
 }
 
 QVariant CameraBinImageProcessing::parameter(
-        QCameraImageProcessingControl::ProcessingParameter parameter) const
+        QPlatformCameraImageProcessing::ProcessingParameter parameter) const
 {
     switch (parameter) {
-    case QCameraImageProcessingControl::WhiteBalancePreset: {
+    case QPlatformCameraImageProcessing::WhiteBalancePreset: {
         const QCameraImageProcessing::WhiteBalanceMode mode = whiteBalanceMode();
 #if QT_CONFIG(linux_v4l)
         if (mode == QCameraImageProcessing::WhiteBalanceAuto
@@ -278,14 +278,14 @@ QVariant CameraBinImageProcessing::parameter(
 #endif
         return QVariant::fromValue<QCameraImageProcessing::WhiteBalanceMode>(mode);
     }
-    case QCameraImageProcessingControl::ColorTemperature: {
+    case QPlatformCameraImageProcessing::ColorTemperature: {
 #if QT_CONFIG(linux_v4l)
         return m_v4lImageControl->parameter(parameter);
 #else
         return QVariant();
 #endif
     }
-    case QCameraImageProcessingControl::ColorFilter:
+    case QPlatformCameraImageProcessing::ColorFilter:
 #if QT_CONFIG(gstreamer_photography)
         if (GstPhotography *photography = m_session->photography()) {
             GstPhotographyColorToneMode mode = GST_PHOTOGRAPHY_COLOR_TONE_MODE_NORMAL;
@@ -298,9 +298,9 @@ QVariant CameraBinImageProcessing::parameter(
         const bool isGstParameterSupported = m_values.contains(parameter);
 #if QT_CONFIG(linux_v4l)
         if (!isGstParameterSupported) {
-            if (parameter == QCameraImageProcessingControl::BrightnessAdjustment
-                    || parameter == QCameraImageProcessingControl::ContrastAdjustment
-                    || parameter == QCameraImageProcessingControl::SaturationAdjustment) {
+            if (parameter == QPlatformCameraImageProcessing::BrightnessAdjustment
+                    || parameter == QPlatformCameraImageProcessing::ContrastAdjustment
+                    || parameter == QPlatformCameraImageProcessing::SaturationAdjustment) {
                 return m_v4lImageControl->parameter(parameter);
             }
         }
@@ -312,7 +312,7 @@ QVariant CameraBinImageProcessing::parameter(
     }
 }
 
-void CameraBinImageProcessing::setParameter(QCameraImageProcessingControl::ProcessingParameter parameter,
+void CameraBinImageProcessing::setParameter(QPlatformCameraImageProcessing::ProcessingParameter parameter,
         const QVariant &value)
 {
     switch (parameter) {
@@ -354,13 +354,13 @@ void CameraBinImageProcessing::setParameter(QCameraImageProcessingControl::Proce
         }
     }
         break;
-    case QCameraImageProcessingControl::ColorTemperature: {
+    case QPlatformCameraImageProcessing::ColorTemperature: {
 #if QT_CONFIG(linux_v4l)
         m_v4lImageControl->setParameter(parameter, value);
 #endif
         break;
     }
-    case QCameraImageProcessingControl::ColorFilter:
+    case QPlatformCameraImageProcessing::ColorFilter:
 #if QT_CONFIG(gstreamer_photography)
         if (GstPhotography *photography = m_session->photography()) {
             gst_photography_set_color_tone_mode(photography, m_filterMap.value(
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing_p.h
index 2c5c41415..dee78dea6 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinimageprocessing_p.h
@@ -53,7 +53,7 @@
 
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <qcamera.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 
 #include <gst/gst.h>
 #include <glib.h>
@@ -70,7 +70,7 @@ class CameraBinV4LImageProcessing;
 
 class CameraBinSession;
 
-class CameraBinImageProcessing : public QCameraImageProcessingControl
+class CameraBinImageProcessing : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 
@@ -98,7 +98,7 @@ private:
 
 private:
     CameraBinSession *m_session;
-    QMap<QCameraImageProcessingControl::ProcessingParameter, int> m_values;
+    QMap<QPlatformCameraImageProcessing::ProcessingParameter, int> m_values;
 #if QT_CONFIG(gstreamer_photography)
     QMap<GstPhotographyWhiteBalanceMode, QCameraImageProcessing::WhiteBalanceMode> m_mappedWbValues;
     QMap<QCameraImageProcessing::ColorFilter, GstPhotographyColorToneMode> m_filterMap;
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
index fe848df2d..f168bb4f3 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder.cpp
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 CameraBinRecorder::CameraBinRecorder(CameraBinSession *session)
-    :QMediaRecorderControl(session),
+    :QPlatformMediaRecorder(session),
      m_session(session),
      m_state(QMediaRecorder::StoppedState),
      m_status(QMediaRecorder::UnloadedStatus)
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
index 0bd6ae56b..00fb90a45 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinrecorder_p.h
@@ -53,14 +53,14 @@
 //
 
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include "camerabinsession.h"
 
 #include <gst/pbutils/encoding-profile.h>
 
 QT_BEGIN_NAMESPACE
 
-class CameraBinRecorder : public QMediaRecorderControl
+class CameraBinRecorder : public QPlatformMediaRecorder
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinsession_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinsession_p.h
index e34d3bead..962a08750 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinsession_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinsession_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 
 #include <QtCore/qurl.h>
 #include <QtCore/qdir.h>
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp
index 68c37c5f0..2ccef0242 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing.cpp
@@ -48,7 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 CameraBinV4LImageProcessing::CameraBinV4LImageProcessing(CameraBinSession *session)
-    : QCameraImageProcessingControl(session)
+    : QPlatformCameraImageProcessing(session)
     , m_session(session)
 {
 }
@@ -73,7 +73,7 @@ bool CameraBinV4LImageProcessing::isParameterValueSupported(
 
     switch (parameter) {
 
-    case QCameraImageProcessingControl::WhiteBalancePreset: {
+    case QPlatformCameraImageProcessing::WhiteBalancePreset: {
         const QCameraImageProcessing::WhiteBalanceMode checkedValue =
                 value.value<QCameraImageProcessing::WhiteBalanceMode>();
         const QCameraImageProcessing::WhiteBalanceMode firstAllowedValue =
@@ -89,7 +89,7 @@ bool CameraBinV4LImageProcessing::isParameterValueSupported(
     }
         break;
 
-    case QCameraImageProcessingControl::ColorTemperature: {
+    case QPlatformCameraImageProcessing::ColorTemperature: {
         const qint32 checkedValue = value.toInt();
         if (checkedValue < (*sourceValueInfo).minimumValue
                 || checkedValue > (*sourceValueInfo).maximumValue) {
@@ -98,9 +98,9 @@ bool CameraBinV4LImageProcessing::isParameterValueSupported(
     }
         break;
 
-    case QCameraImageProcessingControl::ContrastAdjustment: // falling back
-    case QCameraImageProcessingControl::SaturationAdjustment: // falling back
-    case QCameraImageProcessingControl::BrightnessAdjustment: // falling back
+    case QPlatformCameraImageProcessing::ContrastAdjustment: // falling back
+    case QPlatformCameraImageProcessing::SaturationAdjustment: // falling back
+    case QPlatformCameraImageProcessing::BrightnessAdjustment: // falling back
 
     default:
         return false;
@@ -143,17 +143,17 @@ QVariant CameraBinV4LImageProcessing::parameter(
 
     switch (parameter) {
 
-    case QCameraImageProcessingControl::WhiteBalancePreset:
+    case QPlatformCameraImageProcessing::WhiteBalancePreset:
         return QVariant::fromValue<QCameraImageProcessing::WhiteBalanceMode>(
                     control.value ? QCameraImageProcessing::WhiteBalanceAuto
                                   : QCameraImageProcessing::WhiteBalanceManual);
 
-    case QCameraImageProcessingControl::ColorTemperature:
+    case QPlatformCameraImageProcessing::ColorTemperature:
         return QVariant::fromValue<qint32>(control.value);
 
-    case QCameraImageProcessingControl::ContrastAdjustment: // falling back
-    case QCameraImageProcessingControl::SaturationAdjustment: // falling back
-    case QCameraImageProcessingControl::BrightnessAdjustment: // falling back
+    case QPlatformCameraImageProcessing::ContrastAdjustment: // falling back
+    case QPlatformCameraImageProcessing::SaturationAdjustment: // falling back
+    case QPlatformCameraImageProcessing::BrightnessAdjustment: // falling back
 
     default:
         return QVariant();
@@ -185,7 +185,7 @@ void CameraBinV4LImageProcessing::setParameter(
 
     switch (parameter) {
 
-    case QCameraImageProcessingControl::WhiteBalancePreset: {
+    case QPlatformCameraImageProcessing::WhiteBalancePreset: {
         const QCameraImageProcessing::WhiteBalanceMode m =
                 value.value<QCameraImageProcessing::WhiteBalanceMode>();
         if (m != QCameraImageProcessing::WhiteBalanceAuto
@@ -198,13 +198,13 @@ void CameraBinV4LImageProcessing::setParameter(
     }
         break;
 
-    case QCameraImageProcessingControl::ColorTemperature:
+    case QPlatformCameraImageProcessing::ColorTemperature:
         control.value = value.toInt();
         break;
 
-    case QCameraImageProcessingControl::ContrastAdjustment: // falling back
-    case QCameraImageProcessingControl::SaturationAdjustment: // falling back
-    case QCameraImageProcessingControl::BrightnessAdjustment: // falling back
+    case QPlatformCameraImageProcessing::ContrastAdjustment: // falling back
+    case QPlatformCameraImageProcessing::SaturationAdjustment: // falling back
+    case QPlatformCameraImageProcessing::BrightnessAdjustment: // falling back
 
     default:
         qt_safe_close(fd);
@@ -233,13 +233,13 @@ void CameraBinV4LImageProcessing::updateParametersInfo(
 
         constexpr struct SupportedParameterEntry {
             quint32 cid;
-            QCameraImageProcessingControl::ProcessingParameter parameter;
+            QPlatformCameraImageProcessing::ProcessingParameter parameter;
         } supportedParametersEntries[] = {
-            { V4L2_CID_AUTO_WHITE_BALANCE, QCameraImageProcessingControl::WhiteBalancePreset },
-            { V4L2_CID_WHITE_BALANCE_TEMPERATURE, QCameraImageProcessingControl::ColorTemperature },
-            { V4L2_CID_CONTRAST, QCameraImageProcessingControl::ContrastAdjustment },
-            { V4L2_CID_SATURATION, QCameraImageProcessingControl::SaturationAdjustment },
-            { V4L2_CID_BRIGHTNESS, QCameraImageProcessingControl::BrightnessAdjustment },
+            { V4L2_CID_AUTO_WHITE_BALANCE, QPlatformCameraImageProcessing::WhiteBalancePreset },
+            { V4L2_CID_WHITE_BALANCE_TEMPERATURE, QPlatformCameraImageProcessing::ColorTemperature },
+            { V4L2_CID_CONTRAST, QPlatformCameraImageProcessing::ContrastAdjustment },
+            { V4L2_CID_SATURATION, QPlatformCameraImageProcessing::SaturationAdjustment },
+            { V4L2_CID_BRIGHTNESS, QPlatformCameraImageProcessing::BrightnessAdjustment },
         };
 
         for (auto supportedParametersEntrie : supportedParametersEntries) {
diff --git a/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
index d1ca6f0c0..6f95c8aa2 100644
--- a/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
+++ b/src/multimedia/platform/gstreamer/camerabin/camerabinv4limageprocessing_p.h
@@ -52,13 +52,13 @@
 //
 
 #include <qcamera.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class CameraBinSession;
 
-class CameraBinV4LImageProcessing : public QCameraImageProcessingControl
+class CameraBinV4LImageProcessing : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h
index 5999e401f..505780ba3 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <QtCore/qstack.h>
-#include <qplatformmediaplayer_p.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <private/qtmultimediaglobal_p.h>
 #include <qurl.h>
 #include <private/qgst_p.h>
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
index 79afd2f83..23902ec55 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol.cpp
@@ -47,7 +47,7 @@
 
 
 QGstreamerCameraControl::QGstreamerCameraControl(QGstreamerCaptureSession *session)
-    : QCameraControl(session),
+    : QPlatformCamera(session),
     m_session(session),
     m_state(QCamera::UnloadedState),
     m_status(QCamera::UnloadedStatus),
@@ -158,9 +158,9 @@ bool QGstreamerCameraControl::canChangeProperty(PropertyChangeType changeType, Q
     Q_UNUSED(status);
 
     switch (changeType) {
-    case QCameraControl::ImageEncodingSettings:
-    case QCameraControl::VideoEncodingSettings:
-    case QCameraControl::Viewfinder:
+    case QPlatformCamera::ImageEncodingSettings:
+    case QPlatformCamera::VideoEncodingSettings:
+    case QPlatformCamera::Viewfinder:
         return true;
     default:
         return false;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
index 2fd67af85..f462823ff 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameracontrol_p.h
@@ -53,12 +53,12 @@
 //
 
 #include <QHash>
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 #include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QGstreamerCameraControl : public QCameraControl
+class QGstreamerCameraControl : public QPlatformCamera
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp
index 399eea0dc..c7479bfe8 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice.cpp
@@ -62,17 +62,17 @@ QGstreamerCaptureService::QGstreamerCaptureService(QMediaRecorder::CaptureMode m
 
 QGstreamerCaptureService::~QGstreamerCaptureService() = default;
 
-QCameraControl *QGstreamerCaptureService::cameraControl()
+QPlatformCamera *QGstreamerCaptureService::cameraControl()
 {
     return m_cameraControl;
 }
 
-QCameraImageCaptureControl *QGstreamerCaptureService::imageCaptureControl()
+QPlatformCameraImageCapture *QGstreamerCaptureService::imageCaptureControl()
 {
     return m_captureSession->imageCaptureControl();
 }
 
-QMediaRecorderControl *QGstreamerCaptureService::mediaRecorderControl()
+QPlatformMediaRecorder *QGstreamerCaptureService::mediaRecorderControl()
 {
     return m_captureSession->recorderControl();
 }
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
index 6f1cdff6b..5dbf09068 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercaptureservice_p.h
@@ -74,9 +74,9 @@ public:
     QGstreamerCaptureService(QMediaRecorder::CaptureMode mode);
     virtual ~QGstreamerCaptureService();
 
-    QCameraControl *cameraControl() override;
-    QCameraImageCaptureControl *imageCaptureControl() override;
-    QMediaRecorderControl *mediaRecorderControl() override;
+    QPlatformCamera *cameraControl() override;
+    QPlatformCameraImageCapture *imageCaptureControl() override;
+    QPlatformMediaRecorder *mediaRecorderControl() override;
 
 private:
     QGstreamerCaptureSession *m_captureSession = nullptr;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
index d398e10b0..703696ca2 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercapturesession_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include <qmediarecorder.h>
 #include <qaudiodeviceinfo.h>
 #include <qcamerainfo.h>
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
index cdf882b57..255591b00 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol.cpp
@@ -42,7 +42,7 @@
 #include <QtCore/QDir>
 
 QGstreamerImageCaptureControl::QGstreamerImageCaptureControl(QGstreamerCaptureSession *session)
-    :QCameraImageCaptureControl(session), m_session(session), m_ready(false), m_lastId(0)
+    :QPlatformCameraImageCapture(session), m_session(session), m_ready(false), m_lastId(0)
 {
     connect(m_session, SIGNAL(stateChanged(QGstreamerCaptureSession::State)), SLOT(updateState()));
     connect(m_session, SIGNAL(imageExposed(int)), this, SIGNAL(imageExposed(int)));
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
index 352965243..143db45fc 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapturecontrol_p.h
@@ -52,12 +52,12 @@
 // We mean it.
 //
 
-#include <qcameraimagecapturecontrol.h>
+#include <private/qplatformcameraimagecapture_p.h>
 #include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QGstreamerImageCaptureControl : public QCameraImageCaptureControl
+class QGstreamerImageCaptureControl : public QPlatformCameraImageCapture
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index fd231e126..84f7ae9bf 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -45,7 +45,7 @@
 #include <qmimetype.h>
 
 QGstreamerRecorderControl::QGstreamerRecorderControl(QGstreamerCaptureSession *session)
-    : QMediaRecorderControl(session),
+    : QPlatformMediaRecorder(session),
       m_session(session),
       m_state(QMediaRecorder::StoppedState),
       m_status(QMediaRecorder::UnloadedStatus)
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
index 0196ef835..f0646d56f 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerrecordercontrol_p.h
@@ -54,7 +54,7 @@
 
 #include <QtCore/QDir>
 
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include "qgstreamercapturesession_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 class QGstreamerCaptureMetaDataControl;
 class QMediaMetaData;
 
-class QGstreamerRecorderControl : public QMediaRecorderControl
+class QGstreamerRecorderControl : public QPlatformMediaRecorder
 {
     Q_OBJECT
 
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
index 4a9c54e75..8292b63c3 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
@@ -69,7 +69,7 @@ QPlatformMediaFormatInfo *QGstreamerIntegration::formatInfo()
     return m_formatsInfo;
 }
 
-QAudioDecoderControl *QGstreamerIntegration::createAudioDecoder()
+QPlatformAudioDecoder *QGstreamerIntegration::createAudioDecoder()
 {
     return new QGstreamerAudioDecoderControl(nullptr);
 }
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
index 788156d14..595f3ea24 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
@@ -69,7 +69,7 @@ public:
     QPlatformMediaDeviceManager *deviceManager() override;
     QPlatformMediaFormatInfo *formatInfo() override;
 
-    QAudioDecoderControl *createAudioDecoder() override;
+    QPlatformAudioDecoder *createAudioDecoder() override;
     QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode mode) override;
     QPlatformMediaPlayer *createPlayer() override;
 
diff --git a/src/multimedia/platform/platform.pri b/src/multimedia/platform/platform.pri
index afce76b54..1e99109f5 100644
--- a/src/multimedia/platform/platform.pri
+++ b/src/multimedia/platform/platform.pri
@@ -1,14 +1,28 @@
 HEADERS += \
-    $$PWD/qplatformmediacaptureinterface_p.h \
+    $$PWD/qplatformmediacapture_p.h \
     $$PWD/qplatformmediaintegration_p.h \
     $$PWD/qplatformmediadevicemanager_p.h \
-    $$PWD/qplatformmediaformatinfo_p.h
+    $$PWD/qplatformmediaformatinfo_p.h \
+    $$PWD/qplatformaudiodecoder_p.h \
+    $$PWD/platformcamera.h \
+    $$PWD/qplatformcameraexposure_p.h \
+    $$PWD/platform/qplatformcamerafocus_p.h \
+    $$PWD/qplatformcameraimagecapture_p.h \
+    $$PWD/qplatformcameraimageprocessing_p.h \
+    $$PWD/qplatformmediarecorder_p.h \
 
 SOURCES += \
-    $$PWD/qplatformmediacaptureinterface.cpp \
+    $$PWD/qplatformmediacapture.cpp \
     $$PWD/qplatformmediaintegration.cpp \
     $$PWD/qplatformmediadevicemanager.cpp \
-    $$PWD/qplatformmediaformatinfo.cpp
+    $$PWD/qplatformmediaformatinfo.cpp \
+    $$PWD/qplatformaudiodecoder.cpp \
+    $$PWD/platformcamera.cpp \
+    $$PWD/qplatformcameraexposure.cpp \
+    $$PWD/platform/qplatformcamerafocus.cpp \
+    $$PWD/qplatformcameraimagecapture.cpp \
+    $$PWD/qplatformcameraimageprocessing.cpp \
+    $$PWD/qplatformmediarecorder.cpp \
 
 qtConfig(gstreamer):include(gstreamer/gstreamer.pri)
 qtConfig(pulseaudio): include(pulseaudio/pulseaudio.pri)
diff --git a/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
index bafa14c0c..1bb3dc486 100644
--- a/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
@@ -44,7 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 BbCameraControl::BbCameraControl(BbCameraSession *session, QObject *parent)
-    : QCameraControl(parent)
+    : QPlatformCamera(parent)
     , m_session(session)
 {
     connect(m_session, SIGNAL(statusChanged(QCamera::Status)), this, SIGNAL(statusChanged(QCamera::Status)));
diff --git a/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
index 65996190e..8dc63670b 100644
--- a/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraControl : public QCameraControl
+class BbCameraControl : public QPlatformCamera
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol.cpp
index 6dbde9556..e1ba7c6e3 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol.cpp
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 BbCameraExposureControl::BbCameraExposureControl(BbCameraSession *session, QObject *parent)
-    : QCameraExposureControl(parent)
+    : QPlatformCameraExposure(parent)
     , m_session(session)
     , m_requestedExposureMode(QCameraExposure::ExposureAuto)
 {
@@ -55,23 +55,23 @@ BbCameraExposureControl::BbCameraExposureControl(BbCameraSession *session, QObje
 bool BbCameraExposureControl::isParameterSupported(ExposureParameter parameter) const
 {
     switch (parameter) {
-    case QCameraExposureControl::ISO:
+    case QPlatformCameraExposure::ISO:
         return false;
-    case QCameraExposureControl::Aperture:
+    case QPlatformCameraExposure::Aperture:
         return false;
-    case QCameraExposureControl::ShutterSpeed:
+    case QPlatformCameraExposure::ShutterSpeed:
         return false;
-    case QCameraExposureControl::ExposureCompensation:
+    case QPlatformCameraExposure::ExposureCompensation:
         return false;
-    case QCameraExposureControl::FlashPower:
+    case QPlatformCameraExposure::FlashPower:
         return false;
-    case QCameraExposureControl::FlashCompensation:
+    case QPlatformCameraExposure::FlashCompensation:
         return false;
-    case QCameraExposureControl::TorchPower:
+    case QPlatformCameraExposure::TorchPower:
         return false;
-    case QCameraExposureControl::ExposureMode:
+    case QPlatformCameraExposure::ExposureMode:
         return true;
-    case QCameraExposureControl::MeteringMode:
+    case QPlatformCameraExposure::MeteringMode:
         return false;
     default:
         return false;
@@ -80,7 +80,7 @@ bool BbCameraExposureControl::isParameterSupported(ExposureParameter parameter)
 
 QVariantList BbCameraExposureControl::supportedParameterRange(ExposureParameter parameter, bool *continuous) const
 {
-    if (parameter != QCameraExposureControl::ExposureMode) // no other parameter supported by BB10 API at the moment
+    if (parameter != QPlatformCameraExposure::ExposureMode) // no other parameter supported by BB10 API at the moment
         return QVariantList();
 
     if (m_session->status() != QCamera::ActiveStatus) // we can query supported exposure modes only with active viewfinder
@@ -127,7 +127,7 @@ QVariantList BbCameraExposureControl::supportedParameterRange(ExposureParameter
 
 QVariant BbCameraExposureControl::requestedValue(ExposureParameter parameter) const
 {
-    if (parameter != QCameraExposureControl::ExposureMode) // no other parameter supported by BB10 API at the moment
+    if (parameter != QPlatformCameraExposure::ExposureMode) // no other parameter supported by BB10 API at the moment
         return QVariant();
 
     return QVariant::fromValue(m_requestedExposureMode);
@@ -135,7 +135,7 @@ QVariant BbCameraExposureControl::requestedValue(ExposureParameter parameter) co
 
 QVariant BbCameraExposureControl::actualValue(ExposureParameter parameter) const
 {
-    if (parameter != QCameraExposureControl::ExposureMode) // no other parameter supported by BB10 API at the moment
+    if (parameter != QPlatformCameraExposure::ExposureMode) // no other parameter supported by BB10 API at the moment
         return QVariantList();
 
     if (m_session->status() != QCamera::ActiveStatus) // we can query actual scene modes only with active viewfinder
@@ -172,7 +172,7 @@ QVariant BbCameraExposureControl::actualValue(ExposureParameter parameter) const
 
 bool BbCameraExposureControl::setValue(ExposureParameter parameter, const QVariant& value)
 {
-    if (parameter != QCameraExposureControl::ExposureMode) // no other parameter supported by BB10 API at the moment
+    if (parameter != QPlatformCameraExposure::ExposureMode) // no other parameter supported by BB10 API at the moment
         return false;
 
     if (m_session->status() != QCamera::ActiveStatus) // we can set actual scene modes only with active viewfinder
@@ -182,7 +182,7 @@ bool BbCameraExposureControl::setValue(ExposureParameter parameter, const QVaria
 
     if (value.isValid()) {
         m_requestedExposureMode = value.value<QCameraExposure::ExposureMode>();
-        emit requestedValueChanged(QCameraExposureControl::ExposureMode);
+        emit requestedValueChanged(QPlatformCameraExposure::ExposureMode);
 
         switch (m_requestedExposureMode) {
         case QCameraExposure::ExposureAuto:
@@ -216,7 +216,7 @@ bool BbCameraExposureControl::setValue(ExposureParameter parameter, const QVaria
         return false;
     }
 
-    emit actualValueChanged(QCameraExposureControl::ExposureMode);
+    emit actualValueChanged(QPlatformCameraExposure::ExposureMode);
 
     return true;
 }
@@ -224,7 +224,7 @@ bool BbCameraExposureControl::setValue(ExposureParameter parameter, const QVaria
 void BbCameraExposureControl::statusChanged(QCamera::Status status)
 {
     if (status == QCamera::ActiveStatus || status == QCamera::LoadedStatus)
-        emit parameterRangeChanged(QCameraExposureControl::ExposureMode);
+        emit parameterRangeChanged(QPlatformCameraExposure::ExposureMode);
 }
 
 QCameraExposure::FlashModes BbCameraExposureControl::flashMode() const
diff --git a/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h
index 56ea61b7f..62a2d2c61 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraexposurecontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <qcameraexposurecontrol.h>
+#include <private/qplatformcameraexposure_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraExposureControl : public QCameraExposureControl
+class BbCameraExposureControl : public QPlatformCameraExposure
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol.cpp b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol.cpp
index 25f61190c..740fc71b8 100644
--- a/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol.cpp
@@ -45,7 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 BbCameraFocusControl::BbCameraFocusControl(BbCameraSession *session, QObject *parent)
-    : QCameraFocusControl(parent)
+    : QPlatformCameraFocus(parent)
     , m_session(session)
     , m_focusMode(QCameraFocus::FocusModes())
     , m_focusPointMode(QCameraFocus::FocusPointAuto)
diff --git a/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol_p.h b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol_p.h
index e91e032c5..a31ff36d5 100644
--- a/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcamerafocuscontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <qcamerafocuscontrol.h>
+#include <private/qplatformcamerafocus_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraFocusControl : public QCameraFocusControl
+class BbCameraFocusControl : public QPlatformCameraFocus
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp
index 151d7ac67..35e442664 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp
@@ -43,7 +43,7 @@
 QT_BEGIN_NAMESPACE
 
 BbCameraImageCaptureControl::BbCameraImageCaptureControl(BbCameraSession *session, QObject *parent)
-    : QCameraImageCaptureControl(parent)
+    : QPlatformCameraImageCapture(parent)
     , m_session(session)
 {
     connect(m_session, SIGNAL(readyForCaptureChanged(bool)), this, SIGNAL(readyForCaptureChanged(bool)));
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h
index 7cc5a38b9..c13fdbe04 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <qcameraimagecapturecontrol.h>
+#include <private/qplatformcameraimagecapture_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraImageCaptureControl : public QCameraImageCaptureControl
+class BbCameraImageCaptureControl : public QPlatformCameraImageCapture
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol.cpp
index a5787bd18..de3a33727 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol.cpp
@@ -45,19 +45,19 @@
 QT_BEGIN_NAMESPACE
 
 BbCameraImageProcessingControl::BbCameraImageProcessingControl(BbCameraSession *session, QObject *parent)
-    : QCameraImageProcessingControl(parent)
+    : QPlatformCameraImageProcessing(parent)
     , m_session(session)
 {
 }
 
 bool BbCameraImageProcessingControl::isParameterSupported(ProcessingParameter parameter) const
 {
-    return (parameter == QCameraImageProcessingControl::WhiteBalancePreset);
+    return (parameter == QPlatformCameraImageProcessing::WhiteBalancePreset);
 }
 
 bool BbCameraImageProcessingControl::isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const
 {
-    if (parameter != QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter != QPlatformCameraImageProcessing::WhiteBalancePreset)
         return false;
 
     if (m_session->handle() == CAMERA_HANDLE_INVALID)
@@ -91,7 +91,7 @@ bool BbCameraImageProcessingControl::isParameterValueSupported(ProcessingParamet
 
 QVariant BbCameraImageProcessingControl::parameter(ProcessingParameter parameter) const
 {
-    if (parameter != QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter != QPlatformCameraImageProcessing::WhiteBalancePreset)
         return QVariant();
 
     if (m_session->handle() == CAMERA_HANDLE_INVALID)
@@ -117,7 +117,7 @@ QVariant BbCameraImageProcessingControl::parameter(ProcessingParameter parameter
 
 void BbCameraImageProcessingControl::setParameter(ProcessingParameter parameter, const QVariant &value)
 {
-    if (parameter != QCameraImageProcessingControl::WhiteBalancePreset)
+    if (parameter != QPlatformCameraImageProcessing::WhiteBalancePreset)
         return;
 
     if (m_session->handle() == CAMERA_HANDLE_INVALID)
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
index 6a174ebad..e14b89c7c 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraimageprocessingcontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraImageProcessingControl : public QCameraImageProcessingControl
+class BbCameraImageProcessingControl : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
index e127f5d70..a5453a384 100644
--- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol.cpp
@@ -62,7 +62,7 @@ static audio_manager_device_t currentAudioInputDevice()
 }
 
 BbCameraMediaRecorderControl::BbCameraMediaRecorderControl(BbCameraSession *session, QObject *parent)
-    : QMediaRecorderControl(parent)
+    : QPlatformMediaRecorder(parent)
     , m_session(session)
 {
     connect(m_session, SIGNAL(videoStateChanged(QMediaRecorder::State)), this, SIGNAL(stateChanged(QMediaRecorder::State)));
diff --git a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
index f1c6a0873..ca3039f95 100644
--- a/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameramediarecordercontrol_p.h
@@ -50,13 +50,13 @@
 // We mean it.
 //
 
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraMediaRecorderControl : public QMediaRecorderControl
+class BbCameraMediaRecorderControl : public QPlatformMediaRecorder
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
index 185964400..9bace83bf 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
@@ -73,17 +73,17 @@ BbCameraService::~BbCameraService()
 {
 }
 
-QCameraControl *BbCameraService::cameraControl()
+QPlatformCamera *BbCameraService::cameraControl()
 {
     return m_cameraControl;
 }
 
-QCameraImageCaptureControl *BbCameraService::imageCaptureControl()
+QPlatformCameraImageCapture *BbCameraService::imageCaptureControl()
 {
     return m_cameraImageCaptureControl;
 }
 
-QMediaRecorderControl *BbCameraService::mediaRecorderControl()
+QPlatformMediaRecorder *BbCameraService::mediaRecorderControl()
 {
     return m_cameraMediaRecorderControl;
 }
diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
index 786f3d8f7..2c7032627 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
@@ -75,9 +75,9 @@ public:
     explicit BbCameraService(QObject *parent = 0);
     ~BbCameraService();
 
-    QCameraControl *cameraControl() override;
-    QCameraImageCaptureControl *imageCaptureControl() override;
-    QMediaRecorderControl *mediaRecorderControl() override;
+    QPlatformCamera *cameraControl() override;
+    QPlatformCameraImageCapture *imageCaptureControl() override;
+    QPlatformMediaRecorder *mediaRecorderControl() override;
 
 private:
     BbCameraSession* m_cameraSession;
diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol_p.h
index 8885ff3da..32d28c684 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 <qplatformmediaplayer_p.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <QtCore/qabstractnativeeventfilter.h>
 #include <QtCore/qpointer.h>
 #include <QtCore/qtimer.h>
diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/platform/qplatformaudiodecoder.cpp
index fa3aa1e01..e0b43f0e9 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.cpp
+++ b/src/multimedia/platform/qplatformaudiodecoder.cpp
@@ -37,20 +37,20 @@
 **
 ****************************************************************************/
 
-#include "qaudiodecodercontrol.h"
+#include "qplatformaudiodecoder_p.h"
 
 QT_BEGIN_NAMESPACE
 
 
 /*!
-    \class QAudioDecoderControl
+    \class QPlatformAudioDecoder
     \obsolete
     \inmodule QtMultimedia
 
 
     \ingroup multimedia_control
 
-    \brief The QAudioDecoderControl class provides access audio decoding
+    \brief The QPlatformAudioDecoder class provides access audio decoding
     functionality.
 
     \preliminary
@@ -59,19 +59,19 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a new audio decoder control with the given \a parent.
 */
-QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
+QPlatformAudioDecoder::QPlatformAudioDecoder(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \fn QAudioDecoderControl::state() const
+    \fn QPlatformAudioDecoder::state() const
 
     Returns the state of a player control.
 */
 
 /*!
-    \fn QAudioDecoderControl::stateChanged(QAudioDecoder::State newState)
+    \fn QPlatformAudioDecoder::stateChanged(QAudioDecoder::State newState)
 
     Signals that the state of a player control has changed to \a newState.
 
@@ -79,13 +79,13 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::sourceFilename() const
+    \fn QPlatformAudioDecoder::sourceFilename() const
 
     Returns the current media source filename, or a null QString if none (or a device)
 */
 
 /*!
-    \fn QAudioDecoderControl::setSourceFilename(const QString &fileName)
+    \fn QPlatformAudioDecoder::setSourceFilename(const QString &fileName)
 
     Sets the current source to \a fileName.  Changing the source will
     stop any current decoding and discard any buffers.
@@ -94,13 +94,13 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::sourceDevice() const
+    \fn QPlatformAudioDecoder::sourceDevice() const
 
     Returns the current media source QIODevice, or 0 if none (or a file).
 */
 
 /*!
-    \fn QAudioDecoderControl::setSourceDevice(QIODevice *device)
+    \fn QPlatformAudioDecoder::setSourceDevice(QIODevice *device)
 
     Sets the current source to \a device.  Changing the source will
     stop any current decoding and discard any buffers.
@@ -109,7 +109,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::start()
+    \fn QPlatformAudioDecoder::start()
 
     Starts decoding the current media.
 
@@ -120,7 +120,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::stop()
+    \fn QPlatformAudioDecoder::stop()
 
     Stops playback of the current media and discards any buffers.
 
@@ -129,32 +129,32 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::error(int error, const QString &errorString)
+    \fn QPlatformAudioDecoder::error(int error, const QString &errorString)
 
     Signals that an \a error has occurred.  The \a errorString provides a more detailed explanation.
 */
 
 /*!
-    \fn QAudioDecoderControl::bufferAvailableChanged(bool available)
+    \fn QPlatformAudioDecoder::bufferAvailableChanged(bool available)
 
     Signals that the bufferAvailable property has changed to \a available.
 */
 
 /*!
-    \fn QAudioDecoderControl::bufferReady()
+    \fn QPlatformAudioDecoder::bufferReady()
 
     Signals that a new buffer is ready for reading.
 */
 
 /*!
-    \fn QAudioDecoderControl::bufferAvailable() const
+    \fn QPlatformAudioDecoder::bufferAvailable() const
 
     Returns true if a buffer is available to be read,
     and false otherwise.
 */
 
 /*!
-    \fn QAudioDecoderControl::sourceChanged()
+    \fn QPlatformAudioDecoder::sourceChanged()
 
     Signals that the current source of the decoder has changed.
 
@@ -162,7 +162,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::formatChanged(const QAudioFormat &format)
+    \fn QPlatformAudioDecoder::formatChanged(const QAudioFormat &format)
 
     Signals that the current audio format of the decoder has changed to \a format.
 
@@ -170,7 +170,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn void QAudioDecoderControl::finished()
+    \fn void QPlatformAudioDecoder::finished()
 
     Signals that the decoding has finished successfully.
     If decoding fails, error signal is emitted instead.
@@ -179,7 +179,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn void QAudioDecoderControl::positionChanged(qint64 position)
+    \fn void QPlatformAudioDecoder::positionChanged(qint64 position)
 
     Signals that the current \a position of the decoder has changed.
 
@@ -187,7 +187,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn void QAudioDecoderControl::durationChanged(qint64 duration)
+    \fn void QPlatformAudioDecoder::durationChanged(qint64 duration)
 
     Signals that the estimated \a duration of the decoded data has changed.
 
@@ -195,7 +195,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::audioFormat() const
+    \fn QPlatformAudioDecoder::audioFormat() const
     Returns the current audio format of the decoded stream.
 
     Any buffers returned should have this format.
@@ -204,7 +204,7 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::setAudioFormat(const QAudioFormat &format)
+    \fn QPlatformAudioDecoder::setAudioFormat(const QAudioFormat &format)
     Set the desired audio format for decoded samples to \a format.
 
     If the decoder does not support this format, \l error() will
@@ -219,23 +219,23 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent)
 */
 
 /*!
-    \fn QAudioDecoderControl::read()
+    \fn QPlatformAudioDecoder::read()
     Attempts to read a buffer from the decoder, without blocking. Returns invalid buffer if there are
     no decoded buffers available, or on error.
 */
 
 /*!
-    \fn QAudioDecoderControl::position() const
+    \fn QPlatformAudioDecoder::position() const
     Returns position (in milliseconds) of the last buffer read from
     the decoder or -1 if no buffers have been read.
 */
 
 /*!
-    \fn QAudioDecoderControl::duration() const
+    \fn QPlatformAudioDecoder::duration() const
     Returns total duration (in milliseconds) of the audio stream
     or -1 if not available.
 */
 
 QT_END_NAMESPACE
 
-#include "moc_qaudiodecodercontrol.cpp"
+#include "moc_qplatformaudiodecoder_p.cpp"
diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/platform/qplatformaudiodecoder_p.h
index b77457ce1..b8196a263 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.h
+++ b/src/multimedia/platform/qplatformaudiodecoder_p.h
@@ -49,7 +49,7 @@
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
-class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformAudioDecoder : public QObject
 {
     Q_OBJECT
 
@@ -89,7 +89,7 @@ Q_SIGNALS:
     void durationChanged(qint64 duration);
 
 protected:
-    explicit QAudioDecoderControl(QObject *parent = nullptr);
+    explicit QPlatformAudioDecoder(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/platform/qplatformcamera.cpp
index a55c198ad..ddd1dc3b5 100644
--- a/src/multimedia/controls/qcameracontrol.cpp
+++ b/src/multimedia/platform/qplatformcamera.cpp
@@ -37,17 +37,17 @@
 **
 ****************************************************************************/
 
-#include <qcameracontrol.h>
+#include "qplatformcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QCameraControl
+    \class QPlatformCamera
     \obsolete
 
 
 
-    \brief The QCameraControl class is an abstract base class for
+    \brief The QPlatformCamera class is an abstract base class for
     classes that control still cameras or video cameras.
 
     \inmodule QtMultimedia
@@ -59,13 +59,13 @@ QT_BEGIN_NAMESPACE
     Constructs a camera control object with \a parent.
 */
 
-QCameraControl::QCameraControl(QObject *parent)
+QPlatformCamera::QPlatformCamera(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \fn QCameraControl::state() const
+    \fn QPlatformCamera::state() const
 
     Returns the state of the camera service.
 
@@ -73,28 +73,28 @@ QCameraControl::QCameraControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraControl::setState(QCamera::State state)
+    \fn QPlatformCamera::setState(QCamera::State state)
 
     Sets the camera \a state.
 
     State changes are synchronous and indicate user intention,
     while camera status is used as a feedback mechanism to inform application about backend status.
-    Status changes are reported asynchronously with QCameraControl::statusChanged() signal.
+    Status changes are reported asynchronously with QPlatformCamera::statusChanged() signal.
 
     \sa QCamera::State
 */
 
 /*!
-    \fn void QCameraControl::stateChanged(QCamera::State state)
+    \fn void QPlatformCamera::stateChanged(QCamera::State state)
 
     Signal emitted when the camera \a state changes.
 
-    In most cases the state chage is caused by QCameraControl::setState(),
+    In most cases the state chage is caused by QPlatformCamera::setState(),
     but if critical error has occurred the state changes to QCamera::UnloadedState.
 */
 
 /*!
-    \fn QCameraControl::status() const
+    \fn QPlatformCamera::status() const
 
     Returns the status of the camera service.
 
@@ -102,21 +102,21 @@ QCameraControl::QCameraControl(QObject *parent)
 */
 
 /*!
-    \fn void QCameraControl::statusChanged(QCamera::Status status)
+    \fn void QPlatformCamera::statusChanged(QCamera::Status status)
 
     Signal emitted when the camera \a status changes.
 */
 
 
 /*!
-    \fn void QCameraControl::error(int error, const QString &errorString)
+    \fn void QPlatformCamera::error(int error, const QString &errorString)
 
     Signal emitted when an error occurs with error code \a error and
     a description of the error \a errorString.
 */
 
 /*!
-    \fn bool QCameraControl::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
+    \fn bool QPlatformCamera::canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
 
     Returns true if backend can effectively apply changing camera properties of \a changeType type
     while the camera state is QCamera::Active and camera status matches \a status parameter.
@@ -128,7 +128,7 @@ QCameraControl::QCameraControl(QObject *parent)
 */
 
 /*!
-  \enum QCameraControl::PropertyChangeType
+  \enum QPlatformCamera::PropertyChangeType
 
   \value CaptureMode Indicates the capture mode is changed.
   \value ImageEncodingSettings Image encoder settings are changed, including resolution.
@@ -139,7 +139,7 @@ QCameraControl::QCameraControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraControl::supportedViewfinderSettings() const
+    \fn QPlatformCamera::supportedViewfinderSettings() const
 
     Returns a list of supported camera viewfinder settings.
 
@@ -147,21 +147,21 @@ QCameraControl::QCameraControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraControl::viewfinderSettings() const
+    \fn QPlatformCamera::viewfinderSettings() const
 
     Returns the viewfinder settings.
 
-    If undefined or unsupported values are passed to QCameraControl::setViewfinderSettings(),
+    If undefined or unsupported values are passed to QPlatformCamera::setViewfinderSettings(),
     this function returns the actual settings used by the camera viewfinder. These may be available
     only once the camera is active.
 */
 
 /*!
-    \fn QCameraControl::setViewfinderSettings(const QCameraViewfinderSettings &settings)
+    \fn QPlatformCamera::setViewfinderSettings(const QCameraViewfinderSettings &settings)
 
     Sets the camera viewfinder \a settings.
 */
 
 QT_END_NAMESPACE
 
-#include "moc_qcameracontrol.cpp"
+#include "moc_qplatformcamera_p.cpp"
diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/platform/qplatformcamera_p.h
index cfcd29cd3..d2e204c91 100644
--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/platform/qplatformcamera_p.h
@@ -49,11 +49,11 @@ QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
 class QString;
-class QCameraFocusControl;
-class QCameraExposureControl;
-class QCameraImageProcessingControl;
+class QPlatformCameraFocus;
+class QPlatformCameraExposure;
+class QPlatformCameraImageProcessing;
 
-class Q_MULTIMEDIA_EXPORT QCameraControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformCamera : public QObject
 {
     Q_OBJECT
 
@@ -73,9 +73,9 @@ public:
 
     virtual bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const = 0;
 
-    virtual QCameraFocusControl *focusControl() { return nullptr; }
-    virtual QCameraExposureControl *exposureControl() { return nullptr; }
-    virtual QCameraImageProcessingControl *imageProcessingControl() { return nullptr; }
+    virtual QPlatformCameraFocus *focusControl() { return nullptr; }
+    virtual QPlatformCameraExposure *exposureControl() { return nullptr; }
+    virtual QPlatformCameraImageProcessing *imageProcessingControl() { return nullptr; }
 
     virtual void setVideoSurface(QAbstractVideoSurface *surface) = 0;
 
@@ -85,7 +85,7 @@ Q_SIGNALS:
     void error(int error, const QString &errorString);
 
 protected:
-    explicit QCameraControl(QObject *parent = nullptr);
+    explicit QPlatformCamera(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/platform/qplatformcameraexposure.cpp
index fcfd4da22..390729e32 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.cpp
+++ b/src/multimedia/platform/qplatformcameraexposure.cpp
@@ -37,15 +37,15 @@
 **
 ****************************************************************************/
 
-#include <qcameraexposurecontrol.h>
+#include "qplatformcameraexposure_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QCameraExposureControl
+    \class QPlatformCameraExposure
     \obsolete
 
-    \brief The QCameraExposureControl class allows controlling camera exposure parameters.
+    \brief The QPlatformCameraExposure class allows controlling camera exposure parameters.
 
     \inmodule QtMultimedia
 
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
     implementation of QCamera functionality.
 
     You can adjust a number of parameters that will affect images and video taken with
-    the corresponding QCamera object - see the \l {QCameraExposureControl::ExposureParameter}{ExposureParameter} enumeration.
+    the corresponding QCamera object - see the \l {QPlatformCameraExposure::ExposureParameter}{ExposureParameter} enumeration.
 
     \sa QCameraExposure, QCamera
 */
@@ -65,13 +65,13 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a camera exposure control object with \a parent.
 */
-QCameraExposureControl::QCameraExposureControl(QObject *parent)
+QPlatformCameraExposure::QPlatformCameraExposure(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-  \enum QCameraExposureControl::ExposureParameter
+  \enum QPlatformCameraExposure::ExposureParameter
   \value ISO
          Camera ISO sensitivity, specified as integer value.
   \value Aperture
@@ -93,14 +93,14 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 */
 
 /*!
-  \fn QCameraExposureControl::isParameterSupported(ExposureParameter parameter) const
+  \fn QPlatformCameraExposure::isParameterSupported(ExposureParameter parameter) const
 
   Returns true is exposure \a parameter is supported by backend.
   \since 5.0
 */
 
 /*!
-  \fn QCameraExposureControl::requestedValue(ExposureParameter parameter) const
+  \fn QPlatformCameraExposure::requestedValue(ExposureParameter parameter) const
 
   Returns the requested exposure \a parameter value.
 
@@ -108,7 +108,7 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 */
 
 /*!
-  \fn QCameraExposureControl::actualValue(ExposureParameter parameter) const
+  \fn QPlatformCameraExposure::actualValue(ExposureParameter parameter) const
 
   Returns the actual exposure \a parameter value, or invalid QVariant() if the value is unknown or not supported.
 
@@ -119,7 +119,7 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 
 
 /*!
-  \fn QCameraExposureControl::supportedParameterRange(ExposureParameter parameter, bool *continuous = 0) const
+  \fn QPlatformCameraExposure::supportedParameterRange(ExposureParameter parameter, bool *continuous = 0) const
 
   Returns the list of supported \a parameter values;
 
@@ -130,18 +130,18 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 */
 
 /*!
-  \fn bool QCameraExposureControl::setValue(ExposureParameter parameter, const QVariant& value)
+  \fn bool QPlatformCameraExposure::setValue(ExposureParameter parameter, const QVariant& value)
 
   Set the exposure \a parameter to \a value.
   If a null or invalid QVariant is passed, backend should choose the value automatically,
-  and if possible report the actual value to user with QCameraExposureControl::actualValue().
+  and if possible report the actual value to user with QPlatformCameraExposure::actualValue().
 
   Returns true if parameter is supported and value is correct.
   \since 5.0
 */
 
 /*!
-    \fn void QCameraExposureControl::requestedValueChanged(int parameter)
+    \fn void QPlatformCameraExposure::requestedValueChanged(int parameter)
 
     Signal emitted when the requested exposure \a parameter value has changed,
     usually in result of setValue() call.
@@ -149,7 +149,7 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 */
 
 /*!
-    \fn void QCameraExposureControl::actualValueChanged(int parameter)
+    \fn void QPlatformCameraExposure::actualValueChanged(int parameter)
 
     Signal emitted when the actual exposure \a parameter value has changed,
     usually in result of auto exposure algorithms or manual exposure parameter applied.
@@ -158,7 +158,7 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 */
 
 /*!
-    \fn void QCameraExposureControl::parameterRangeChanged(int parameter)
+    \fn void QPlatformCameraExposure::parameterRangeChanged(int parameter)
 
     Signal emitted when the supported range of exposure \a parameter values has changed.
 
@@ -167,4 +167,4 @@ QCameraExposureControl::QCameraExposureControl(QObject *parent)
 
 QT_END_NAMESPACE
 
-#include "moc_qcameraexposurecontrol.cpp"
+#include "moc_qplatformcameraexposure_p.cpp"
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/platform/qplatformcameraexposure_p.h
index 58c19dbab..6ebdfef7c 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/platform/qplatformcameraexposure_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 // Required for QDoc workaround
 class QString;
 
-class Q_MULTIMEDIA_EXPORT QCameraExposureControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformCameraExposure : public QObject
 {
     Q_OBJECT
     Q_ENUMS(ExposureParameter)
@@ -87,12 +87,12 @@ Q_SIGNALS:
     void parameterRangeChanged(int parameter);
 
 protected:
-    explicit QCameraExposureControl(QObject *parent = nullptr);
+    explicit QPlatformCameraExposure(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
 
-Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter)
+Q_MEDIA_ENUM_DEBUG(QPlatformCameraExposure, ExposureParameter)
 
 
 #endif  // QCAMERAEXPOSURECONTROL_H
diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/platform/qplatformcamerafocus.cpp
index f110b3c89..943c7fe06 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.cpp
+++ b/src/multimedia/platform/qplatformcamerafocus.cpp
@@ -37,16 +37,16 @@
 **
 ****************************************************************************/
 
-#include <qcamerafocuscontrol.h>
+#include "qplatformcamerafocus_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QCameraFocusControl
+    \class QPlatformCameraFocus
     \obsolete
 
 
-    \brief The QCameraFocusControl class supplies control for
+    \brief The QPlatformCameraFocus class supplies control for
     focusing related camera parameters.
 
     \inmodule QtMultimedia
@@ -59,51 +59,51 @@ QT_BEGIN_NAMESPACE
     Constructs a camera control object with \a parent.
 */
 
-QCameraFocusControl::QCameraFocusControl(QObject *parent)
+QPlatformCameraFocus::QPlatformCameraFocus(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-  \fn QCameraFocus::FocusModes QCameraFocusControl::focusMode() const
+  \fn QCameraFocus::FocusModes QPlatformCameraFocus::focusMode() const
 
   Returns the focus mode being used.
 */
 
 
 /*!
-  \fn void QCameraFocusControl::setFocusMode(QCameraFocus::FocusModes mode)
+  \fn void QPlatformCameraFocus::setFocusMode(QCameraFocus::FocusModes mode)
 
   Set the focus mode to \a mode.
 */
 
 
 /*!
-  \fn bool QCameraFocusControl::isFocusModeSupported(QCameraFocus::FocusModes mode) const
+  \fn bool QPlatformCameraFocus::isFocusModeSupported(QCameraFocus::FocusModes mode) const
 
   Returns true if focus \a mode is supported.
 */
 
 /*!
-  \fn QCameraFocusControl::focusPointMode() const
+  \fn QPlatformCameraFocus::focusPointMode() const
 
   Returns the camera focus point selection mode.
 */
 
 /*!
-  \fn QCameraFocusControl::setFocusPointMode(QCameraFocus::FocusPointMode mode)
+  \fn QPlatformCameraFocus::setFocusPointMode(QCameraFocus::FocusPointMode mode)
 
   Sets the camera focus point selection \a mode.
 */
 
 /*!
-  \fn QCameraFocusControl::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const
+  \fn QPlatformCameraFocus::isFocusPointModeSupported(QCameraFocus::FocusPointMode mode) const
 
   Returns true if the camera focus point \a mode is supported.
 */
 
 /*!
-  \fn QCameraFocusControl::customFocusPoint() const
+  \fn QPlatformCameraFocus::customFocusPoint() const
 
   Return the position of custom focus point, in relative frame coordinates:
   QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center.
@@ -112,99 +112,99 @@ QCameraFocusControl::QCameraFocusControl(QObject *parent)
 */
 
 /*!
-  \fn QCameraFocusControl::setCustomFocusPoint(const QPointF &point)
+  \fn QPlatformCameraFocus::setCustomFocusPoint(const QPointF &point)
 
   Sets the custom focus \a point.
 
   If camera supports fixed set of focus points,
   it should use the nearest supported focus point,
-  and return the actual focus point with QCameraFocusControl::focusZones().
+  and return the actual focus point with QPlatformCameraFocus::focusZones().
 
-  \sa QCameraFocusControl::customFocusPoint(), QCameraFocusControl::focusZones()
+  \sa QPlatformCameraFocus::customFocusPoint(), QPlatformCameraFocus::focusZones()
 */
 
 /*!
-  \fn QCameraFocusControl::focusZones() const
+  \fn QPlatformCameraFocus::focusZones() const
 
   Returns the list of zones, the camera is using for focusing or focused on.
 */
 
 /*!
-  \fn QCameraFocusControl::focusZonesChanged()
+  \fn QPlatformCameraFocus::focusZonesChanged()
 
   Signal is emitted when the set of zones, camera focused on is changed.
 
   Usually the zones list is changed when the camera is focused.
 
-  \sa QCameraFocusControl::focusZones()
+  \sa QPlatformCameraFocus::focusZones()
 */
 
 /*!
-  \fn void QCameraFocusControl::focusModeChanged(QCameraFocus::FocusModes mode)
+  \fn void QPlatformCameraFocus::focusModeChanged(QCameraFocus::FocusModes mode)
 
   Signal is emitted when the focus \a mode is changed,
-  usually in result of QCameraFocusControl::setFocusMode call or capture mode changes.
+  usually in result of QPlatformCameraFocus::setFocusMode call or capture mode changes.
 
-  \sa QCameraFocusControl::focusMode(), QCameraFocusControl::setFocusMode()
+  \sa QPlatformCameraFocus::focusMode(), QPlatformCameraFocus::setFocusMode()
 */
 
 /*!
-  \fn void QCameraFocusControl::focusPointModeChanged(QCameraFocus::FocusPointMode mode)
+  \fn void QPlatformCameraFocus::focusPointModeChanged(QCameraFocus::FocusPointMode mode)
 
   Signal is emitted when the focus point \a mode is changed,
-  usually in result of QCameraFocusControl::setFocusPointMode call or capture mode changes.
+  usually in result of QPlatformCameraFocus::setFocusPointMode call or capture mode changes.
 
-  \sa QCameraFocusControl::focusPointMode(), QCameraFocusControl::setFocusPointMode()
+  \sa QPlatformCameraFocus::focusPointMode(), QPlatformCameraFocus::setFocusPointMode()
 */
 
 /*!
-  \fn void QCameraFocusControl::customFocusPointChanged(const QPointF &point)
+  \fn void QPlatformCameraFocus::customFocusPointChanged(const QPointF &point)
 
   Signal is emitted when the custom focus \a point is changed.
 
-  \sa QCameraFocusControl::customFocusPoint(), QCameraFocusControl::setCustomFocusPoint()
+  \sa QPlatformCameraFocus::customFocusPoint(), QPlatformCameraFocus::setCustomFocusPoint()
 */
 
 /*!
-  \fn qreal QCameraFocusControl::maximumOpticalZoom() const
+  \fn qreal QPlatformCameraFocus::maximumOpticalZoom() const
 
   Returns the maximum optical zoom value, or 1.0 if optical zoom is not supported.
 */
 
 
 /*!
-  \fn qreal QCameraFocusControl::maximumDigitalZoom() const
+  \fn qreal QPlatformCameraFocus::maximumDigitalZoom() const
 
   Returns the maximum digital zoom value, or 1.0 if digital zoom is not supported.
 */
 
 
 /*!
-  \fn qreal QCameraFocusControl::requestedOpticalZoom() const
+  \fn qreal QPlatformCameraFocus::requestedOpticalZoom() const
 
   Return the requested optical zoom value.
 */
 
 /*!
-  \fn qreal QCameraFocusControl::requestedDigitalZoom() const
+  \fn qreal QPlatformCameraFocus::requestedDigitalZoom() const
 
   Return the requested digital zoom value.
 */
 
 /*!
-  \fn qreal QCameraFocusControl::currentOpticalZoom() const
+  \fn qreal QPlatformCameraFocus::currentOpticalZoom() const
 
   Return the current optical zoom value.
 */
 
 /*!
-  \fn qreal QCameraFocusControl::currentDigitalZoom() const
+  \fn qreal QPlatformCameraFocus::currentDigitalZoom() const
 
   Return the current digital zoom value.
 */
 
 /*!
-  \fn void QCameraFocusControl::zoomTo(qreal optical, qreal digital)
+  \fn void QPlatformCameraFocus::zoomTo(qreal optical, qreal digital)
 
   Sets \a optical and \a digital zoom values.
 
@@ -217,32 +217,32 @@ QCameraFocusControl::QCameraFocusControl(QObject *parent)
 
 
 /*!
-    \fn void QCameraFocusControl::currentOpticalZoomChanged(qreal zoom)
+    \fn void QPlatformCameraFocus::currentOpticalZoomChanged(qreal zoom)
 
     Signal emitted when the current optical \a zoom value changed.
 */
 
 /*!
-    \fn void QCameraFocusControl::currentDigitalZoomChanged(qreal zoom)
+    \fn void QPlatformCameraFocus::currentDigitalZoomChanged(qreal zoom)
 
     Signal emitted when the current digital \a zoom value changed.
 */
 
 /*!
-    \fn void QCameraFocusControl::requestedOpticalZoomChanged(qreal zoom)
+    \fn void QPlatformCameraFocus::requestedOpticalZoomChanged(qreal zoom)
 
     Signal emitted when the requested optical \a zoom value changed.
 */
 
 /*!
-    \fn void QCameraFocusControl::requestedDigitalZoomChanged(qreal zoom)
+    \fn void QPlatformCameraFocus::requestedDigitalZoomChanged(qreal zoom)
 
     Signal emitted when the requested digital \a zoom value changed.
 */
 
 
 /*!
-    \fn void QCameraFocusControl::maximumOpticalZoomChanged(qreal zoom)
+    \fn void QPlatformCameraFocus::maximumOpticalZoomChanged(qreal zoom)
 
     Signal emitted when the maximum supported optical \a zoom value changed.
 
@@ -251,7 +251,7 @@ QCameraFocusControl::QCameraFocusControl(QObject *parent)
 */
 
 /*!
-    \fn void QCameraFocusControl::maximumDigitalZoomChanged(qreal zoom)
+    \fn void QPlatformCameraFocus::maximumDigitalZoomChanged(qreal zoom)
 
     Signal emitted when the maximum supported digital \a zoom value changed.
 
@@ -261,4 +261,4 @@ QCameraFocusControl::QCameraFocusControl(QObject *parent)
 
 QT_END_NAMESPACE
 
-#include "moc_qcamerafocuscontrol.cpp"
+#include "moc_qplatformcamerafocus_p.cpp"
diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/platform/qplatformcamerafocus_p.h
index aafae5b97..265903a67 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.h
+++ b/src/multimedia/platform/qplatformcamerafocus_p.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 // Required for QDoc workaround
 class QString;
 
-class Q_MULTIMEDIA_EXPORT QCameraFocusControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformCameraFocus : public QObject
 {
     Q_OBJECT
 
@@ -85,7 +85,7 @@ Q_SIGNALS:
 
 
 protected:
-    explicit QCameraFocusControl(QObject *parent = nullptr);
+    explicit QPlatformCameraFocus(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/platform/qplatformcameraimagecapture.cpp
index a0d7770c4..bed04b035 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/qplatformcameraimagecapture.cpp
@@ -37,16 +37,16 @@
 **
 ****************************************************************************/
 
-#include <qcameraimagecapturecontrol.h>
+#include "qplatformcameraimagecapture_p.h"
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QCameraImageCaptureControl
+    \class QPlatformCameraImageCapture
     \obsolete
 
-    \brief The QCameraImageCaptureControl class provides a control interface
+    \brief The QPlatformCameraImageCapture class provides a control interface
     for image capture services.
 
     \inmodule QtMultimedia
@@ -57,13 +57,13 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a new image capture control object with the given \a parent
 */
-QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
+QPlatformCameraImageCapture::QPlatformCameraImageCapture(QObject *parent)
     :QObject(parent)
 {
 }
 
 /*!
-    \fn QCameraImageCaptureControl::isReadyForCapture() const
+    \fn QPlatformCameraImageCapture::isReadyForCapture() const
 
     Identifies if a capture control is ready to perform a capture
     immediately (all the resources necessary for image capture are allocated,
@@ -79,13 +79,13 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraImageCaptureControl::readyForCaptureChanged(bool ready)
+    \fn QPlatformCameraImageCapture::readyForCaptureChanged(bool ready)
 
     Signals that a capture control's \a ready state has changed.
 */
 
 /*!
-    \fn QCameraImageCaptureControl::capture(const QString &fileName)
+    \fn QPlatformCameraImageCapture::capture(const QString &fileName)
 
     Initiates the capture of an image to \a fileName.
     The \a fileName can be relative or empty,
@@ -102,13 +102,13 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraImageCaptureControl::cancelCapture()
+    \fn QPlatformCameraImageCapture::cancelCapture()
 
     Cancel pending capture requests.
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageExposed(int requestId)
+    \fn QPlatformCameraImageCapture::imageExposed(int requestId)
 
     Signals that an image with it \a requestId
     has just been exposed.
@@ -116,14 +116,14 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageCaptured(int requestId, const QImage &preview)
+    \fn QPlatformCameraImageCapture::imageCaptured(int requestId, const QImage &preview)
 
     Signals that an image with it \a requestId
     has been captured and a \a preview is available.
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageMetadataAvailable(int id, const QMediaMetaData &metaData)
+    \fn QPlatformCameraImageCapture::imageMetadataAvailable(int id, const QMediaMetaData &metaData)
 
     Signals that a metadata for an image with request \a id is available.
 
@@ -131,20 +131,20 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageAvailable(int requestId, const QVideoFrame &buffer)
+    \fn QPlatformCameraImageCapture::imageAvailable(int requestId, const QVideoFrame &buffer)
 
     Signals that a captured \a buffer with a \a requestId is available.
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageSaved(int requestId, const QString &fileName)
+    \fn QPlatformCameraImageCapture::imageSaved(int requestId, const QString &fileName)
 
     Signals that a captured image with a \a requestId has been saved
     to \a fileName.
 */
 
 /*!
-    \fn QCameraImageCaptureControl::imageSettings() const
+    \fn QPlatformCameraImageCapture::imageSettings() const
 
     Returns the currently used image encoder settings.
 
@@ -153,13 +153,13 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
 */
 
 /*!
-    \fn QCameraImageCaptureControl::setImageSettings(const QImageEncoderSettings &settings)
+    \fn QPlatformCameraImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 
     Sets the selected image encoder \a settings.
 */
 
 /*!
-    \fn QCameraImageCaptureControl::error(int id, int error, const QString &errorString)
+    \fn QPlatformCameraImageCapture::error(int id, int error, const QString &errorString)
 
     Signals the capture request \a id failed with \a error code and message \a errorString.
 
@@ -169,4 +169,4 @@ QCameraImageCaptureControl::QCameraImageCaptureControl(QObject *parent)
 
 QT_END_NAMESPACE
 
-#include "moc_qcameraimagecapturecontrol.cpp"
+#include "moc_qplatformcameraimagecapture_p.cpp"
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/platform/qplatformcameraimagecapture_p.h
index d59e9c201..ff5801d24 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.h
+++ b/src/multimedia/platform/qplatformcameraimagecapture_p.h
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 class QImage;
 
-class Q_MULTIMEDIA_EXPORT QCameraImageCaptureControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformCameraImageCapture : public QObject
 {
     Q_OBJECT
 
@@ -75,7 +75,7 @@ Q_SIGNALS:
     void error(int id, int error, const QString &errorString);
 
 protected:
-    explicit QCameraImageCaptureControl(QObject *parent = nullptr);
+    explicit QPlatformCameraImageCapture(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/platform/qplatformcameraimageprocessing.cpp
index 6fe9be0a6..5b229f9aa 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/platform/qplatformcameraimageprocessing.cpp
@@ -37,12 +37,12 @@
 **
 ****************************************************************************/
 
-#include <qcameraimageprocessingcontrol.h>
+#include "qplatformcameraimageprocessing_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QCameraImageProcessingControl
+    \class QPlatformCameraImageProcessing
     \obsolete
     \inmodule QtMultimedia
 
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_control
 
 
-    \brief The QCameraImageProcessingControl class provides an abstract class
+    \brief The QPlatformCameraImageProcessing class provides an abstract class
     for controlling image processing parameters, like white balance,
     contrast, saturation.
 
@@ -71,13 +71,13 @@ QT_BEGIN_NAMESPACE
     Constructs an image processing control object with \a parent.
 */
 
-QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent)
+QPlatformCameraImageProcessing::QPlatformCameraImageProcessing(QObject *parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \fn bool QCameraImageProcessingControl::isParameterSupported(ProcessingParameter parameter) const
+    \fn bool QPlatformCameraImageProcessing::isParameterSupported(ProcessingParameter parameter) const
 
     Returns true if the camera supports adjusting image processing \a parameter.
 
@@ -88,7 +88,7 @@ QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent)
 */
 
 /*!
-    \fn bool QCameraImageProcessingControl::isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const
+    \fn bool QPlatformCameraImageProcessing::isParameterValueSupported(ProcessingParameter parameter, const QVariant &value) const
 
     Returns true if the camera supports setting the image processing \a parameter \a value.
 
@@ -97,13 +97,13 @@ QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent)
 
 
 /*!
-    \fn QCameraImageProcessingControl::parameter(ProcessingParameter parameter) const
+    \fn QPlatformCameraImageProcessing::parameter(ProcessingParameter parameter) const
 
     Returns the image processing \a parameter value.
 */
 
 /*!
-    \fn QCameraImageProcessingControl::setParameter(ProcessingParameter parameter, const QVariant &value)
+    \fn QPlatformCameraImageProcessing::setParameter(ProcessingParameter parameter, const QVariant &value)
 
     Sets the image processing \a parameter \a value.
     Passing the null or invalid QVariant value allows
@@ -118,7 +118,7 @@ QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent)
 */
 
 /*!
-  \enum QCameraImageProcessingControl::ProcessingParameter
+  \enum QPlatformCameraImageProcessing::ProcessingParameter
 
   \value WhiteBalancePreset
     The white balance preset.
@@ -144,4 +144,4 @@ QCameraImageProcessingControl::QCameraImageProcessingControl(QObject *parent)
 
 QT_END_NAMESPACE
 
-#include "moc_qcameraimageprocessingcontrol.cpp"
+#include "moc_qplatformcameraimageprocessing_p.cpp"
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/platform/qplatformcameraimageprocessing_p.h
index 334a165dc..d1ca2b738 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/platform/qplatformcameraimageprocessing_p.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 // Required for QDoc workaround
 class QString;
 
-class Q_MULTIMEDIA_EXPORT QCameraImageProcessingControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformCameraImageProcessing : public QObject
 {
     Q_OBJECT
     Q_ENUMS(ProcessingParameter)
@@ -76,12 +76,12 @@ public:
     virtual void setParameter(ProcessingParameter parameter, const QVariant &value) = 0;
 
 protected:
-    explicit QCameraImageProcessingControl(QObject *parent = nullptr);
+    explicit QPlatformCameraImageProcessing(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
 
-Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter)
+Q_MEDIA_ENUM_DEBUG(QPlatformCameraImageProcessing, ProcessingParameter)
 
 #endif
 
diff --git a/src/multimedia/platform/qplatformmediacapture_p.h b/src/multimedia/platform/qplatformmediacapture_p.h
index ed8ad999f..0cc77ddd8 100644
--- a/src/multimedia/platform/qplatformmediacapture_p.h
+++ b/src/multimedia/platform/qplatformmediacapture_p.h
@@ -54,9 +54,9 @@
 #include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
-class QCameraControl;
-class QCameraImageCaptureControl;
-class QMediaRecorderControl;
+class QPlatformCamera;
+class QPlatformCameraImageCapture;
+class QPlatformMediaRecorder;
 
 class Q_MULTIMEDIA_EXPORT QPlatformMediaCapture : public QObject
 {
@@ -64,9 +64,9 @@ public:
     QPlatformMediaCapture() = default;
     virtual ~QPlatformMediaCapture();
 
-    virtual QCameraControl *cameraControl() = 0;
-    virtual QCameraImageCaptureControl *imageCaptureControl() = 0;
-    virtual QMediaRecorderControl *mediaRecorderControl() = 0;
+    virtual QPlatformCamera *cameraControl() = 0;
+    virtual QPlatformCameraImageCapture *imageCaptureControl() = 0;
+    virtual QPlatformMediaRecorder *mediaRecorderControl() = 0;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h
index 2b3ce9090..06557313a 100644
--- a/src/multimedia/platform/qplatformmediaintegration_p.h
+++ b/src/multimedia/platform/qplatformmediaintegration_p.h
@@ -59,7 +59,7 @@ class QMediaDeviceManager;
 class QPlatformMediaDeviceManager;
 class QPlatformMediaCapture;
 class QPlatformMediaPlayer;
-class QAudioDecoderControl;
+class QPlatformAudioDecoder;
 class QPlatformMediaFormatInfo;
 class QObject;
 
@@ -75,7 +75,7 @@ public:
     virtual QPlatformMediaDeviceManager *deviceManager() = 0;
     virtual QPlatformMediaFormatInfo *formatInfo() = 0;
 
-    virtual QAudioDecoderControl *createAudioDecoder() { return nullptr; }
+    virtual QPlatformAudioDecoder *createAudioDecoder() { return nullptr; }
     virtual QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode /*mode*/) { return nullptr; }
     virtual QPlatformMediaPlayer *createPlayer() { return nullptr; }
 };
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/platform/qplatformmediarecorder.cpp
index e6eb1779f..080a06eb1 100644
--- a/src/multimedia/controls/qmediarecordercontrol.cpp
+++ b/src/multimedia/platform/qplatformmediarecorder.cpp
@@ -37,20 +37,20 @@
 **
 ****************************************************************************/
 
-#include "qmediarecordercontrol.h"
+#include "qplatformmediarecorder_p.h"
 
 QT_BEGIN_NAMESPACE
 
 
 /*!
-    \class QMediaRecorderControl
+    \class QPlatformMediaRecorder
     \obsolete
     \inmodule QtMultimedia
 
 
     \ingroup multimedia_control
 
-    \brief The QMediaRecorderControl class provides access to the recording
+    \brief The QPlatformMediaRecorder class provides access to the recording
     functionality.
 
     This control provides a means to set the \l {outputLocation()}{output location},
@@ -65,19 +65,19 @@ QT_BEGIN_NAMESPACE
     Constructs a media recorder control with the given \a parent.
 */
 
-QMediaRecorderControl::QMediaRecorderControl(QObject* parent)
+QPlatformMediaRecorder::QPlatformMediaRecorder(QObject* parent)
     : QObject(parent)
 {
 }
 
 /*!
-    \fn QUrl QMediaRecorderControl::outputLocation() const
+    \fn QUrl QPlatformMediaRecorder::outputLocation() const
 
     Returns the current output location being used.
 */
 
 /*!
-    \fn bool QMediaRecorderControl::setOutputLocation(const QUrl &location)
+    \fn bool QPlatformMediaRecorder::setOutputLocation(const QUrl &location)
 
     Sets the output \a location and returns if this operation is successful.
     If file at the output location already exists, it should be overwritten.
@@ -90,56 +90,56 @@ QMediaRecorderControl::QMediaRecorderControl(QObject* parent)
 */
 
 /*!
-    \fn QMediaRecorder::State QMediaRecorderControl::state() const
+    \fn QMediaRecorder::State QPlatformMediaRecorder::state() const
 
     Return the current recording state.
 */
 
 /*!
-    \fn QMediaRecorder::Status QMediaRecorderControl::status() const
+    \fn QMediaRecorder::Status QPlatformMediaRecorder::status() const
 
     Return the current recording status.
 */
 
 /*!
-    \fn qint64 QMediaRecorderControl::duration() const
+    \fn qint64 QPlatformMediaRecorder::duration() const
 
     Return the current duration in milliseconds.
 */
 
 /*!
-    \fn void QMediaRecorderControl::setState(QMediaRecorder::State state)
+    \fn void QPlatformMediaRecorder::setState(QMediaRecorder::State state)
 
     Set the media recorder \a state.
 */
 
 /*!
-    \fn void QMediaRecorderControl::applySettings()
+    \fn void QPlatformMediaRecorder::applySettings()
 
     Commits the encoder settings and performs pre-initialization to reduce delays when recording
     is started.
 */
 
 /*!
-    \fn bool QMediaRecorderControl::isMuted() const
+    \fn bool QPlatformMediaRecorder::isMuted() const
 
     Returns true if the recorder is muted, and false if it is not.
 */
 
 /*!
-    \fn void QMediaRecorderControl::setMuted(bool muted)
+    \fn void QPlatformMediaRecorder::setMuted(bool muted)
 
     Sets the \a muted state of a media recorder.
 */
 
 /*!
-    \fn qreal QMediaRecorderControl::volume() const
+    \fn qreal QPlatformMediaRecorder::volume() const
 
     Returns the audio volume of a media recorder control.
 */
 
 /*!
-    \fn void QMediaRecorderControl::setVolume(qreal volume)
+    \fn void QPlatformMediaRecorder::setVolume(qreal volume)
 
     Sets the audio \a volume of a media recorder control.
 
@@ -147,20 +147,20 @@ QMediaRecorderControl::QMediaRecorderControl(QObject* parent)
 */
 
 /*!
-    \fn void QMediaRecorderControl::stateChanged(QMediaRecorder::State state)
+    \fn void QPlatformMediaRecorder::stateChanged(QMediaRecorder::State state)
 
     Signals that the \a state of a media recorder has changed.
 */
 
 /*!
-    \fn void QMediaRecorderControl::statusChanged(QMediaRecorder::Status status)
+    \fn void QPlatformMediaRecorder::statusChanged(QMediaRecorder::Status status)
 
     Signals that the \a status of a media recorder has changed.
 */
 
 
 /*!
-    \fn void QMediaRecorderControl::durationChanged(qint64 duration)
+    \fn void QPlatformMediaRecorder::durationChanged(qint64 duration)
 
     Signals that the \a duration of the recorded media has changed.
 
@@ -168,30 +168,30 @@ QMediaRecorderControl::QMediaRecorderControl(QObject* parent)
 */
 
 /*!
-    \fn void QMediaRecorderControl::mutedChanged(bool muted)
+    \fn void QPlatformMediaRecorder::mutedChanged(bool muted)
 
     Signals that the \a muted state of a media recorder has changed.
 */
 
 /*!
-    \fn void QMediaRecorderControl::volumeChanged(qreal gain)
+    \fn void QPlatformMediaRecorder::volumeChanged(qreal gain)
 
     Signals that the audio \a gain value has changed.
 */
 
 /*!
-    \fn void QMediaRecorderControl::actualLocationChanged(const QUrl &location)
+    \fn void QPlatformMediaRecorder::actualLocationChanged(const QUrl &location)
 
     Signals that the actual media \a location has changed.
     This signal should be emitted at start of recording.
 */
 
 /*!
-    \fn void QMediaRecorderControl::error(int error, const QString &errorString)
+    \fn void QPlatformMediaRecorder::error(int error, const QString &errorString)
 
     Signals that an \a error has occurred.  The \a errorString describes the error.
 */
 
 QT_END_NAMESPACE
 
-#include "moc_qmediarecordercontrol.cpp"
+#include "moc_qplatformmediarecorder_p.cpp"
diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/platform/qplatformmediarecorder_p.h
index 5831b8948..982b16ae2 100644
--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/platform/qplatformmediarecorder_p.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 // Required for QDoc workaround
 class QString;
 
-class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformMediaRecorder : public QObject
 {
     Q_OBJECT
 
@@ -95,7 +95,7 @@ public Q_SLOTS:
     virtual void setVolume(qreal volume) = 0;
 
 protected:
-    explicit QMediaRecorderControl(QObject *parent = nullptr);
+    explicit QPlatformMediaRecorder(QObject *parent = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol.cpp b/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol.cpp
index 1e2d61027..3995eee35 100644
--- a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol.cpp
+++ b/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol.cpp
@@ -41,7 +41,7 @@
 #include "mfaudiodecodercontrol_p.h"
 
 MFAudioDecoderControl::MFAudioDecoderControl(QObject *parent)
-    : QAudioDecoderControl(parent)
+    : QPlatformAudioDecoder(parent)
     , m_decoderSourceReader(new MFDecoderSourceReader)
     , m_sourceResolver(new SourceResolver)
     , m_resampler(0)
diff --git a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol_p.h b/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol_p.h
index 98a3b9d02..78be5afef 100644
--- a/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol_p.h
+++ b/src/multimedia/platform/windows/decoder/mfaudiodecodercontrol_p.h
@@ -51,13 +51,13 @@
 // We mean it.
 //
 
-#include "qaudiodecodercontrol.h"
+#include "private/qplatformaudiodecoder_p.h"
 #include "mfdecodersourcereader_p.h"
 #include "private/sourceresolver_p.h"
 
 QT_USE_NAMESPACE
 
-class MFAudioDecoderControl : public QAudioDecoderControl
+class MFAudioDecoderControl : public QPlatformAudioDecoder
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp
index 4153c7fb5..570a00752 100644
--- a/src/multimedia/platform/windows/qwindowsintegration.cpp
+++ b/src/multimedia/platform/windows/qwindowsintegration.cpp
@@ -83,7 +83,7 @@ QPlatformMediaFormatInfo *QWindowsIntegration::formatInfo()
     return m_formatInfo;
 }
 
-QAudioDecoderControl *QWindowsIntegration::createAudioDecoder()
+QPlatformAudioDecoder *QWindowsIntegration::createAudioDecoder()
 {
     return new MFAudioDecoderControl;
 }
diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h
index 23dd00b80..892c1ed87 100644
--- a/src/multimedia/platform/windows/qwindowsintegration_p.h
+++ b/src/multimedia/platform/windows/qwindowsintegration_p.h
@@ -70,7 +70,7 @@ public:
     QPlatformMediaDeviceManager *deviceManager() override;
     QPlatformMediaFormatInfo *formatInfo() override;
 
-    QAudioDecoderControl *createAudioDecoder() override;
+    QPlatformAudioDecoder *createAudioDecoder() override;
     QPlatformMediaPlayer *createPlayer() override;
 
     QWindowsDeviceManager *m_manager = nullptr;
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index ef264e296..80920a8e1 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 <qplatformmediaplayer_p.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <private/qplatformmediaintegration_p.h>
 
 #include <QtCore/qcoreevent.h>
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index dac7b7188..b7b023027 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -40,10 +40,10 @@
 #include "qmediarecorder.h"
 #include "qmediarecorder_p.h"
 
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include <qaudiodeviceinfo.h>
 #include <qcamera.h>
-#include <qcameracontrol.h>
+#include <private/qplatformcamera_p.h>
 #include <private/qplatformmediaintegration_p.h>
 #include <private/qplatformmediacapture_p.h>
 
@@ -144,7 +144,7 @@ void QMediaRecorderPrivate::restartCamera()
         QMetaObject::invokeMethod(camera,
                                   "_q_preparePropertyChange",
                                   Qt::DirectConnection,
-                                  Q_ARG(int, QCameraControl::VideoEncodingSettings));
+                                  Q_ARG(int, QPlatformCamera::VideoEncodingSettings));
     }
 }
 
diff --git a/src/multimedia/recording/qmediarecorder_p.h b/src/multimedia/recording/qmediarecorder_p.h
index e4d6e4be8..e262241f7 100644
--- a/src/multimedia/recording/qmediarecorder_p.h
+++ b/src/multimedia/recording/qmediarecorder_p.h
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QMediaRecorderControl;
+class QPlatformMediaRecorder;
 class QMediaContainerControl;
 class QAudioEncoderSettingsControl;
 class QVideoEncoderSettingsControl;
@@ -80,7 +80,7 @@ public:
 
     QPointer<QCamera> camera;
 
-    QMediaRecorderControl *control = nullptr;
+    QPlatformMediaRecorder *control = nullptr;
 
     bool settingsChanged = false;
 
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 1b3e26ee3..c2d0073bb 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -33,11 +33,11 @@
 #include <QDebug>
 
 #include <qabstractvideosurface.h>
-#include <qcameracontrol.h>
-#include <qcameraexposurecontrol.h>
-#include <qcamerafocuscontrol.h>
-#include <qcameraimagecapturecontrol.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamerafocus_p.h>
+#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 #include <qcamera.h>
 #include <qcamerainfo.h>
 #include <qcameraimagecapture.h>
diff --git a/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h b/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h
index 9cc1e7559..648a50e94 100644
--- a/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h
+++ b/tests/auto/unit/mockbackend/mockaudiodecodercontrol.h
@@ -29,7 +29,7 @@
 #ifndef MOCKAUDIODECODERCONTROL_H
 #define MOCKAUDIODECODERCONTROL_H
 
-#include "qaudiodecodercontrol.h"
+#include "private/qplatformaudiodecoder_p.h"
 
 #include <QtCore/qpair.h>
 
@@ -41,13 +41,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class MockAudioDecoderControl : public QAudioDecoderControl
+class MockAudioDecoderControl : public QPlatformAudioDecoder
 {
     Q_OBJECT
 
 public:
     MockAudioDecoderControl(QObject *parent = 0)
-        : QAudioDecoderControl(parent)
+        : QPlatformAudioDecoder(parent)
         , mState(QAudioDecoder::StoppedState)
         , mDevice(0)
         , mPosition(-1)
diff --git a/tests/auto/unit/mockbackend/mockcameracontrol.h b/tests/auto/unit/mockbackend/mockcameracontrol.h
index 5a3cdd411..71b984e07 100644
--- a/tests/auto/unit/mockbackend/mockcameracontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameracontrol.h
@@ -29,17 +29,17 @@
 #ifndef MOCKCAMERACONTROL_H
 #define MOCKCAMERACONTROL_H
 
-#include "qcameracontrol.h"
+#include "private/qplatformcamera_p.h"
 #include "qcamerainfo.h"
 #include <qtimer.h>
 
-class MockCameraControl : public QCameraControl
+class MockCameraControl : public QPlatformCamera
 {
     friend class MockCaptureControl;
     Q_OBJECT
 public:
     MockCameraControl(QObject *parent = 0):
-            QCameraControl(parent),
+            QPlatformCamera(parent),
             m_state(QCamera::UnloadedState),
             m_status(QCamera::UnloadedStatus),
             m_propertyChangesSupported(false)
@@ -77,9 +77,9 @@ public:
     bool canChangeProperty(PropertyChangeType changeType, QCamera::Status status) const
     {
         Q_UNUSED(status);
-        if (changeType == QCameraControl::ImageEncodingSettings)
+        if (changeType == QPlatformCamera::ImageEncodingSettings)
             return true;
-        else if (changeType== QCameraControl::VideoEncodingSettings)
+        else if (changeType== QPlatformCamera::VideoEncodingSettings)
             return true;
         else
             return m_propertyChangesSupported;
diff --git a/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h b/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h
index 435c272a0..86a1a0878 100644
--- a/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameraexposurecontrol.h
@@ -29,14 +29,14 @@
 #ifndef MOCKCAMERAEXPOSURECONTROL_H
 #define MOCKCAMERAEXPOSURECONTROL_H
 
-#include "qcameraexposurecontrol.h"
+#include "private/qplatformcameraexposure_p.h"
 
-class MockCameraExposureControl : public QCameraExposureControl
+class MockCameraExposureControl : public QPlatformCameraExposure
 {
     Q_OBJECT
 public:
     MockCameraExposureControl(QObject *parent = 0):
-        QCameraExposureControl(parent),
+        QPlatformCameraExposure(parent),
         m_aperture(2.8),
         m_shutterSpeed(0.01),
         m_isoSensitivity(100),
@@ -73,11 +73,11 @@ public:
     bool isParameterSupported(ExposureParameter parameter) const
     {
         switch (parameter) {
-        case QCameraExposureControl::ExposureMode:
-        case QCameraExposureControl::ExposureCompensation:
-        case QCameraExposureControl::ISO:
-        case QCameraExposureControl::Aperture:
-        case QCameraExposureControl::ShutterSpeed:
+        case QPlatformCameraExposure::ExposureMode:
+        case QPlatformCameraExposure::ExposureCompensation:
+        case QPlatformCameraExposure::ISO:
+        case QPlatformCameraExposure::Aperture:
+        case QPlatformCameraExposure::ShutterSpeed:
             return true;
         default:
             return false;
@@ -92,15 +92,15 @@ public:
     QVariant actualValue(ExposureParameter param) const
     {
         switch (param) {
-        case QCameraExposureControl::ExposureMode:
+        case QPlatformCameraExposure::ExposureMode:
             return QVariant::fromValue<QCameraExposure::ExposureMode>(m_exposureMode);
-        case QCameraExposureControl::ExposureCompensation:
+        case QPlatformCameraExposure::ExposureCompensation:
             return QVariant(m_exposureCompensation);
-        case QCameraExposureControl::ISO:
+        case QPlatformCameraExposure::ISO:
             return QVariant(m_isoSensitivity);
-        case QCameraExposureControl::Aperture:
+        case QPlatformCameraExposure::Aperture:
             return QVariant(m_aperture);
-        case QCameraExposureControl::ShutterSpeed:
+        case QPlatformCameraExposure::ShutterSpeed:
             return QVariant(m_shutterSpeed);
         default:
             return QVariant();
@@ -113,18 +113,18 @@ public:
 
         QVariantList res;
         switch (parameter) {
-        case QCameraExposureControl::ExposureCompensation:
+        case QPlatformCameraExposure::ExposureCompensation:
             *continuous = true;
             return m_exposureRanges;
-        case QCameraExposureControl::ISO:
+        case QPlatformCameraExposure::ISO:
             return m_isoRanges;
-        case QCameraExposureControl::Aperture:
+        case QPlatformCameraExposure::Aperture:
             *continuous = true;
             return m_apertureRanges;
-        case QCameraExposureControl::ShutterSpeed:
+        case QPlatformCameraExposure::ShutterSpeed:
             *continuous = true;
             return m_shutterRanges;
-        case QCameraExposureControl::ExposureMode:
+        case QPlatformCameraExposure::ExposureMode:
             return m_exposureModes;
         default:
             break;
@@ -145,7 +145,7 @@ public:
         }
 
         switch (param) {
-        case QCameraExposureControl::ExposureMode:
+        case QPlatformCameraExposure::ExposureMode:
         {
             QCameraExposure::ExposureMode mode = value.value<QCameraExposure::ExposureMode>();
             if (mode != m_exposureMode && m_exposureModes.contains(value)) {
@@ -154,7 +154,7 @@ public:
             }
         }
             break;
-        case QCameraExposureControl::ExposureCompensation:
+        case QPlatformCameraExposure::ExposureCompensation:
         {
             m_res.clear();
             m_res << -4.0 << 4.0;
@@ -171,7 +171,7 @@ public:
             }
         }
             break;
-        case QCameraExposureControl::ISO:
+        case QPlatformCameraExposure::ISO:
         {
             m_res.clear();
             m_res << 20 << 50;
@@ -188,7 +188,7 @@ public:
             }
         }
             break;
-        case QCameraExposureControl::Aperture:
+        case QPlatformCameraExposure::Aperture:
         {
             m_res.clear();
             m_res << 12.0 << 18.0 << 20.0;
@@ -205,7 +205,7 @@ public:
             }
         }
             break;
-        case QCameraExposureControl::ShutterSpeed:
+        case QPlatformCameraExposure::ShutterSpeed:
         {
             m_res.clear();
             m_res << 0.12 << 1.0 << 2.0;
@@ -265,7 +265,7 @@ private:
     QCameraExposure::FlashModes m_flashMode;
     QVariantList m_isoRanges,m_apertureRanges, m_shutterRanges, m_exposureRanges, m_res, m_exposureModes;
 
-    QMap<QCameraExposureControl::ExposureParameter, QVariant> m_requestedParameters;
+    QMap<QPlatformCameraExposure::ExposureParameter, QVariant> m_requestedParameters;
 };
 
 #endif // MOCKCAMERAEXPOSURECONTROL_H
diff --git a/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h b/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h
index 2b6ebba8d..b6d4da283 100644
--- a/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h
+++ b/tests/auto/unit/mockbackend/mockcamerafocuscontrol.h
@@ -29,15 +29,15 @@
 #ifndef MOCKCAMERAFOCUSCONTROL_H
 #define MOCKCAMERAFOCUSCONTROL_H
 
-#include "qcamerafocuscontrol.h"
+#include "private/qplatformcamerafocus_p.h"
 #include "qcamerafocus.h"
 
-class MockCameraFocusControl : public QCameraFocusControl
+class MockCameraFocusControl : public QPlatformCameraFocus
 {
     Q_OBJECT
 public:
     MockCameraFocusControl(QObject *parent = 0):
-        QCameraFocusControl(parent),
+        QPlatformCameraFocus(parent),
         m_focusMode(QCameraFocus::AutoFocus),
         m_focusPointMode(QCameraFocus::FocusPointAuto),
         m_focusPoint(0.5, 0.5)
diff --git a/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h b/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h
index e68fd0570..3a4d0b10b 100644
--- a/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameraimagecapturecontrol.h
@@ -33,16 +33,16 @@
 #include <QTimer>
 #include <QtMultimedia/qmediametadata.h>
 
-#include "qcameraimagecapturecontrol.h"
-#include "qcameracontrol.h"
+#include "private/qplatformcameraimagecapture_p.h"
+#include "private/qplatformcamera_p.h"
 #include "mockcameracontrol.h"
 
-class MockCaptureControl : public QCameraImageCaptureControl
+class MockCaptureControl : public QPlatformCameraImageCapture
 {
     Q_OBJECT
 public:
     MockCaptureControl(MockCameraControl *cameraControl, QObject *parent = 0)
-        : QCameraImageCaptureControl(parent), m_cameraControl(cameraControl), m_captureRequest(0), m_ready(true), m_captureCanceled(false)
+        : QPlatformCameraImageCapture(parent), m_cameraControl(cameraControl), m_captureRequest(0), m_ready(true), m_captureCanceled(false)
     {
     }
 
diff --git a/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h b/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h
index e6bd5a60b..27105f11b 100644
--- a/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h
+++ b/tests/auto/unit/mockbackend/mockcameraimageprocessingcontrol.h
@@ -29,14 +29,14 @@
 #ifndef MOCKCAMERAIMAGEPROCESSINGCONTROL_H
 #define MOCKCAMERAIMAGEPROCESSINGCONTROL_H
 
-#include "qcameraimageprocessingcontrol.h"
+#include "private/qplatformcameraimageprocessing_p.h"
 
-class MockImageProcessingControl : public QCameraImageProcessingControl
+class MockImageProcessingControl : public QPlatformCameraImageProcessing
 {
     Q_OBJECT
 public:
     MockImageProcessingControl(QObject *parent = 0)
-        : QCameraImageProcessingControl(parent)
+        : QPlatformCameraImageProcessing(parent)
     {
         m_supportedWhiteBalance.insert(QCameraImageProcessing::WhiteBalanceAuto);
     }
diff --git a/tests/auto/unit/mockbackend/mockmediarecordercontrol.h b/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
index 1df4c05b8..1246a3485 100644
--- a/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediarecordercontrol.h
@@ -32,15 +32,15 @@
 #include <QUrl>
 #include <qaudiodeviceinfo.h>
 
-#include "qmediarecordercontrol.h"
+#include "private/qplatformmediarecorder_p.h"
 
-class MockMediaRecorderControl : public QMediaRecorderControl
+class MockMediaRecorderControl : public QPlatformMediaRecorder
 {
     Q_OBJECT
 
 public:
     MockMediaRecorderControl(QObject *parent = 0):
-        QMediaRecorderControl(parent),
+        QPlatformMediaRecorder(parent),
         m_state(QMediaRecorder::StoppedState),
         m_status(QMediaRecorder::LoadedStatus),
         m_position(0),
@@ -110,7 +110,7 @@ public:
     }
     virtual QMediaMetaData metaData() const { return m_metaData; }
 
-    using QMediaRecorderControl::error;
+    using QPlatformMediaRecorder::error;
 
 public slots:
     void record()
diff --git a/tests/auto/unit/mockbackend/mockmediarecorderservice.h b/tests/auto/unit/mockbackend/mockmediarecorderservice.h
index 87f9a7eff..ef519f634 100644
--- a/tests/auto/unit/mockbackend/mockmediarecorderservice.h
+++ b/tests/auto/unit/mockbackend/mockmediarecorderservice.h
@@ -55,9 +55,9 @@ public:
     {
     }
 
-    QCameraControl *cameraControl() override { return hasControls ? mockCameraControl : nullptr; }
-    QCameraImageCaptureControl *imageCaptureControl() override { return hasControls ? mockCaptureControl : nullptr; }
-    QMediaRecorderControl *mediaRecorderControl() override { return hasControls ? mockControl : nullptr; }
+    QPlatformCamera *cameraControl() override { return hasControls ? mockCameraControl : nullptr; }
+    QPlatformCameraImageCapture *imageCaptureControl() override { return hasControls ? mockCaptureControl : nullptr; }
+    QPlatformMediaRecorder *mediaRecorderControl() override { return hasControls ? mockControl : nullptr; }
 
 
     static bool simpleCamera;
diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp
index 565d313ae..65f6f0384 100644
--- a/tests/auto/unit/mockbackend/qmockintegration.cpp
+++ b/tests/auto/unit/mockbackend/qmockintegration.cpp
@@ -63,7 +63,7 @@ QPlatformMediaDeviceManager *QMockIntegration::deviceManager()
     return m_manager;
 }
 
-QAudioDecoderControl *QMockIntegration::createAudioDecoder()
+QPlatformAudioDecoder *QMockIntegration::createAudioDecoder()
 {
     if (m_flags & NoAudioDecoderInterface)
         m_lastAudioDecoderControl = nullptr;
diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h
index 1c622bbf5..278b3d646 100644
--- a/tests/auto/unit/mockbackend/qmockintegration_p.h
+++ b/tests/auto/unit/mockbackend/qmockintegration_p.h
@@ -69,7 +69,7 @@ public:
     QPlatformMediaDeviceManager *deviceManager() override;
     QPlatformMediaFormatInfo *formatInfo() override { return nullptr; }
 
-    QAudioDecoderControl *createAudioDecoder() override;
+    QPlatformAudioDecoder *createAudioDecoder() override;
     QPlatformMediaPlayer *createPlayer() override;
     QPlatformMediaCapture *createCaptureInterface(QMediaRecorder::CaptureMode mode) override;
 
diff --git a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
index 9d8a25982..05b371d83 100644
--- a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
+++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
@@ -32,7 +32,7 @@
 #include <qaudioformat.h>
 
 #include <qmediarecorder.h>
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include <qaudiodeviceinfo.h>
 #include <qaudioinput.h>
 
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index debacb753..327787021 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -32,11 +32,11 @@
 #include <QDebug>
 
 #include <qabstractvideosurface.h>
-#include <qcameracontrol.h>
-#include <qcameraexposurecontrol.h>
-#include <qcamerafocuscontrol.h>
-#include <qcameraimagecapturecontrol.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamerafocus_p.h>
+#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 #include <qcamera.h>
 #include <qcamerainfo.h>
 #include <qcameraimagecapture.h>
@@ -93,9 +93,9 @@ private slots:
     void testMaxDigitalZoomChangedSignal();
     void testfocusZonesChangedSignal();
 
-    // Test cases for QCameraControl class.
+    // Test cases for QPlatformCamera class.
     void testCameraControl();
-    void testEnumsOfQCameraControl();
+    void testEnumsOfQPlatformCamera();
 
     // Test case for QCameraImageProcessing class
     void testContrast();
@@ -371,7 +371,7 @@ void tst_QCamera::testCameraWhiteBalance()
     service->mockImageProcessingControl->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFlash);
     service->mockImageProcessingControl->setSupportedWhiteBalanceModes(whiteBalanceModes);
     service->mockImageProcessingControl->setParameter(
-                QCameraImageProcessingControl::ColorTemperature,
+                QPlatformCameraImageProcessing::ColorTemperature,
                 QVariant(34));
 
     QCameraImageProcessing *cameraImageProcessing = camera.imageProcessing();
@@ -872,7 +872,7 @@ void tst_QCamera::testErrorSignal()
 
     QSignalSpy spyError(&camera, SIGNAL(errorOccurred(QCamera::Error)));
 
-    /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if the signal is emitted correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("Camera Error"));
 
     QVERIFY(spyError.count() == 1);
@@ -881,7 +881,7 @@ void tst_QCamera::testErrorSignal()
 
     spyError.clear();
 
-    /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if the signal is emitted correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("InvalidRequestError Error"));
     QVERIFY(spyError.count() == 1);
     err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0));
@@ -889,7 +889,7 @@ void tst_QCamera::testErrorSignal()
 
     spyError.clear();
 
-    /* Set the QCameraControl error and verify if the signal is emitted correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if the signal is emitted correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("NotSupportedFeatureError Error"));
     QVERIFY(spyError.count() == 1);
     err = qvariant_cast<QCamera::Error >(spyError.at(0).at(0));
@@ -903,15 +903,15 @@ void tst_QCamera::testError()
     QCamera camera;
     auto *service = integration->lastCaptureService();
 
-    /* Set the QCameraControl error and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if it is set correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("Camera Error"));
     QVERIFY(camera.error() == QCamera::CameraError);
 
-    /* Set the QCameraControl error and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if it is set correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("InvalidRequestError Error"));
     QVERIFY(camera.error() == QCamera::CameraError);
 
-    /* Set the QCameraControl error and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if it is set correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("CameraError Error"));
     QVERIFY(camera.error() == QCamera::CameraError);
 
@@ -923,15 +923,15 @@ void tst_QCamera::testErrorString()
     QCamera camera;
     auto *service = integration->lastCaptureService();
 
-    /* Set the QCameraControl error and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if it is set correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("Camera Error"));
     QVERIFY(camera.errorString() == QString("Camera Error"));
 
-    /* Set the QCameraControl error and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if it is set correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("InvalidRequestError Error"));
     QVERIFY(camera.errorString() == QString("InvalidRequestError Error"));
 
-    /* Set the QCameraControl error and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera error and verify if it is set correctly in QCamera */
     service->mockCameraControl->setError(QCamera::CameraError,QString("CameraError Error"));
     QVERIFY(camera.errorString() == QString("CameraError Error"));
 }
@@ -942,25 +942,25 @@ void tst_QCamera::testStatus()
     QCamera camera;
     auto *service = integration->lastCaptureService();
 
-    /* Set the QCameraControl status and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
     service->mockCameraControl->setStatus(QCamera::StartingStatus);
     QVERIFY(camera.status() == QCamera::StartingStatus);
 
-    /* Set the QCameraControl status and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
     service->mockCameraControl->setStatus(QCamera::StandbyStatus);
     QVERIFY(camera.status() == QCamera::StandbyStatus);
 
-    /* Set the QCameraControl status and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
     service->mockCameraControl->setStatus(QCamera::LoadingStatus);
     QVERIFY(camera.status() == QCamera::LoadingStatus);
 
-    /* Set the QCameraControl status and verify if it is set correctly in QCamera */
+    /* Set the QPlatformCamera status and verify if it is set correctly in QCamera */
     service->mockCameraControl->setStatus(QCamera::UnavailableStatus);
     QVERIFY(camera.status() == QCamera::UnavailableStatus);
 }
 
-/* All the enums test case for QCameraControl class*/
-void tst_QCamera::testEnumsOfQCameraControl()
+/* All the enums test case for QPlatformCamera class*/
+void tst_QCamera::testEnumsOfQPlatformCamera()
 {
     MockCameraControl *m_cameraControl = new MockCameraControl(this);
     bool result;
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
index 71761b3e8..2054067cf 100644
--- a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
+++ b/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
@@ -39,11 +39,11 @@ Reviewer Name       Date                Coverage ( Full / Test Case IDs ).
 #include <QtTest/QtTest>
 #include <QDebug>
 
-#include <qcameracontrol.h>
-#include <qcameraexposurecontrol.h>
-#include <qcamerafocuscontrol.h>
-#include <qcameraimagecapturecontrol.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamerafocus_p.h>
+#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 #include <qcamera.h>
 #include <qcameraimagecapture.h>
 
diff --git a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp
index fcc7d556d..8ef495ddc 100644
--- a/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp
+++ b/tests/auto/unit/multimedia/qmediarecorder/tst_qmediarecorder.cpp
@@ -31,7 +31,7 @@
 #include <QtTest/QtTest>
 #include <QDebug>
 #include <QtMultimedia/qmediametadata.h>
-#include <qmediarecordercontrol.h>
+#include <private/qplatformmediarecorder_p.h>
 #include <qmediarecorder.h>
 #include <qaudioformat.h>
 #include <qmockintegration_p.h>
diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
index 0fa8f790b..a41675cd1 100644
--- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -32,11 +32,11 @@
 #include <QDebug>
 
 #include <qabstractvideosurface.h>
-#include <qcameracontrol.h>
-#include <qcameraexposurecontrol.h>
-#include <qcamerafocuscontrol.h>
-#include <qcameraimagecapturecontrol.h>
-#include <qcameraimageprocessingcontrol.h>
+#include <private/qplatformcamera_p.h>
+#include <private/qplatformcameraexposure_p.h>
+#include <private/qplatformcamerafocus_p.h>
+#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformcameraimageprocessing_p.h>
 #include <qcamera.h>
 #include <qcameraimagecapture.h>
 #include <qgraphicsvideoitem.h>
diff --git a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
index 2b1ed65c2..686800254 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 <qplatformmediaplayer_p.h>
+#include <private/qplatformmediaplayer_p.h>
 #include <qmediaservice.h>
 #include <qvideorenderercontrol.h>
 #include <qvideowindowcontrol.h>
author	Doris Verria <doris.verria@qt.io>	2021-02-24 18:29:56 +0100
committer	Lars Knoll <lars.knoll@qt.io>	2021-03-05 12:34:22 +0000
commit	967570004e2a0dde043970021c5c32312feee4ed (patch)
tree	f0a1fb6aa47eb9f21937a4334b2d441d80e58a4b
parent	55928daa35a34dcd9b2e281bd449744e6bc6bad3 (diff)