Rename QCameraImageCapture to QImageCapture

Fixup the backend class and file names while we're at it. Change-Id: Ib0928dfebb6f127b7a43683b2907420c95af6599 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
author: Lars Knoll <lars.knoll@qt.io> 2021-06-15 16:09:34 +0200
committer: Lars Knoll <lars.knoll@qt.io> 2021-06-17 13:40:52 +0200
commit: 83a031c56b74d68fe6d349f78c48a1681e40374e (patch)
tree: fd4cd75d49009ed21c525564070c11492645afe2
parent: 8fc76abb75b8a97bb5ef695d4bc8d59c6ef0c0b5 (diff)
76 files changed, 474 insertions, 475 deletions
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 63efc4ba8..f8437ba4d 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -63,7 +63,7 @@
 #include <qaudiodevice.h>
 #include <qaudiobuffer.h>
 #include <qaudioinput.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 
 static QList<qreal> getBufferLevels(const QAudioBuffer &buffer);
 
@@ -114,8 +114,8 @@ AudioRecorder::AudioRecorder()
     ui->channelsBox->addItem(QStringLiteral("4"), QVariant(4));
 
     //quality
-    ui->qualitySlider->setRange(0, int(QCameraImageCapture::VeryHighQuality));
-    ui->qualitySlider->setValue(int(QCameraImageCapture::NormalQuality));
+    ui->qualitySlider->setRange(0, int(QImageCapture::VeryHighQuality));
+    ui->qualitySlider->setValue(int(QImageCapture::NormalQuality));
 
     //bitrates:
     ui->bitrateBox->addItem(tr("Default"), QVariant(0));
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 043afeb29..89667ab43 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -105,7 +105,7 @@ void Camera::setCamera(const QCameraDevice &cameraDevice)
     m_captureSession.setEncoder(m_mediaEncoder.data());
     connect(m_mediaEncoder.data(), &QMediaRecorder::recorderStateChanged, this, &Camera::updateRecorderState);
 
-    m_imageCapture = new QCameraImageCapture;
+    m_imageCapture = new QImageCapture;
     m_captureSession.setImageCapture(m_imageCapture);
 
     connect(m_mediaEncoder.data(), &QMediaRecorder::durationChanged, this, &Camera::updateRecordTime);
@@ -118,10 +118,10 @@ void Camera::setCamera(const QCameraDevice &cameraDevice)
     updateCameraActive(m_camera->isActive());
     updateRecorderState(m_mediaEncoder->recorderState());
 
-    connect(m_imageCapture, &QCameraImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
-    connect(m_imageCapture, &QCameraImageCapture::imageCaptured, this, &Camera::processCapturedImage);
-    connect(m_imageCapture, &QCameraImageCapture::imageSaved, this, &Camera::imageSaved);
-    connect(m_imageCapture, &QCameraImageCapture::errorOccurred, this, &Camera::displayCaptureError);
+    connect(m_imageCapture, &QImageCapture::readyForCaptureChanged, this, &Camera::readyForCapture);
+    connect(m_imageCapture, &QImageCapture::imageCaptured, this, &Camera::processCapturedImage);
+    connect(m_imageCapture, &QImageCapture::imageSaved, this, &Camera::imageSaved);
+    connect(m_imageCapture, &QImageCapture::errorOccurred, this, &Camera::displayCaptureError);
     readyForCapture(m_imageCapture->isReadyForCapture());
 
     updateCaptureMode();
@@ -233,7 +233,7 @@ void Camera::takeImage()
     m_imageCapture->captureToFile();
 }
 
-void Camera::displayCaptureError(int id, const QCameraImageCapture::Error error, const QString &errorString)
+void Camera::displayCaptureError(int id, const QImageCapture::Error error, const QString &errorString)
 {
     Q_UNUSED(id);
     Q_UNUSED(error);
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index c165aa201..d5920a0f3 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -52,7 +52,7 @@
 #define CAMERA_H
 
 #include <QCamera>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QMediaRecorder>
 #include <QScopedPointer>
 #include <QMediaMetaData>
@@ -91,7 +91,7 @@ private slots:
     void setMuted(bool);
 
     void takeImage();
-    void displayCaptureError(int, QCameraImageCapture::Error, const QString &errorString);
+    void displayCaptureError(int, QImageCapture::Error, const QString &errorString);
 
     void configureCaptureSettings();
     void configureVideoSettings();
@@ -135,7 +135,7 @@ private:
     QMediaCaptureSession m_captureSession;
     QScopedPointer<QCamera> m_camera;
     QScopedPointer<QAudioInput> m_audioInput;
-    QCameraImageCapture *m_imageCapture;
+    QImageCapture *m_imageCapture;
     QScopedPointer<QMediaRecorder> m_mediaEncoder;
 
     bool m_isCapturingImage = false;
diff --git a/examples/multimediawidgets/camera/doc/src/camera.qdoc b/examples/multimediawidgets/camera/doc/src/camera.qdoc
index 68e19aac3..476eef085 100644
--- a/examples/multimediawidgets/camera/doc/src/camera.qdoc
+++ b/examples/multimediawidgets/camera/doc/src/camera.qdoc
@@ -48,7 +48,7 @@ the image or video clip is to be saved. It will also store the image and video
 settings.
 
 The Camera class contains an instance of \l {QCamera}, the API class interface to
-the hardware. It also has an instance of \l {QCameraImageCapture} to take still images
+the hardware. It also has an instance of \l {QImageCapture} to take still images
 and an instance of \l {QMediaRecorder} to record video. It also contains the user
 interface object.
 
@@ -59,7 +59,7 @@ the \e{setCamera()} function is called, passing in a \l {QByteArray}.
 
 \e{setCamera()} sets up various connections between the user interface and the functionality
 of the Camera class using signals and slots. It also instantiates and initializes the \l {QCamera},
-\l {QCameraImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
+\l {QImageCapture} and \l {QMediaRecorder} objects mentioned above. The still
 and video recording visual tabs are enabled and finally the
 \l {QCamera::start()}{start()} function of the \l{QCamera} object is called.
 
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
index fa619638d..a14e519e7 100644
--- a/examples/multimediawidgets/camera/imagesettings.cpp
+++ b/examples/multimediawidgets/camera/imagesettings.cpp
@@ -53,11 +53,11 @@
 
 #include <QComboBox>
 #include <QDebug>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QCamera>
 #include <QMediaCaptureSession>
 
-ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent) :
+ImageSettings::ImageSettings(QImageCapture *imageCapture, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::ImageSettingsUi),
     imagecapture(imageCapture)
@@ -66,13 +66,13 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
 
     //image codecs
     ui->imageCodecBox->addItem(tr("Default image format"), QVariant(QString()));
-    const auto supportedImageFormats = QCameraImageCapture::supportedFormats();
+    const auto supportedImageFormats = QImageCapture::supportedFormats();
     for (const auto &f : supportedImageFormats) {
-        QString description = QCameraImageCapture::fileFormatDescription(f);
-        ui->imageCodecBox->addItem(QCameraImageCapture::fileFormatName(f) + ": " + description, QVariant::fromValue(f));
+        QString description = QImageCapture::fileFormatDescription(f);
+        ui->imageCodecBox->addItem(QImageCapture::fileFormatName(f) + ": " + description, QVariant::fromValue(f));
     }
 
-    ui->imageQualitySlider->setRange(0, int(QCameraImageCapture::VeryHighQuality));
+    ui->imageQualitySlider->setRange(0, int(QImageCapture::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
     const QList<QSize> supportedResolutions = imagecapture->captureSession()->camera()->cameraDevice().photoResolutions();
@@ -105,8 +105,8 @@ void ImageSettings::changeEvent(QEvent *e)
 
 void ImageSettings::applyImageSettings() const
 {
-    imagecapture->setFileFormat(boxValue(ui->imageCodecBox).value<QCameraImageCapture::FileFormat>());
-    imagecapture->setQuality(QCameraImageCapture::Quality(ui->imageQualitySlider->value()));
+    imagecapture->setFileFormat(boxValue(ui->imageCodecBox).value<QImageCapture::FileFormat>());
+    imagecapture->setQuality(QImageCapture::Quality(ui->imageQualitySlider->value()));
     imagecapture->setResolution(boxValue(ui->imageResolutionBox).toSize());
 }
 
diff --git a/examples/multimediawidgets/camera/imagesettings.h b/examples/multimediawidgets/camera/imagesettings.h
index c155c5531..6564bd91c 100644
--- a/examples/multimediawidgets/camera/imagesettings.h
+++ b/examples/multimediawidgets/camera/imagesettings.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
-class QCameraImageCapture;
+class QImageCapture;
 namespace Ui { class ImageSettingsUi; }
 QT_END_NAMESPACE
 
@@ -64,7 +64,7 @@ class ImageSettings : public QDialog
     Q_OBJECT
 
 public:
-    explicit ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent = nullptr);
+    explicit ImageSettings(QImageCapture *imageCapture, QWidget *parent = nullptr);
     ~ImageSettings();
 
     void applyImageSettings() const;
@@ -80,7 +80,7 @@ private:
     void selectComboBoxItem(QComboBox *box, const QVariant &value);
 
     Ui::ImageSettingsUi *ui;
-    QCameraImageCapture *imagecapture;
+    QImageCapture *imagecapture;
 };
 
 #endif // IMAGESETTINGS_H
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index 6be6e195b..4fbccc672 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -30,12 +30,12 @@ qt_internal_add_module(Multimedia
         audio/qwavedecoder.cpp audio/qwavedecoder.h
         camera/qcamera.cpp camera/qcamera.h camera/qcamera_p.h
         camera/qcameradevice.cpp camera/qcameradevice.h camera/qcameradevice_p.h
-        camera/qcameraimagecapture.cpp camera/qcameraimagecapture.h
+        camera/qimagecapture.cpp camera/qimagecapture.h
         platform/qplatformaudiodecoder.cpp platform/qplatformaudiodecoder_p.h
         platform/qplatformaudioinput_p.h
         platform/qplatformaudiooutput_p.h
         platform/qplatformcamera.cpp platform/qplatformcamera_p.h
-        platform/qplatformcameraimagecapture.cpp platform/qplatformcameraimagecapture_p.h
+        platform/qplatformimagecapture.cpp platform/qplatformimagecapture_p.h
         platform/qplatformmediacapture.cpp platform/qplatformmediacapture_p.h
         platform/qplatformmediadevices.cpp platform/qplatformmediadevices_p.h
         platform/qplatformmediaencoder.cpp platform/qplatformmediaencoder_p.h
@@ -154,9 +154,9 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
         platform/windows/player/mfvideorenderercontrol.cpp platform/windows/player/mfvideorenderercontrol_p.h
         platform/windows/player/samplegrabber.cpp platform/windows/player/samplegrabber_p.h
         platform/windows/mediacapture/qwindowscamera.cpp
-        platform/windows/mediacapture/qwindowscameraimagecapture.cpp
-        platform/windows/mediacapture/qwindowscameraimagecapture_p.h
         platform/windows/mediacapture/qwindowscamera_p.h
+        platform/windows/mediacapture/qwindowsimagecapture.cpp
+        platform/windows/mediacapture/qwindowsimagecapture_p.h
         platform/windows/mediacapture/qwindowsmediacapture.cpp
         platform/windows/mediacapture/qwindowsmediacapture_p.h
         platform/windows/mediacapture/qwindowsmediadevicereader.cpp
@@ -228,8 +228,8 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
         platform/gstreamer/qgstreamerformatinfo.cpp platform/gstreamer/qgstreamerformatinfo_p.h
         platform/gstreamer/qgstreamerintegration.cpp platform/gstreamer/qgstreamerintegration_p.h
         platform/gstreamer/mediacapture/qgstreamercamera.cpp platform/gstreamer/mediacapture/qgstreamercamera_p.h
+        platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp platform/gstreamer/mediacapture/qgstreamerimagecapture_p.h
         platform/gstreamer/mediacapture/qgstreamermediacapture.cpp platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
-        platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h
         platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp platform/gstreamer/mediacapture/qgstreamermediaencoder_p.h
     DEFINES
         GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26
@@ -307,7 +307,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID
         platform/android/common/qandroidmultimediautils.cpp platform/android/common/qandroidmultimediautils_p.h
         platform/android/common/qandroidvideooutput.cpp platform/android/common/qandroidvideooutput_p.h
         platform/android/mediacapture/qandroidcameracontrol.cpp platform/android/mediacapture/qandroidcameracontrol_p.h
-        platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
+        platform/android/mediacapture/qandroidimagecapture.cpp platform/android/mediacapture/qandroidimagecapture_p.h
         platform/android/mediacapture/qandroidcamerasession.cpp platform/android/mediacapture/qandroidcamerasession_p.h
         platform/android/mediacapture/qandroidcameravideorenderercontrol.cpp platform/android/mediacapture/qandroidcameravideorenderercontrol_p.h
         platform/android/mediacapture/qandroidcaptureservice.cpp platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -403,7 +403,7 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT TVOS AND NOT WATCHO
         platform/darwin/camera/avfcameraservice.mm platform/darwin/camera/avfcameraservice_p.h
         platform/darwin/camera/avfcamerasession.mm platform/darwin/camera/avfcamerasession_p.h
         platform/darwin/camera/avfcamerautility.mm platform/darwin/camera/avfcamerautility_p.h
-        platform/darwin/camera/avfcameraimagecapture.mm platform/darwin/camera/avfcameraimagecapture_p.h
+        platform/darwin/camera/avfimagecapture.mm platform/darwin/camera/avfimagecapture_p.h
         platform/darwin/camera/avfstoragelocation.mm platform/darwin/camera/avfstoragelocation_p.h
 )
 
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 4c867233d..5fca81320 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -42,7 +42,7 @@
 
 #include <qcameradevice.h>
 #include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include <private/qplatformmediaintegration_p.h>
 #include <private/qplatformmediacapture_p.h>
 #include <qmediadevices.h>
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qimagecapture.cpp
index 107688600..7b1a34920 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qimagecapture.cpp
@@ -36,8 +36,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qcameraimagecapture.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <qimagecapture.h>
+#include <private/qplatformimagecapture_p.h>
 #include <qmediametadata.h>
 #include <private/qplatformmediacapture_p.h>
 #include <private/qplatformmediaintegration_p.h>
@@ -55,15 +55,15 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QCameraImageCapture
+    \class QImageCapture
     \inmodule QtMultimedia
     \ingroup multimedia
     \ingroup multimedia_camera
 
 
-    \brief The QCameraImageCapture class is used for the recording of media content.
+    \brief The QImageCapture class is used for the recording of media content.
 
-    The QCameraImageCapture class is a high level images recording class.
+    The QImageCapture class is a high level images recording class.
     It's not intended to be used alone but for accessing the media
     recording functions of other media objects, like QCamera.
 
@@ -74,31 +74,31 @@ QT_BEGIN_NAMESPACE
     \sa QCamera
 */
 
-class QCameraImageCapturePrivate
+class QImageCapturePrivate
 {
-    Q_DECLARE_PUBLIC(QCameraImageCapture)
+    Q_DECLARE_PUBLIC(QImageCapture)
 public:
     QCamera *camera = nullptr;
 
     QMediaCaptureSession *captureSession = nullptr;
-    QPlatformCameraImageCapture *control = nullptr;
+    QPlatformImageCapture *control = nullptr;
 
-    QCameraImageCapture::Error error = QCameraImageCapture::NoError;
+    QImageCapture::Error error = QImageCapture::NoError;
     QString errorString;
     QMediaMetaData metaData;
 
     void _q_error(int id, int error, const QString &errorString);
 
-    void unsetError() { error = QCameraImageCapture::NoError; errorString.clear(); }
+    void unsetError() { error = QImageCapture::NoError; errorString.clear(); }
 
-    QCameraImageCapture *q_ptr;
+    QImageCapture *q_ptr;
 };
 
-void QCameraImageCapturePrivate::_q_error(int id, int error, const QString &errorString)
+void QImageCapturePrivate::_q_error(int id, int error, const QString &errorString)
 {
-    Q_Q(QCameraImageCapture);
+    Q_Q(QImageCapture);
 
-    this->error = QCameraImageCapture::Error(error);
+    this->error = QImageCapture::Error(error);
     this->errorString = errorString;
 
     emit q->errorChanged();
@@ -111,17 +111,17 @@ void QCameraImageCapturePrivate::_q_error(int id, int error, const QString &erro
     Connect both an image capture object and a QCamera to a capture session to capture images.
 */
 
-QCameraImageCapture::QCameraImageCapture(QObject *parent)
-    : QObject(parent), d_ptr(new QCameraImageCapturePrivate)
+QImageCapture::QImageCapture(QObject *parent)
+    : QObject(parent), d_ptr(new QImageCapturePrivate)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     d->q_ptr = this;
     d->control = QPlatformMediaIntegration::instance()->createImageCapture(this);
 }
 
-void QCameraImageCapture::setCaptureSession(QMediaCaptureSession *session)
+void QImageCapture::setCaptureSession(QMediaCaptureSession *session)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     d->captureSession = session;
 
     QPlatformMediaCaptureSession *platformSession = session ? session->platformSession() : nullptr;
@@ -152,7 +152,7 @@ void QCameraImageCapture::setCaptureSession(QMediaCaptureSession *session)
     Destroys images capture object.
 */
 
-QCameraImageCapture::~QCameraImageCapture()
+QImageCapture::~QImageCapture()
 {
     if (d_ptr->captureSession) {
         d_ptr->captureSession->platformSession()->setImageCapture(nullptr);
@@ -164,7 +164,7 @@ QCameraImageCapture::~QCameraImageCapture()
 /*!
     Returns true if the images capture service ready to use.
 */
-bool QCameraImageCapture::isAvailable() const
+bool QImageCapture::isAvailable() const
 {
     return d_func()->control != nullptr && d_func()->captureSession->camera();
 }
@@ -176,7 +176,7 @@ bool QCameraImageCapture::isAvailable() const
     Use QMediaCaptureSession::setImageCapture() to connect the image capture to
     a session.
 */
-QMediaCaptureSession *QCameraImageCapture::captureSession() const
+QMediaCaptureSession *QImageCapture::captureSession() const
 {
     return d_ptr->captureSession;
 }
@@ -187,7 +187,7 @@ QMediaCaptureSession *QCameraImageCapture::captureSession() const
     \sa errorString()
 */
 
-QCameraImageCapture::Error QCameraImageCapture::error() const
+QImageCapture::Error QImageCapture::error() const
 {
     return d_func()->error;
 }
@@ -198,7 +198,7 @@ QCameraImageCapture::Error QCameraImageCapture::error() const
     \sa error()
 */
 
-QString QCameraImageCapture::errorString() const
+QString QImageCapture::errorString() const
 {
     return d_func()->errorString;
 }
@@ -207,18 +207,18 @@ QString QCameraImageCapture::errorString() const
     Returns the meta data that will get embedded into the image. A couple of additional fields
     such as a time stamp or location might get added by the camera backend.
 */
-QMediaMetaData QCameraImageCapture::metaData() const
+QMediaMetaData QImageCapture::metaData() const
 {
-    Q_D(const QCameraImageCapture);
+    Q_D(const QImageCapture);
     return d->metaData;
 }
 
 /*!
     Defines a set of meta data that will get embedded into the captured image.
 */
-void QCameraImageCapture::setMetaData(const QMediaMetaData &metaData)
+void QImageCapture::setMetaData(const QMediaMetaData &metaData)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     d->metaData = metaData;
     d->control->setMetaData(d->metaData);
     emit metaDataChanged();
@@ -227,9 +227,9 @@ void QCameraImageCapture::setMetaData(const QMediaMetaData &metaData)
 /*!
     Adds additional meta data to be embedded into the captured image.
 */
-void QCameraImageCapture::addMetaData(const QMediaMetaData &metaData)
+void QImageCapture::addMetaData(const QMediaMetaData &metaData)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     auto data = d->metaData;
     for (auto k : metaData.keys())
         data.insert(k, metaData.value(k));
@@ -237,16 +237,16 @@ void QCameraImageCapture::addMetaData(const QMediaMetaData &metaData)
 }
 
 /*!
-  \property QCameraImageCapture::readyForCapture
+  \property QImageCapture::readyForCapture
   \brief whether the service is ready to capture a an image immediately.
 
   Calling capture() while \e readyForCapture is \c false is not permitted and
   results in an error.
 */
 
-bool QCameraImageCapture::isReadyForCapture() const
+bool QImageCapture::isReadyForCapture() const
 {
-    Q_D(const QCameraImageCapture);
+    Q_D(const QImageCapture);
     if (!d->control || !d->captureSession || !d->control->isReadyForCapture())
         return false;
     auto *camera = d->captureSession->camera();
@@ -256,7 +256,7 @@ bool QCameraImageCapture::isReadyForCapture() const
 }
 
 /*!
-    \fn QCameraImageCapture::readyForCaptureChanged(bool ready)
+    \fn QImageCapture::readyForCaptureChanged(bool ready)
 
     Signals that a camera's \a ready for capture state has changed.
 */
@@ -265,9 +265,9 @@ bool QCameraImageCapture::isReadyForCapture() const
 /*!
     Capture the image and save it to \a file.
     This operation is asynchronous in majority of cases,
-    followed by signals QCameraImageCapture::imageExposed(),
-    QCameraImageCapture::imageCaptured(), QCameraImageCapture::imageSaved()
-    or QCameraImageCapture::error().
+    followed by signals QImageCapture::imageExposed(),
+    QImageCapture::imageCaptured(), QImageCapture::imageSaved()
+    or QImageCapture::error().
 
     If an empty \a file is passed, the camera backend choses
     the default location and naming scheme for photos on the system,
@@ -278,14 +278,14 @@ bool QCameraImageCapture::isReadyForCapture() const
     image processing parameters, so changes to camera parameters after
     capture() is called do not affect previous capture requests.
 
-    QCameraImageCapture::capture returns the capture Id parameter, used with
+    QImageCapture::capture returns the capture Id parameter, used with
     imageExposed(), imageCaptured() and imageSaved() signals.
 
     \sa isReadyForCapture()
 */
-int QCameraImageCapture::captureToFile(const QString &file)
+int QImageCapture::captureToFile(const QString &file)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
 
     d->unsetError();
 
@@ -305,18 +305,18 @@ int QCameraImageCapture::captureToFile(const QString &file)
 /*!
     Capture the image and make it available as a QImage.
     This operation is asynchronous in majority of cases,
-    followed by signals QCameraImageCapture::imageExposed(),
-    QCameraImageCapture::imageCaptured()
-    or QCameraImageCapture::error().
+    followed by signals QImageCapture::imageExposed(),
+    QImageCapture::imageCaptured()
+    or QImageCapture::error().
 
-    QCameraImageCapture::capture returns the capture Id parameter, used with
+    QImageCapture::capture returns the capture Id parameter, used with
     imageExposed(), imageCaptured() and imageSaved() signals.
 
     \sa isReadyForCapture()
 */
-int QCameraImageCapture::capture()
+int QImageCapture::capture()
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
 
     d->unsetError();
 
@@ -332,7 +332,7 @@ int QCameraImageCapture::capture()
 }
 
 /*!
-    \enum QCameraImageCapture::Error
+    \enum QImageCapture::Error
 
     \value NoError         No Errors.
     \value NotReadyError   The service is not ready for capture yet.
@@ -343,33 +343,33 @@ int QCameraImageCapture::capture()
 */
 
 /*!
-    \fn QCameraImageCapture::error(int id, QCameraImageCapture::Error error, const QString &errorString)
+    \fn QImageCapture::error(int id, QImageCapture::Error error, const QString &errorString)
 
     Signals that the capture request \a id has failed with an \a error
     and \a errorString description.
 */
 
 /*!
-    \fn QCameraImageCapture::bufferFormatChanged(QVideoFrameFormat::PixelFormat format)
+    \fn QImageCapture::bufferFormatChanged(QVideoFrameFormat::PixelFormat format)
 
     Signal emitted when the buffer \a format for the buffer image capture has changed.
 */
 
 /*!
-    \fn QCameraImageCapture::imageExposed(int id)
+    \fn QImageCapture::imageExposed(int id)
 
     Signal emitted when the frame with request \a id was exposed.
 */
 
 /*!
-    \fn QCameraImageCapture::imageCaptured(int id, const QImage &preview);
+    \fn QImageCapture::imageCaptured(int id, const QImage &preview);
 
     Signal emitted when the frame with request \a id was captured, but not
     processed and saved yet. Frame \a preview can be displayed to user.
 */
 
 /*!
-    \fn QCameraImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)
+    \fn QImageCapture::imageMetadataAvailable(int id, const QString &key, const QVariant &value)
 
     Signals that a metadata for an image with request \a id is available. Also
     includes the \a key and \a value of the metadata.
@@ -378,16 +378,16 @@ int QCameraImageCapture::capture()
 */
 
 /*!
-    \fn QCameraImageCapture::imageAvailable(int id, const QVideoFrame &frame)
+    \fn QImageCapture::imageAvailable(int id, const QVideoFrame &frame)
 
-    Signal emitted when QCameraImageCapture::CaptureToBuffer is set and
+    Signal emitted when QImageCapture::CaptureToBuffer is set and
     the \a frame with request \a id is available.
 */
 
 /*!
-    \fn QCameraImageCapture::imageSaved(int id, const QString &fileName)
+    \fn QImageCapture::imageSaved(int id, const QString &fileName)
 
-    Signal emitted when QCameraImageCapture::CaptureToFile is set and
+    Signal emitted when QImageCapture::CaptureToFile is set and
     the frame with request \a id was saved to \a fileName.
 */
 
@@ -395,9 +395,9 @@ int QCameraImageCapture::capture()
     Returns the image format.
 */
 
-QCameraImageCapture::FileFormat QCameraImageCapture::fileFormat() const
+QImageCapture::FileFormat QImageCapture::fileFormat() const
 {
-    Q_D(const QCameraImageCapture);
+    Q_D(const QImageCapture);
     if (!d->control)
         return UnspecifiedFormat;
     return d->control->imageSettings().format();
@@ -406,9 +406,9 @@ QCameraImageCapture::FileFormat QCameraImageCapture::fileFormat() const
 /*!
     Sets the image \a format.
 */
-void QCameraImageCapture::setFileFormat(QCameraImageCapture::FileFormat format)
+void QImageCapture::setFileFormat(QImageCapture::FileFormat format)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     if (!d->control)
         return;
     auto fmt = d->control->imageSettings();
@@ -419,12 +419,12 @@ void QCameraImageCapture::setFileFormat(QCameraImageCapture::FileFormat format)
     emit fileFormatChanged();
 }
 
-QList<QCameraImageCapture::FileFormat> QCameraImageCapture::supportedFormats()
+QList<QImageCapture::FileFormat> QImageCapture::supportedFormats()
 {
     return QPlatformMediaIntegration::instance()->formatInfo()->imageFormats;
 }
 
-QString QCameraImageCapture::fileFormatName(QCameraImageCapture::FileFormat f)
+QString QImageCapture::fileFormatName(QImageCapture::FileFormat f)
 {
     const char *name = nullptr;
     switch (f) {
@@ -447,7 +447,7 @@ QString QCameraImageCapture::fileFormatName(QCameraImageCapture::FileFormat f)
     return QString::fromUtf8(name);
 }
 
-QString QCameraImageCapture::fileFormatDescription(QCameraImageCapture::FileFormat f)
+QString QImageCapture::fileFormatDescription(QImageCapture::FileFormat f)
 {
     const char *name = nullptr;
     switch (f) {
@@ -474,9 +474,9 @@ QString QCameraImageCapture::fileFormatDescription(QCameraImageCapture::FileForm
     Returns the resolution of the encoded image.
 */
 
-QSize QCameraImageCapture::resolution() const
+QSize QImageCapture::resolution() const
 {
-    Q_D(const QCameraImageCapture);
+    Q_D(const QImageCapture);
     if (!d->control)
         return QSize();
     return d->control->imageSettings().resolution();
@@ -488,9 +488,9 @@ QSize QCameraImageCapture::resolution() const
     An empty QSize indicates the encoder should make an optimal choice based on
     what is available from the image source and the limitations of the codec.
 */
-void QCameraImageCapture::setResolution(const QSize &resolution)
+void QImageCapture::setResolution(const QSize &resolution)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     if (!d->control)
         return;
     auto fmt = d->control->imageSettings();
@@ -506,13 +506,13 @@ void QCameraImageCapture::setResolution(const QSize &resolution)
 
     \overload
 */
-void QCameraImageCapture::setResolution(int width, int height)
+void QImageCapture::setResolution(int width, int height)
 {
     setResolution(QSize(width, height));
 }
 
 /*!
-    \enum QCameraImageCapture::EncodingQuality
+    \enum QImageCapture::EncodingQuality
 
     Enumerates quality encoding levels.
 
@@ -526,9 +526,9 @@ void QCameraImageCapture::setResolution(int width, int height)
 /*!
     Returns the image encoding quality.
 */
-QCameraImageCapture::Quality QCameraImageCapture::quality() const
+QImageCapture::Quality QImageCapture::quality() const
 {
-    Q_D(const QCameraImageCapture);
+    Q_D(const QImageCapture);
     if (!d->control)
         return NormalQuality;
     return d->control->imageSettings().quality();
@@ -537,9 +537,9 @@ QCameraImageCapture::Quality QCameraImageCapture::quality() const
 /*!
     Sets the image encoding \a quality.
 */
-void QCameraImageCapture::setQuality(Quality quality)
+void QImageCapture::setQuality(Quality quality)
 {
-    Q_D(QCameraImageCapture);
+    Q_D(QImageCapture);
     if (!d->control)
         return;
     auto fmt = d->control->imageSettings();
@@ -552,4 +552,4 @@ void QCameraImageCapture::setQuality(Quality quality)
 
 QT_END_NAMESPACE
 
-#include "moc_qcameraimagecapture.cpp"
+#include "moc_qimagecapture.cpp"
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qimagecapture.h
index 20b2bd6d1..ec52fd818 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qimagecapture.h
@@ -57,8 +57,8 @@ class QImageEncoderSettings;
 class QCamera;
 class QMediaCaptureSession;
 
-class QCameraImageCapturePrivate;
-class Q_MULTIMEDIA_EXPORT QCameraImageCapture : public QObject
+class QImageCapturePrivate;
+class Q_MULTIMEDIA_EXPORT QImageCapture : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool readyForCapture READ isReadyForCapture NOTIFY readyForCaptureChanged)
@@ -99,8 +99,8 @@ public:
     };
     Q_ENUM(FileFormat)
 
-    explicit QCameraImageCapture(QObject *parent = nullptr);
-    ~QCameraImageCapture();
+    explicit QImageCapture(QObject *parent = nullptr);
+    ~QImageCapture();
 
     bool isAvailable() const;
 
@@ -135,7 +135,7 @@ public Q_SLOTS:
 
 Q_SIGNALS:
     void errorChanged();
-    void errorOccurred(int id, QCameraImageCapture::Error error, const QString &errorString);
+    void errorOccurred(int id, QImageCapture::Error error, const QString &errorString);
 
     void readyForCaptureChanged(bool ready);
     void metaDataChanged();
@@ -152,19 +152,19 @@ Q_SIGNALS:
 
 private:
     // This is here to flag an incompatibilities with Qt 5
-    QCameraImageCapture(QCamera *) = delete;
+    QImageCapture(QCamera *) = delete;
 
     friend class QMediaCaptureSession;
     void setCaptureSession(QMediaCaptureSession *session);
-    QCameraImageCapturePrivate *d_ptr;
-    Q_DISABLE_COPY(QCameraImageCapture)
-    Q_DECLARE_PRIVATE(QCameraImageCapture)
+    QImageCapturePrivate *d_ptr;
+    Q_DISABLE_COPY(QImageCapture)
+    Q_DECLARE_PRIVATE(QImageCapture)
     Q_PRIVATE_SLOT(d_func(), void _q_error(int, int, const QString &))
 };
 
 QT_END_NAMESPACE
 
-Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error)
+Q_MEDIA_ENUM_DEBUG(QImageCapture, Error)
 
 #endif
 
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 0407be1aa..fa2ca6d25 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -44,7 +44,7 @@
 #include "qmediarecorder.h"
 #include "qmediadevices.h"
 #include "qmediacapturesession.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
 #include "qvideosink.h"
 #include <QtMultimediaWidgets/qvideowidget.h>
 #include <QtGui/qscreen.h>
@@ -54,7 +54,7 @@
 /* Globals so that everything is consistent. */
 QCamera *camera = 0;
 QMediaRecorder *recorder = 0;
-QCameraImageCapture *imageCapture = 0;
+QImageCapture *imageCapture = 0;
 
 //! [Camera overview check]
 bool checkCameraAvailability()
@@ -135,7 +135,7 @@ void overview_still()
     QMediaCaptureSession captureSession;
     camera = new QCamera;
     captureSession.setCamera(camera);
-    imageCapture = new QCameraImageCapture(camera);
+    imageCapture = new QImageCapture(camera);
     captureSession.setImageCapture(imageCapture);
 
     camera->start(); // Viewfinder frames start flowing
@@ -216,7 +216,7 @@ void camera_blah()
     preview->show();
     captureSession.setVideoOutput(preview);
 
-    imageCapture = new QCameraImageCapture(camera);
+    imageCapture = new QImageCapture(camera);
     captureSession.setImageCapture(imageCapture);
 
     camera->start();
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
index fd76e679e..1e905484e 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/media.cpp
@@ -47,7 +47,7 @@
 #include "qplatformmediaplayer_p.h"
 #include "qmediaplayer.h"
 #include "qvideowidget.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
 #include "qcamera.h"
 #include "qcameraviewfinder.h"
 #include "qaudiorecorder.h"
@@ -73,7 +73,7 @@ private:
     QMediaRecorder *recorder;
     QCamera *camera;
     QCameraViewfinder *viewfinder;
-    QCameraImageCapture *imageCapture;
+    QImageCapture *imageCapture;
     QString fileName;
 
     QMediaContent image1;
@@ -100,7 +100,7 @@ void MediaExample::recorderSettings()
 void MediaExample::imageSettings()
 {
     //! [Image encoder settings]
-    imageCapture->setFileFormat(QCameraImageCapture::JPEG);
+    imageCapture->setFileFormat(QImageCapture::JPEG);
     imageCapture->setResolution(1600, 1200);
     //! [Image encoder settings]
 }
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 001ca1832..09c7f3632 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -196,7 +196,7 @@ account the camera sensor orientation and the current display orientation.
 \section2 Still Images
 
 After setting up a viewfinder and finding something photogenic,
-to capture an image we need to initialize a new QCameraImageCapture
+to capture an image we need to initialize a new QImageCapture
 object. All that is then needed is to start the camera and capture the image.
 
     \snippet multimedia-snippets/camera.cpp Camera overview capture
@@ -276,7 +276,7 @@ Various operations such as image capture and auto focusing occur
 asynchrously. These operations can often be canceled by the start of a new
 operation as long as this is supported by the camera. For image capture,
 the operation can be canceled by calling
-\l {QCameraImageCapture::cancelCapture()}{cancelCapture()}. For AutoFocus,
+\l {QImageCapture::cancelCapture()}{cancelCapture()}. For AutoFocus,
 autoexposure or white balance cancellation can be done by calling
 \e {QCamera::unlock(QCamera::LockFocus)}.
 
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index c554d5898..d5f0322c3 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -132,7 +132,7 @@ For some quick recipes, look at the overviews above and consult this table:
         \li \l {Camera Example}{camera},
             \l {QML Camera Example}{declarative-camera}
         \li \l Camera
-        \li QCamera, QCameraImageCapture
+        \li QCamera, QImageCapture
     \row
         \li Capturing movies
         \li \l {Camera Example}{camera},
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc
index 5e2f4d98f..598a67456 100644
--- a/src/multimedia/doc/src/qtmultimedia-index.qdoc
+++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc
@@ -117,7 +117,7 @@
      \li QCamera
      \li Access camera viewfinder.
     \row
-     \li QCameraImageCapture
+     \li QImageCapture
      \li Capture still images with a camera.
     \row
      \li QMediaRecorder
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
index 0f7806fac..e15a04cc6 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
@@ -447,7 +447,7 @@ void QAndroidCameraSession::applyImageSettings()
         return;
 
     // only supported format right now.
-    m_actualImageSettings.setFormat(QCameraImageCapture::JPEG);
+    m_actualImageSettings.setFormat(QImageCapture::JPEG);
 
     const QSize requestedResolution = m_requestedImageSettings.resolution();
     const QList<QSize> supportedResolutions = m_camera->getSupportedPictureSizes();
@@ -469,19 +469,19 @@ void QAndroidCameraSession::applyImageSettings()
 
     int jpegQuality = 100;
     switch (m_requestedImageSettings.quality()) {
-    case QCameraImageCapture::VeryLowQuality:
+    case QImageCapture::VeryLowQuality:
         jpegQuality = 20;
         break;
-    case QCameraImageCapture::LowQuality:
+    case QImageCapture::LowQuality:
         jpegQuality = 40;
         break;
-    case QCameraImageCapture::NormalQuality:
+    case QImageCapture::NormalQuality:
         jpegQuality = 60;
         break;
-    case QCameraImageCapture::HighQuality:
+    case QImageCapture::HighQuality:
         jpegQuality = 80;
         break;
-    case QCameraImageCapture::VeryHighQuality:
+    case QImageCapture::VeryHighQuality:
         jpegQuality = 100;
         break;
     }
@@ -507,7 +507,7 @@ int QAndroidCameraSession::capture(const QString &fileName)
     ++m_lastImageCaptureId;
 
     if (!isReadyForCapture()) {
-        emit imageCaptureError(m_lastImageCaptureId, QCameraImageCapture::NotReadyError,
+        emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError,
                                tr("Camera not ready"));
         return m_lastImageCaptureId;
     }
@@ -530,7 +530,7 @@ int QAndroidCameraSession::capture(const QString &fileName)
 
 void QAndroidCameraSession::onCameraTakePictureFailed()
 {
-    emit imageCaptureError(m_currentImageCaptureId, QCameraImageCapture::ResourceError,
+    emit imageCaptureError(m_currentImageCaptureId, QImageCapture::ResourceError,
                            tr("Failed to capture image"));
 
     // Preview needs to be restarted and the preview call back must be setup again
@@ -654,11 +654,11 @@ void QAndroidCameraSession::processCapturedImage(int id,
 
                 emit imageSaved(id, actualFileName);
             } else {
-                emit imageCaptureError(id, QCameraImageCapture::OutOfSpaceError, file.errorString());
+                emit imageCaptureError(id, QImageCapture::OutOfSpaceError, file.errorString());
             }
         } else {
             const QString errorMessage = tr("Could not open destination file: %1").arg(actualFileName);
-            emit imageCaptureError(id, QCameraImageCapture::ResourceError, errorMessage);
+            emit imageCaptureError(id, QImageCapture::ResourceError, errorMessage);
         }
     } else {
         QVideoFrame frame(new QMemoryVideoBuffer(data, -1), QVideoFrameFormat(resolution, QVideoFrameFormat::Format_Jpeg));
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
index 29f73b004..195a90bfb 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
@@ -53,11 +53,11 @@
 //
 
 #include <qcamera.h>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QSet>
 #include <QMutex>
 #include <private/qmediastoragelocation_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include "androidcamera_p.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
index 97b436ee3..99ebcc3b7 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
@@ -45,7 +45,7 @@
 #include "qandroidcameracontrol_p.h"
 #include "qandroidcamerasession_p.h"
 #include "qandroidcameravideorenderercontrol_p.h"
-#include "qandroidcameraimagecapturecontrol_p.h"
+#include "qandroidimagecapture_p.h"
 #include "qmediadevices.h"
 #include "qaudiodevice.h"
 
@@ -94,14 +94,14 @@ void QAndroidCaptureService::setCamera(QPlatformCamera *camera)
         emit cameraChanged();
 }
 
-QPlatformCameraImageCapture *QAndroidCaptureService::imageCapture()
+QPlatformImageCapture *QAndroidCaptureService::imageCapture()
 {
     return m_imageCaptureControl;
 }
 
-void QAndroidCaptureService::setImageCapture(QPlatformCameraImageCapture *imageCapture)
+void QAndroidCaptureService::setImageCapture(QPlatformImageCapture *imageCapture)
 {
-    QAndroidCameraImageCaptureControl *control = static_cast<QAndroidCameraImageCaptureControl *>(imageCapture);
+    QAndroidImageCapture *control = static_cast<QAndroidImageCapture *>(imageCapture);
     if (m_imageCaptureControl == control)
         return;
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
index 6e8dc5460..0f87965e1 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -61,7 +61,7 @@ class QAndroidMediaEncoder;
 class QAndroidCaptureSession;
 class QAndroidCameraControl;
 class QAndroidCameraSession;
-class QAndroidCameraImageCaptureControl;
+class QAndroidImageCapture;
 
 class QAndroidCaptureService : public QPlatformMediaCaptureSession
 {
@@ -74,8 +74,8 @@ public:
     QPlatformCamera *camera() override;
     void setCamera(QPlatformCamera *camera) override;
 
-    QPlatformCameraImageCapture *imageCapture() override;
-    void setImageCapture(QPlatformCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *imageCapture() override;
+    void setImageCapture(QPlatformImageCapture *imageCapture) override;
 
     QPlatformMediaEncoder *mediaEncoder() override;
     void setMediaEncoder(QPlatformMediaEncoder *encoder) override;
@@ -94,7 +94,7 @@ private:
     QAndroidCaptureSession *m_captureSession = nullptr;
     QAndroidCameraControl *m_cameraControl = nullptr;
     QAndroidCameraSession *m_cameraSession = nullptr;
-    QAndroidCameraImageCaptureControl *m_imageCaptureControl;
+    QAndroidImageCapture *m_imageCaptureControl;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidimagecapture.cpp
index c75d2b28b..a782ec9e0 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidimagecapture.cpp
@@ -37,50 +37,50 @@
 **
 ****************************************************************************/
 
-#include "qandroidcameraimagecapturecontrol_p.h"
+#include "qandroidimagecapture_p.h"
 
 #include "qandroidcamerasession_p.h"
 #include "qandroidcaptureservice_p.h"
 
 QT_BEGIN_NAMESPACE
 
-QAndroidCameraImageCaptureControl::QAndroidCameraImageCaptureControl(QCameraImageCapture *parent)
-    : QPlatformCameraImageCapture(parent)
+QAndroidImageCapture::QAndroidImageCapture(QImageCapture *parent)
+    : QPlatformImageCapture(parent)
 {
 }
 
-bool QAndroidCameraImageCaptureControl::isReadyForCapture() const
+bool QAndroidImageCapture::isReadyForCapture() const
 {
     return m_session->isReadyForCapture();
 }
 
-int QAndroidCameraImageCaptureControl::capture(const QString &fileName)
+int QAndroidImageCapture::capture(const QString &fileName)
 {
     return m_session->capture(fileName);
 }
 
-int QAndroidCameraImageCaptureControl::captureToBuffer()
+int QAndroidImageCapture::captureToBuffer()
 {
     // ### implement me!
     const QLatin1String errorMessage("Capturing to buffer not supported.");
     QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                               Q_ARG(int, -1),
-                              Q_ARG(int, QCameraImageCapture::NotSupportedFeatureError),
+                              Q_ARG(int, QImageCapture::NotSupportedFeatureError),
                               Q_ARG(QString, errorMessage));
     return -1;
 }
 
-QImageEncoderSettings QAndroidCameraImageCaptureControl::imageSettings() const
+QImageEncoderSettings QAndroidImageCapture::imageSettings() const
 {
     return m_session->imageSettings();
 }
 
-void QAndroidCameraImageCaptureControl::setImageSettings(const QImageEncoderSettings &settings)
+void QAndroidImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 {
     m_session->setImageSettings(settings);
 }
 
-void QAndroidCameraImageCaptureControl::setCaptureSession(QPlatformMediaCaptureSession *session)
+void QAndroidImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
 {
     QAndroidCaptureService *captureSession = static_cast<QAndroidCaptureService *>(session);
     if (m_service == captureSession)
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidimagecapture_p.h
index 9db1a66e1..c5697b601 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameraimagecapturecontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidimagecapture_p.h
@@ -51,18 +51,18 @@
 // We mean it.
 //
 
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QAndroidCameraSession;
 class QAndroidCaptureService;
 
-class QAndroidCameraImageCaptureControl : public QPlatformCameraImageCapture
+class QAndroidImageCapture : public QPlatformImageCapture
 {
     Q_OBJECT
 public:
-    explicit QAndroidCameraImageCaptureControl(QCameraImageCapture *parent = nullptr);
+    explicit QAndroidImageCapture(QImageCapture *parent = nullptr);
 
     bool isReadyForCapture() const override;
 
diff --git a/src/multimedia/platform/android/qandroidformatsinfo.cpp b/src/multimedia/platform/android/qandroidformatsinfo.cpp
index 4d31cc15d..0e421b658 100644
--- a/src/multimedia/platform/android/qandroidformatsinfo.cpp
+++ b/src/multimedia/platform/android/qandroidformatsinfo.cpp
@@ -53,7 +53,7 @@ QAndroidFormatInfo::QAndroidFormatInfo()
     };
     encoders = decoders;
 
-    imageFormats << QCameraImageCapture::JPEG;
+    imageFormats << QImageCapture::JPEG;
 }
 
 QAndroidFormatInfo::~QAndroidFormatInfo()
diff --git a/src/multimedia/platform/android/qandroidintegration.cpp b/src/multimedia/platform/android/qandroidintegration.cpp
index 1a8a10a43..95b8bd39e 100644
--- a/src/multimedia/platform/android/qandroidintegration.cpp
+++ b/src/multimedia/platform/android/qandroidintegration.cpp
@@ -47,7 +47,7 @@
 #include "private/androidsurfaceview_p.h"
 #include "private/androidcamera_p.h"
 #include "private/qandroidcameracontrol_p.h"
-#include "private/qandroidcameraimagecapturecontrol_p.h"
+#include "private/qandroidimagecapture_p.h"
 #include "private/qandroidmediaencoder_p.h"
 #include "private/androidmediarecorder_p.h"
 #include "private/qandroidformatsinfo_p.h"
@@ -104,9 +104,9 @@ QPlatformMediaEncoder *QAndroidIntegration::createEncoder(QMediaRecorder *encode
     return new QAndroidMediaEncoder(encoder);
 }
 
-QPlatformCameraImageCapture *QAndroidIntegration::createImageCapture(QCameraImageCapture *imageCapture)
+QPlatformImageCapture *QAndroidIntegration::createImageCapture(QImageCapture *imageCapture)
 {
-    return new QAndroidCameraImageCaptureControl(imageCapture);
+    return new QAndroidImageCapture(imageCapture);
 }
 
 QPlatformAudioOutput *QAndroidIntegration::createAudioOutput(QAudioOutput *q)
diff --git a/src/multimedia/platform/android/qandroidintegration_p.h b/src/multimedia/platform/android/qandroidintegration_p.h
index 6df40672c..a242dc19a 100644
--- a/src/multimedia/platform/android/qandroidintegration_p.h
+++ b/src/multimedia/platform/android/qandroidintegration_p.h
@@ -70,7 +70,7 @@ public:
     QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override;
     QPlatformCamera *createCamera(QCamera *camera) override;
     QPlatformMediaEncoder *createEncoder(QMediaRecorder *encoder) override;
-    QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *createImageCapture(QImageCapture *imageCapture) override;
 
     QPlatformAudioOutput *createAudioOutput(QAudioOutput *q) override;
 
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
index 8ee350d02..b669eacc1 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
@@ -43,9 +43,9 @@
 #include "avfcameraservice_p.h"
 #include "avfcamera_p.h"
 #include "avfcamerasession_p.h"
-#include "avfcameraimagecapture_p.h"
+#include "avfimagecapture_p.h"
 #include "avfcamerarenderer_p.h"
-#include "avfcameraimagecapture_p.h"
+#include "avfimagecapture_p.h"
 #include "avfmediaencoder_p.h"
 #include <qmediadevices.h>
 #include <private/qplatformaudioinput_p.h>
@@ -84,14 +84,14 @@ void AVFCameraService::setCamera(QPlatformCamera *camera)
     emit cameraChanged();
 }
 
-QPlatformCameraImageCapture *AVFCameraService::imageCapture()
+QPlatformImageCapture *AVFCameraService::imageCapture()
 {
     return m_imageCaptureControl;
 }
 
-void AVFCameraService::setImageCapture(QPlatformCameraImageCapture *imageCapture)
+void AVFCameraService::setImageCapture(QPlatformImageCapture *imageCapture)
 {
-    AVFCameraImageCapture *control = static_cast<AVFCameraImageCapture *>(imageCapture);
+    AVFImageCapture *control = static_cast<AVFImageCapture *>(imageCapture);
     if (m_imageCaptureControl == control)
         return;
 
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
index d2c75096e..5e641cb6a 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 class QPlatformCamera;
 class QPlatformMediaEncoder;
 class AVFCamera;
-class AVFCameraImageCapture;
+class AVFImageCapture;
 class AVFCameraSession;
 class AVFMediaEncoder;
 
@@ -75,8 +75,8 @@ public:
     QPlatformCamera *camera() override;
     void setCamera(QPlatformCamera *camera) override;
 
-    QPlatformCameraImageCapture *imageCapture() override;
-    void setImageCapture(QPlatformCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *imageCapture() override;
+    void setImageCapture(QPlatformImageCapture *imageCapture) override;
 
     QPlatformMediaEncoder *mediaEncoder() override;
     void setMediaEncoder(QPlatformMediaEncoder *encoder) override;
@@ -88,7 +88,7 @@ public:
     AVFCameraSession *session() const { return m_session; }
     AVFCamera *avfCameraControl() const { return m_cameraControl; }
     AVFMediaEncoder *recorderControl() const { return m_encoder; }
-    AVFCameraImageCapture *avfImageCaptureControl() const { return m_imageCaptureControl; }
+    AVFImageCapture *avfImageCaptureControl() const { return m_imageCaptureControl; }
     AVCaptureDevice *audioCaptureDevice() const { return m_audioCaptureDevice; }
 
 public Q_SLOTS:
@@ -101,7 +101,7 @@ private:
     AVFCameraSession *m_session = nullptr;
     AVFCamera *m_cameraControl = nullptr;
     AVFMediaEncoder *m_encoder = nullptr;
-    AVFCameraImageCapture *m_imageCaptureControl = nullptr;
+    AVFImageCapture *m_imageCaptureControl = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession.mm b/src/multimedia/platform/darwin/camera/avfcamerasession.mm
index 7febe567f..7f2ca7b5b 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerasession.mm
+++ b/src/multimedia/platform/darwin/camera/avfcamerasession.mm
@@ -42,7 +42,7 @@
 #include "avfcameraservice_p.h"
 #include "avfcamera_p.h"
 #include "avfcamerarenderer_p.h"
-#include "avfcameraimagecapture_p.h"
+#include "avfimagecapture_p.h"
 #include "avfmediaencoder_p.h"
 #include "avfcamerautility_p.h"
 #include <private/avfvideosink_p.h>
@@ -384,7 +384,7 @@ void AVFCameraSession::attachAudioInputDevice()
 
 bool AVFCameraSession::applyImageEncoderSettings()
 {
-    if (AVFCameraImageCapture *control = m_service->avfImageCaptureControl())
+    if (AVFImageCapture *control = m_service->avfImageCaptureControl())
         return control->applySettings();
 
     return false;
diff --git a/src/multimedia/platform/darwin/camera/avfcameraimagecapture.mm b/src/multimedia/platform/darwin/camera/avfimagecapture.mm
index 1d425f27d..5bfe8e105 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraimagecapture.mm
+++ b/src/multimedia/platform/darwin/camera/avfimagecapture.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "avfcameradebug_p.h"
-#include "avfcameraimagecapture_p.h"
+#include "avfimagecapture_p.h"
 #include "avfcameraservice_p.h"
 #include "avfcamerautility_p.h"
 #include "avfcamera_p.h"
@@ -56,8 +56,8 @@
 
 QT_USE_NAMESPACE
 
-AVFCameraImageCapture::AVFCameraImageCapture(QCameraImageCapture *parent)
-   : QPlatformCameraImageCapture(parent)
+AVFImageCapture::AVFImageCapture(QImageCapture *parent)
+   : QPlatformImageCapture(parent)
    , m_ready(false)
    , m_lastCaptureId(0)
    , m_videoConnection(nil)
@@ -71,16 +71,16 @@ AVFCameraImageCapture::AVFCameraImageCapture(QCameraImageCapture *parent)
     [outputSettings release];
 }
 
-AVFCameraImageCapture::~AVFCameraImageCapture()
+AVFImageCapture::~AVFImageCapture()
 {
 }
 
-bool AVFCameraImageCapture::isReadyForCapture() const
+bool AVFImageCapture::isReadyForCapture() const
 {
     return m_cameraControl && m_videoConnection && m_cameraControl->isActive();
 }
 
-void AVFCameraImageCapture::updateReadyStatus()
+void AVFImageCapture::updateReadyStatus()
 {
     if (m_ready != isReadyForCapture()) {
         m_ready = !m_ready;
@@ -89,19 +89,19 @@ void AVFCameraImageCapture::updateReadyStatus()
     }
 }
 
-int AVFCameraImageCapture::doCapture(const QString &actualFileName)
+int AVFImageCapture::doCapture(const QString &actualFileName)
 {
     if (!m_session) {
         QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                 Q_ARG(int, m_lastCaptureId),
-                                Q_ARG(int, QCameraImageCapture::ResourceError),
+                                Q_ARG(int, QImageCapture::ResourceError),
                                 Q_ARG(QString, tr("Image capture not set to capture session")));
         return m_lastCaptureId;
     }
     if (!isReadyForCapture()) {
         QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                   Q_ARG(int, m_lastCaptureId),
-                                  Q_ARG(int, QCameraImageCapture::NotReadyError),
+                                  Q_ARG(int, QImageCapture::NotReadyError),
                                   Q_ARG(QString, tr("Camera not ready")));
         return m_lastCaptureId;
     }
@@ -130,7 +130,7 @@ int AVFCameraImageCapture::doCapture(const QString &actualFileName)
 
             QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                       Q_ARG(int, request.captureId),
-                                      Q_ARG(int, QCameraImageCapture::ResourceError),
+                                      Q_ARG(int, QImageCapture::ResourceError),
                                       Q_ARG(QString, errorMessage));
             return;
         }
@@ -169,14 +169,14 @@ int AVFCameraImageCapture::doCapture(const QString &actualFileName)
                     } else {
                         QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                                   Q_ARG(int, request.captureId),
-                                                  Q_ARG(int, QCameraImageCapture::OutOfSpaceError),
+                                                  Q_ARG(int, QImageCapture::OutOfSpaceError),
                                                   Q_ARG(QString, f.errorString()));
                     }
                 } else {
                     QString errorMessage = tr("Could not open destination file:\n%1").arg(fileName);
                     QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                               Q_ARG(int, request.captureId),
-                                              Q_ARG(int, QCameraImageCapture::ResourceError),
+                                              Q_ARG(int, QImageCapture::ResourceError),
                                               Q_ARG(QString, errorMessage));
                 }
             }
@@ -186,7 +186,7 @@ int AVFCameraImageCapture::doCapture(const QString &actualFileName)
             qDebugCamera() << errorMessage;
             QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                                       Q_ARG(int, request.captureId),
-                                      Q_ARG(int, QCameraImageCapture::ResourceError),
+                                      Q_ARG(int, QImageCapture::ResourceError),
                                       Q_ARG(QString, errorMessage));
         }
     }];
@@ -194,7 +194,7 @@ int AVFCameraImageCapture::doCapture(const QString &actualFileName)
     return request.captureId;
 }
 
-int AVFCameraImageCapture::capture(const QString &fileName)
+int AVFImageCapture::capture(const QString &fileName)
 {
     QString actualFileName;
     actualFileName = m_storageLocation.generateFileName(fileName,
@@ -206,12 +206,12 @@ int AVFCameraImageCapture::capture(const QString &fileName)
     return doCapture(actualFileName);
 }
 
-int AVFCameraImageCapture::captureToBuffer()
+int AVFImageCapture::captureToBuffer()
 {
     return doCapture(QString());
 }
 
-void AVFCameraImageCapture::onNewViewfinderFrame(const QVideoFrame &frame)
+void AVFImageCapture::onNewViewfinderFrame(const QVideoFrame &frame)
 {
     QMutexLocker locker(&m_requestsMutex);
 
@@ -221,24 +221,24 @@ void AVFCameraImageCapture::onNewViewfinderFrame(const QVideoFrame &frame)
     CaptureRequest request = m_captureRequests.dequeue();
     Q_EMIT imageExposed(request.captureId);
 
-    (void) QtConcurrent::run(&AVFCameraImageCapture::makeCapturePreview, this,
+    (void) QtConcurrent::run(&AVFImageCapture::makeCapturePreview, this,
                       request,
                       frame,
                       0 /* rotation */);
 }
 
-void AVFCameraImageCapture::onCameraChanged()
+void AVFImageCapture::onCameraChanged()
 {
     Q_ASSERT(m_service && m_session);
     if (m_service->camera())
         connect(m_service->camera(), SIGNAL(activeChanged(bool)), this, SLOT(updateReadyStatus()));
     if (m_session->videoOutput())
         connect(m_session->videoOutput(), &AVFCameraRenderer::newViewfinderFrame,
-                this, &AVFCameraImageCapture::onNewViewfinderFrame,
+                this, &AVFImageCapture::onNewViewfinderFrame,
                 Qt::DirectConnection);
 }
 
-void AVFCameraImageCapture::makeCapturePreview(CaptureRequest request,
+void AVFImageCapture::makeCapturePreview(CaptureRequest request,
                                                 const QVideoFrame &frame,
                                                 int rotation)
 {
@@ -250,7 +250,7 @@ void AVFCameraImageCapture::makeCapturePreview(CaptureRequest request,
     request.previewReady->release();
 }
 
-void AVFCameraImageCapture::updateCaptureConnection()
+void AVFImageCapture::updateCaptureConnection()
 {
     if (m_session && m_session->videoCaptureDevice()) {
         qDebugCamera() << Q_FUNC_INFO;
@@ -271,7 +271,7 @@ void AVFCameraImageCapture::updateCaptureConnection()
 }
 
 
-QImageEncoderSettings AVFCameraImageCapture::imageSettings() const
+QImageEncoderSettings AVFImageCapture::imageSettings() const
 {
     QImageEncoderSettings settings;
 
@@ -301,12 +301,12 @@ QImageEncoderSettings AVFCameraImageCapture::imageSettings() const
     }
 
     settings.setResolution(res);
-    settings.setFormat(QCameraImageCapture::JPEG);
+    settings.setFormat(QImageCapture::JPEG);
 
     return settings;
 }
 
-void AVFCameraImageCapture::setImageSettings(const QImageEncoderSettings &settings)
+void AVFImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 {
     if (m_settings == settings)
         return;
@@ -315,7 +315,7 @@ void AVFCameraImageCapture::setImageSettings(const QImageEncoderSettings &settin
     applySettings();
 }
 
-bool AVFCameraImageCapture::applySettings()
+bool AVFImageCapture::applySettings()
 {
     if (!videoCaptureDeviceIsValid())
         return false;
@@ -330,7 +330,7 @@ bool AVFCameraImageCapture::applySettings()
         return false;
     }
 
-    if (m_settings.format() != QCameraImageCapture::UnspecifiedFormat && m_settings.format() != QCameraImageCapture::JPEG) {
+    if (m_settings.format() != QImageCapture::UnspecifiedFormat && m_settings.format() != QImageCapture::JPEG) {
         qDebugCamera() << Q_FUNC_INFO << "unsupported format:" << m_settings.format();
         return false;
     }
@@ -373,7 +373,7 @@ bool AVFCameraImageCapture::applySettings()
     return activeFormatChanged;
 }
 
-void AVFCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
+void AVFImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
 {
     AVFCameraService *captureSession = static_cast<AVFCameraService *>(session);
     if (m_service == captureSession)
@@ -396,7 +396,7 @@ void AVFCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession *sess
     Q_ASSERT(m_session);
     m_cameraControl = static_cast<AVFCamera *>(m_service->camera());
 
-    connect(m_service, &AVFCameraService::cameraChanged, this, &AVFCameraImageCapture::onCameraChanged);
+    connect(m_service, &AVFCameraService::cameraChanged, this, &AVFImageCapture::onCameraChanged);
     connect(m_session, SIGNAL(readyToConfigureConnections()), SLOT(updateCaptureConnection()));
 
     updateCaptureConnection();
@@ -404,7 +404,7 @@ void AVFCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession *sess
     onCameraChanged();
 }
 
-bool AVFCameraImageCapture::videoCaptureDeviceIsValid() const
+bool AVFImageCapture::videoCaptureDeviceIsValid() const
 {
     if (!m_service || !m_service->session() || !m_service->session()->videoCaptureDevice())
         return false;
@@ -416,4 +416,4 @@ bool AVFCameraImageCapture::videoCaptureDeviceIsValid() const
     return true;
 }
 
-#include "moc_avfcameraimagecapture_p.cpp"
+#include "moc_avfimagecapture_p.cpp"
diff --git a/src/multimedia/platform/darwin/camera/avfcameraimagecapture_p.h b/src/multimedia/platform/darwin/camera/avfimagecapture_p.h
index f970828e0..2d1d1b1e7 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraimagecapture_p.h
+++ b/src/multimedia/platform/darwin/camera/avfimagecapture_p.h
@@ -56,13 +56,13 @@
 #include <QtCore/qqueue.h>
 #include <QtCore/qsemaphore.h>
 #include <QtCore/qsharedpointer.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include "avfcamerasession_p.h"
 #include "avfstoragelocation_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class AVFCameraImageCapture : public QPlatformCameraImageCapture
+class AVFImageCapture : public QPlatformImageCapture
 {
 Q_OBJECT
 public:
@@ -71,8 +71,8 @@ public:
         QSharedPointer<QSemaphore> previewReady;
     };
 
-    AVFCameraImageCapture(QCameraImageCapture *parent = nullptr);
-    ~AVFCameraImageCapture();
+    AVFImageCapture(QImageCapture *parent = nullptr);
+    ~AVFImageCapture();
 
     bool isReadyForCapture() const override;
 
@@ -112,7 +112,7 @@ private:
     QImageEncoderSettings m_settings;
 };
 
-Q_DECLARE_TYPEINFO(AVFCameraImageCapture::CaptureRequest, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(AVFImageCapture::CaptureRequest, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/multimedia/platform/darwin/qdarwinformatsinfo.mm b/src/multimedia/platform/darwin/qdarwinformatsinfo.mm
index 59c563537..afa1adf4a 100644
--- a/src/multimedia/platform/darwin/qdarwinformatsinfo.mm
+++ b/src/multimedia/platform/darwin/qdarwinformatsinfo.mm
@@ -166,7 +166,7 @@ QDarwinFormatInfo::QDarwinFormatInfo()
 // #endif
 
     // ###
-    imageFormats << QCameraImageCapture::JPEG;
+    imageFormats << QImageCapture::JPEG;
 }
 
 QDarwinFormatInfo::~QDarwinFormatInfo()
diff --git a/src/multimedia/platform/darwin/qdarwinintegration.mm b/src/multimedia/platform/darwin/qdarwinintegration.mm
index 753dabff4..372ce9e81 100644
--- a/src/multimedia/platform/darwin/qdarwinintegration.mm
+++ b/src/multimedia/platform/darwin/qdarwinintegration.mm
@@ -42,7 +42,7 @@
 #include <private/avfmediaplayer_p.h>
 #include <private/avfcameraservice_p.h>
 #include <private/avfcamera_p.h>
-#include <private/avfcameraimagecapture_p.h>
+#include <private/avfimagecapture_p.h>
 #include <private/avfmediaencoder_p.h>
 #include <private/qdarwinformatsinfo_p.h>
 #include <private/avfvideosink_p.h>
@@ -100,9 +100,9 @@ QPlatformMediaEncoder *QDarwinIntegration::createEncoder(QMediaRecorder *encoder
     return new AVFMediaEncoder(encoder);
 }
 
-QPlatformCameraImageCapture *QDarwinIntegration::createImageCapture(QCameraImageCapture *imageCapture)
+QPlatformImageCapture *QDarwinIntegration::createImageCapture(QImageCapture *imageCapture)
 {
-    return new AVFCameraImageCapture(imageCapture);
+    return new AVFImageCapture(imageCapture);
 }
 
 QPlatformVideoSink *QDarwinIntegration::createVideoSink(QVideoSink *sink)
diff --git a/src/multimedia/platform/darwin/qdarwinintegration_p.h b/src/multimedia/platform/darwin/qdarwinintegration_p.h
index 52832585e..946300761 100644
--- a/src/multimedia/platform/darwin/qdarwinintegration_p.h
+++ b/src/multimedia/platform/darwin/qdarwinintegration_p.h
@@ -71,7 +71,7 @@ public:
     QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override;
     QPlatformCamera *createCamera(QCamera *camera) override;
     QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override;
-    QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override;
+    QPlatformImageCapture *createImageCapture(QImageCapture *) override;
 
     QPlatformVideoSink *createVideoSink(QVideoSink *) override;
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
index 40328bf72..99a44b70e 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
@@ -40,7 +40,7 @@
 #include <qcameradevice.h>
 
 #include "qgstreamercamera_p.h"
-#include "qgstreamercameraimagecapture_p.h"
+#include "qgstreamerimagecapture_p.h"
 #include <private/qgstreamermediadevices_p.h>
 #include <private/qgstreamerintegration_p.h>
 #include <qmediacapturesession.h>
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
index e19a9c28e..f0f2f16e9 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qgstreamercameraimagecapture_p.h"
+#include "qgstreamerimagecapture_p.h"
 #include "qplatformcamera_p.h"
 #include <private/qgstvideobuffer_p.h>
 #include <private/qgstutils_p.h>
@@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE
 
 Q_LOGGING_CATEGORY(qLcImageCapture, "qt.multimedia.imageCapture")
 
-QGstreamerCameraImageCapture::QGstreamerCameraImageCapture(QCameraImageCapture *parent)
-  : QPlatformCameraImageCapture(parent),
+QGstreamerImageCapture::QGstreamerImageCapture(QImageCapture *parent)
+  : QPlatformImageCapture(parent),
     QGstreamerBufferProbe(ProbeBuffers)
 {
     bin = QGstBin("imageCaptureBin");
@@ -80,16 +80,16 @@ QGstreamerCameraImageCapture::QGstreamerCameraImageCapture(QCameraImageCapture *
     addProbeToPad(queue.staticPad("src").pad(), false);
 
     sink.set("signal-handoffs", true);
-    g_signal_connect(sink.object(), "handoff", G_CALLBACK(&QGstreamerCameraImageCapture::saveImageFilter), this);
+    g_signal_connect(sink.object(), "handoff", G_CALLBACK(&QGstreamerImageCapture::saveImageFilter), this);
 }
 
-QGstreamerCameraImageCapture::~QGstreamerCameraImageCapture()
+QGstreamerImageCapture::~QGstreamerImageCapture()
 {
     if (m_session)
         m_session->releaseVideoPad(videoSrcPad);
 }
 
-bool QGstreamerCameraImageCapture::isReadyForCapture() const
+bool QGstreamerImageCapture::isReadyForCapture() const
 {
     return m_session && !passImage && cameraActive;
 }
@@ -134,7 +134,7 @@ QString generateFileName(const QDir &dir, const QString &ext)
 }
 
 
-int QGstreamerCameraImageCapture::capture(const QString &fileName)
+int QGstreamerImageCapture::capture(const QString &fileName)
 {
     QString path = fileName;
     if (path.isEmpty())
@@ -143,12 +143,12 @@ int QGstreamerCameraImageCapture::capture(const QString &fileName)
     return doCapture(path);
 }
 
-int QGstreamerCameraImageCapture::captureToBuffer()
+int QGstreamerImageCapture::captureToBuffer()
 {
     return doCapture(QString());
 }
 
-int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
+int QGstreamerImageCapture::doCapture(const QString &fileName)
 {
     qCDebug(qLcImageCapture) << "do capture";
     if (!m_session) {
@@ -156,7 +156,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
         //so application can associate it with returned request id.
         QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
                                   Q_ARG(int, -1),
-                                  Q_ARG(int, QCameraImageCapture::ResourceError),
+                                  Q_ARG(int, QImageCapture::ResourceError),
                                   Q_ARG(QString,tr("Image capture not set to a session.")));
 
         qCDebug(qLcImageCapture) << "error 1";
@@ -167,7 +167,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
         //so application can associate it with returned request id.
         QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
                                   Q_ARG(int, -1),
-                                  Q_ARG(int, QCameraImageCapture::ResourceError),
+                                  Q_ARG(int, QImageCapture::ResourceError),
                                   Q_ARG(QString,tr("No camera available.")));
 
         qCDebug(qLcImageCapture) << "error 2";
@@ -178,7 +178,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
         //so application can associate it with returned request id.
         QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection,
                                   Q_ARG(int, -1),
-                                  Q_ARG(int, QCameraImageCapture::NotReadyError),
+                                  Q_ARG(int, QImageCapture::NotReadyError),
                                   Q_ARG(QString,tr("Camera is not ready.")));
 
         qCDebug(qLcImageCapture) << "error 3";
@@ -198,7 +198,7 @@ int QGstreamerCameraImageCapture::doCapture(const QString &fileName)
     return m_lastId;
 }
 
-bool QGstreamerCameraImageCapture::probeBuffer(GstBuffer *buffer)
+bool QGstreamerImageCapture::probeBuffer(GstBuffer *buffer)
 {
     if (!passImage)
         return false;
@@ -244,7 +244,7 @@ bool QGstreamerCameraImageCapture::probeBuffer(GstBuffer *buffer)
     return true;
 }
 
-void QGstreamerCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
+void QGstreamerImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
 {
     QGstreamerMediaCapture *captureSession = static_cast<QGstreamerMediaCapture *>(session);
     if (m_session == captureSession)
@@ -268,11 +268,11 @@ void QGstreamerCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSessio
     gstPipeline = captureSession->pipeline();
     gstPipeline.add(bin);
     bin.setStateSync(GST_STATE_READY);
-    connect(m_session, &QPlatformMediaCaptureSession::cameraChanged, this, &QGstreamerCameraImageCapture::onCameraChanged);
+    connect(m_session, &QPlatformMediaCaptureSession::cameraChanged, this, &QGstreamerImageCapture::onCameraChanged);
     onCameraChanged();
 }
 
-void QGstreamerCameraImageCapture::cameraActiveChanged(bool active)
+void QGstreamerImageCapture::cameraActiveChanged(bool active)
 {
     qCDebug(qLcImageCapture) << "cameraActiveChanged" << cameraActive << active;
     if (cameraActive == active)
@@ -282,23 +282,23 @@ void QGstreamerCameraImageCapture::cameraActiveChanged(bool active)
     emit readyForCaptureChanged(isReadyForCapture());
 }
 
-void QGstreamerCameraImageCapture::onCameraChanged()
+void QGstreamerImageCapture::onCameraChanged()
 {
     if (m_session->camera()) {
         cameraActiveChanged(m_session->camera()->isActive());
-        connect(m_session->camera(), &QPlatformCamera::activeChanged, this, &QGstreamerCameraImageCapture::cameraActiveChanged);
+        connect(m_session->camera(), &QPlatformCamera::activeChanged, this, &QGstreamerImageCapture::cameraActiveChanged);
     }
 
 }
 
-gboolean QGstreamerCameraImageCapture::saveImageFilter(GstElement *element,
+gboolean QGstreamerImageCapture::saveImageFilter(GstElement *element,
                                                        GstBuffer *buffer,
                                                        GstPad *pad,
                                                        void *appdata)
 {
     Q_UNUSED(element);
     Q_UNUSED(pad);
-    QGstreamerCameraImageCapture *capture = static_cast<QGstreamerCameraImageCapture *>(appdata);
+    QGstreamerImageCapture *capture = static_cast<QGstreamerImageCapture *>(appdata);
 
     if (capture->pendingImages.isEmpty()) {
         capture->unlink();
@@ -322,7 +322,7 @@ gboolean QGstreamerCameraImageCapture::saveImageFilter(GstElement *element,
         }
         f.close();
 
-        static QMetaMethod savedSignal = QMetaMethod::fromSignal(&QGstreamerCameraImageCapture::imageSaved);
+        static QMetaMethod savedSignal = QMetaMethod::fromSignal(&QGstreamerImageCapture::imageSaved);
         savedSignal.invoke(capture,
                            Qt::QueuedConnection,
                            Q_ARG(int, imageData.id),
@@ -334,7 +334,7 @@ gboolean QGstreamerCameraImageCapture::saveImageFilter(GstElement *element,
     return TRUE;
 }
 
-void QGstreamerCameraImageCapture::unlink()
+void QGstreamerImageCapture::unlink()
 {
     return;
     if (passImage)
@@ -350,7 +350,7 @@ void QGstreamerCameraImageCapture::unlink()
     gstPipeline.setStateSync(GST_STATE_PLAYING);
 }
 
-void QGstreamerCameraImageCapture::link()
+void QGstreamerImageCapture::link()
 {
     if (!(m_session && m_session->camera()))
         return;
@@ -364,12 +364,12 @@ void QGstreamerCameraImageCapture::link()
     gstPipeline.setStateSync(GST_STATE_PLAYING);
 }
 
-QImageEncoderSettings QGstreamerCameraImageCapture::imageSettings() const
+QImageEncoderSettings QGstreamerImageCapture::imageSettings() const
 {
     return m_settings;
 }
 
-void QGstreamerCameraImageCapture::setImageSettings(const QImageEncoderSettings &settings)
+void QGstreamerImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 {
     if (m_settings != settings) {
         m_settings = settings;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture_p.h
index 38b0d33b4..50d1d9a7b 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercameraimagecapture_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamerimagecapture_p.h
@@ -52,7 +52,7 @@
 // We mean it.
 //
 
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include "qgstreamermediacapture_p.h"
 #include "private/qgstreamerbufferprobe_p.h"
 
@@ -63,13 +63,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QGstreamerCameraImageCapture : public QPlatformCameraImageCapture, private QGstreamerBufferProbe
+class QGstreamerImageCapture : public QPlatformImageCapture, private QGstreamerBufferProbe
 
 {
     Q_OBJECT
 public:
-    QGstreamerCameraImageCapture(QCameraImageCapture *parent/*, const QGstPipeline &pipeline*/);
-    virtual ~QGstreamerCameraImageCapture();
+    QGstreamerImageCapture(QImageCapture *parent/*, const QGstPipeline &pipeline*/);
+    virtual ~QGstreamerImageCapture();
 
     bool isReadyForCapture() const override;
     int capture(const QString &fileName) override;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
index d6ee3fdb4..237b2a505 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
@@ -39,11 +39,10 @@
 
 #include "qgstreamermediacapture_p.h"
 #include "qgstreamermediaencoder_p.h"
-#include "qgstreamercameraimagecapture_p.h"
+#include "qgstreamerimagecapture_p.h"
 #include "qgstreamercamera_p.h"
 #include <private/qgstpipeline_p.h>
 
-#include "qgstreamercameraimagecapture_p.h"
 #include "private/qgstreameraudioinput_p.h"
 #include "private/qgstreameraudiooutput_p.h"
 #include "private/qgstreamervideooutput_p.h"
@@ -118,14 +117,14 @@ void QGstreamerMediaCapture::setCamera(QPlatformCamera *camera)
     gstPipeline.dumpGraph("camera");
 }
 
-QPlatformCameraImageCapture *QGstreamerMediaCapture::imageCapture()
+QPlatformImageCapture *QGstreamerMediaCapture::imageCapture()
 {
     return m_imageCapture;
 }
 
-void QGstreamerMediaCapture::setImageCapture(QPlatformCameraImageCapture *imageCapture)
+void QGstreamerMediaCapture::setImageCapture(QPlatformImageCapture *imageCapture)
 {
-    QGstreamerCameraImageCapture *control = static_cast<QGstreamerCameraImageCapture *>(imageCapture);
+    QGstreamerImageCapture *control = static_cast<QGstreamerImageCapture *>(imageCapture);
     if (m_imageCapture == control)
         return;
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
index bf10054d1..db42c1ee8 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
@@ -60,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGstreamerCamera;
-class QGstreamerCameraImageCapture;
+class QGstreamerImageCapture;
 class QGstreamerMediaEncoder;
 class QGstreamerAudioInput;
 class QGstreamerAudioOutput;
@@ -77,8 +77,8 @@ public:
     QPlatformCamera *camera() override;
     void setCamera(QPlatformCamera *camera) override;
 
-    QPlatformCameraImageCapture *imageCapture() override;
-    void setImageCapture(QPlatformCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *imageCapture() override;
+    void setImageCapture(QPlatformImageCapture *imageCapture) override;
 
     QPlatformMediaEncoder *mediaEncoder() override;
     void setMediaEncoder(QPlatformMediaEncoder *encoder) override;
@@ -113,7 +113,7 @@ private:
     QGstreamerVideoOutput *gstVideoOutput = nullptr;
 
     QGstreamerMediaEncoder *m_mediaEncoder = nullptr;
-    QGstreamerCameraImageCapture *m_imageCapture = nullptr;
+    QGstreamerImageCapture *m_imageCapture = nullptr;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp b/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp
index f89cf36c7..0f91e774d 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerformatinfo.cpp
@@ -140,22 +140,22 @@ QMediaFormat::FileFormat QGstreamerFormatInfo::fileFormatForCaps(QGstStructure s
 }
 
 
-QCameraImageCapture::FileFormat QGstreamerFormatInfo::imageFormatForCaps(QGstStructure structure)
+QImageCapture::FileFormat QGstreamerFormatInfo::imageFormatForCaps(QGstStructure structure)
 {
     const char *name = structure.name().data();
 
     if (!strcmp(name, "image/jpeg")) {
-        return QCameraImageCapture::JPEG;
+        return QImageCapture::JPEG;
     } else if (!strcmp(name, "image/png")) {
-        return QCameraImageCapture::PNG;
+        return QImageCapture::PNG;
     } else if (!strcmp(name, "image/webp")) {
-        return QCameraImageCapture::WebP;
+        return QImageCapture::WebP;
     } else if (!strcmp(name, "image/webp")) {
-        return QCameraImageCapture::WebP;
+        return QImageCapture::WebP;
     } else if (!strcmp(name, "image/tiff")) {
-        return QCameraImageCapture::Tiff;
+        return QImageCapture::Tiff;
     }
-    return QCameraImageCapture::UnspecifiedFormat;
+    return QImageCapture::UnspecifiedFormat;
 }
 
 static QPair<QList<QMediaFormat::AudioCodec>, QList<QMediaFormat::VideoCodec>> getCodecsList(bool decode)
@@ -266,9 +266,9 @@ QList<QGstreamerFormatInfo::CodecMap> QGstreamerFormatInfo::getMuxerList(bool de
     return muxers;
 }
 
-static QList<QCameraImageCapture::FileFormat> getImageFormatList()
+static QList<QImageCapture::FileFormat> getImageFormatList()
 {
-    QSet<QCameraImageCapture::FileFormat> formats;
+    QSet<QImageCapture::FileFormat> formats;
 
     GList *elementList = gst_element_factory_list_get_elements(GST_ELEMENT_FACTORY_TYPE_ENCODER,
                                                                GST_RANK_MARGINAL);
@@ -289,7 +289,7 @@ static QList<QCameraImageCapture::FileFormat> getImageFormatList()
                 for (int i = 0; i < caps.size(); i++) {
                     QGstStructure structure = caps.at(i);
                     auto f = QGstreamerFormatInfo::imageFormatForCaps(structure);
-                    if (f != QCameraImageCapture::UnspecifiedFormat) {
+                    if (f != QImageCapture::UnspecifiedFormat) {
 //                        qDebug() << structure.toString() << f;
                         formats.insert(f);
                     }
diff --git a/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h b/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h
index 47d0f133a..f8de964e4 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamerformatinfo_p.h
@@ -71,7 +71,7 @@ public:
     static QMediaFormat::AudioCodec audioCodecForCaps(QGstStructure structure);
     static QMediaFormat::VideoCodec videoCodecForCaps(QGstStructure structure);
     static QMediaFormat::FileFormat fileFormatForCaps(QGstStructure structure);
-    static QCameraImageCapture::FileFormat imageFormatForCaps(QGstStructure structure);
+    static QImageCapture::FileFormat imageFormatForCaps(QGstStructure structure);
 
     QList<CodecMap> getMuxerList(bool demuxer, QList<QMediaFormat::AudioCodec> audioCodecs, QList<QMediaFormat::VideoCodec> videoCodecs);
 };
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
index 06a0f6af8..732f0ed9f 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration.cpp
@@ -44,7 +44,7 @@
 #include "private/qgstreameraudiodecoder_p.h"
 #include "private/qgstreamercamera_p.h"
 #include "private/qgstreamermediaencoder_p.h"
-#include "private/qgstreamercameraimagecapture_p.h"
+#include "private/qgstreamerimagecapture_p.h"
 #include "private/qgstreamerformatinfo_p.h"
 #include "private/qgstreamervideorenderer_p.h"
 #include "private/qgstreamervideosink_p.h"
@@ -101,9 +101,9 @@ QPlatformMediaEncoder *QGstreamerIntegration::createEncoder(QMediaRecorder *enco
     return new QGstreamerMediaEncoder(encoder);
 }
 
-QPlatformCameraImageCapture *QGstreamerIntegration::createImageCapture(QCameraImageCapture *imageCapture)
+QPlatformImageCapture *QGstreamerIntegration::createImageCapture(QImageCapture *imageCapture)
 {
-    return new QGstreamerCameraImageCapture(imageCapture);
+    return new QGstreamerImageCapture(imageCapture);
 }
 
 QPlatformVideoSink *QGstreamerIntegration::createVideoSink(QVideoSink *sink)
diff --git a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
index 0bd21ead4..14167e750 100644
--- a/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamerintegration_p.h
@@ -74,7 +74,7 @@ public:
     QPlatformMediaPlayer *createPlayer(QMediaPlayer *player) override;
     QPlatformCamera *createCamera(QCamera *) override;
     QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override;
-    QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override;
+    QPlatformImageCapture *createImageCapture(QImageCapture *) override;
 
     QPlatformVideoSink *createVideoSink(QVideoSink *sink) override;
 
diff --git a/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameraimagecapturecontrol.cpp
index 506544d74..5a78e1ee0 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)
-    : QPlatformCameraImageCapture(parent)
+    : QPlatformImageCapture(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 7a25cc0e3..62ba19c97 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 <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class BbCameraSession;
 
-class BbCameraImageCaptureControl : public QPlatformCameraImageCapture
+class BbCameraImageCaptureControl : public QPlatformImageCapture
 {
     Q_OBJECT
 public:
diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
index f116fea01..6f68e68ed 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice.cpp
@@ -78,7 +78,7 @@ QPlatformCamera *BbCameraService::camera()
     return m_cameraControl;
 }
 
-QPlatformCameraImageCapture *BbCameraService::imageCapture()
+QPlatformImageCapture *BbCameraService::imageCapture()
 {
     return m_cameraImageCaptureControl;
 }
diff --git a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
index 0f7f95b09..128fc1154 100644
--- a/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameraservice_p.h
@@ -76,7 +76,7 @@ public:
     ~BbCameraService();
 
     QPlatformCamera *camera() override;
-    QPlatformCameraImageCapture *imageCapture() override;
+    QPlatformImageCapture *imageCapture() override;
     QPlatformMediaEncoder *mediaEncoder() override;
 
     void setVideoPreview(QVideoSink *surface) override;
diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
index 3f31960e5..9ce740d20 100644
--- a/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcamerasession.cpp
@@ -317,7 +317,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b
         // We are inside a worker thread here, so emit error signal inside the main thread
         QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection,
                                   Q_ARG(int, data->requestId),
-                                  Q_ARG(QCameraImageCapture::Error, QCameraImageCapture::FormatError),
+                                  Q_ARG(QImageCapture::Error, QImageCapture::FormatError),
                                   Q_ARG(QString, BbCameraSession::tr("Camera provides image in unsupported format")));
         return;
     }
@@ -331,7 +331,7 @@ static void imageCaptureImageCallback(camera_handle_t handle, camera_buffer_t *b
         // We are inside a worker thread here, so emit error signal inside the main thread
         QMetaObject::invokeMethod(data->session, "imageCaptureError", Qt::QueuedConnection,
                                   Q_ARG(int, data->requestId),
-                                  Q_ARG(QCameraImageCapture::Error, QCameraImageCapture::FormatError),
+                                  Q_ARG(QImageCapture::Error, QImageCapture::FormatError),
                                   Q_ARG(QString, errorMessage));
         return;
     }
@@ -349,7 +349,7 @@ int BbCameraSession::capture(const QString &fileName)
     m_lastImageCaptureId++;
 
     if (!isReadyForCapture()) {
-        emit imageCaptureError(m_lastImageCaptureId, QCameraImageCapture::NotReadyError, tr("Camera not ready"));
+        emit imageCaptureError(m_lastImageCaptureId, QImageCapture::NotReadyError, tr("Camera not ready"));
         return m_lastImageCaptureId;
     }
 
@@ -631,11 +631,11 @@ void BbCameraSession::imageCaptured(int requestId, const QImage &rawImage, const
             if (image.save(&file, "JPG")) {
                 emit imageSaved(requestId, actualFileName);
             } else {
-                emit imageCaptureError(requestId, QCameraImageCapture::OutOfSpaceError, file.errorString());
+                emit imageCaptureError(requestId, QImageCapture::OutOfSpaceError, file.errorString());
             }
         } else {
             const QString errorMessage = tr("Could not open destination file:\n%1").arg(actualFileName);
-            emit imageCaptureError(requestId, QCameraImageCapture::ResourceError, errorMessage);
+            emit imageCaptureError(requestId, QImageCapture::ResourceError, errorMessage);
         }
     }
 }
diff --git a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h
index 4743eff40..b45a0e876 100644
--- a/src/multimedia/platform/qnx/camera/bbcamerasession_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcamerasession_p.h
@@ -53,7 +53,7 @@
 #include "bbmediastoragelocation_p.h"
 
 #include <QCamera>
-#include <QCameraImageCapture>
+#include <QImageCapture>
 #include <QElapsedTimer>
 #include <QMediaRecorder>
 #include <QMutex>
diff --git a/src/multimedia/platform/qplatformcameraimagecapture.cpp b/src/multimedia/platform/qplatformimagecapture.cpp
index 907fa3354..04c3ed337 100644
--- a/src/multimedia/platform/qplatformcameraimagecapture.cpp
+++ b/src/multimedia/platform/qplatformimagecapture.cpp
@@ -37,16 +37,16 @@
 **
 ****************************************************************************/
 
-#include "qplatformcameraimagecapture_p.h"
+#include "qplatformimagecapture_p.h"
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QPlatformCameraImageCapture
+    \class QPlatformImageCapture
     \obsolete
 
-    \brief The QPlatformCameraImageCapture class provides a control interface
+    \brief The QPlatformImageCapture class provides a control interface
     for image capture services.
 
     \inmodule QtMultimedia
@@ -57,14 +57,14 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a new image capture control object with the given \a parent
 */
-QPlatformCameraImageCapture::QPlatformCameraImageCapture(QCameraImageCapture *parent)
+QPlatformImageCapture::QPlatformImageCapture(QImageCapture *parent)
     : QObject(parent),
     m_imageCapture(parent)
 {
 }
 
 /*!
-    \fn QPlatformCameraImageCapture::isReadyForCapture() const
+    \fn QPlatformImageCapture::isReadyForCapture() const
 
     Identifies if a capture control is ready to perform a capture
     immediately (all the resources necessary for image capture are allocated,
@@ -80,13 +80,13 @@ QPlatformCameraImageCapture::QPlatformCameraImageCapture(QCameraImageCapture *pa
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::readyForCaptureChanged(bool ready)
+    \fn QPlatformImageCapture::readyForCaptureChanged(bool ready)
 
     Signals that a capture control's \a ready state has changed.
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::capture(const QString &fileName)
+    \fn QPlatformImageCapture::capture(const QString &fileName)
 
     Initiates the capture of an image to \a fileName.
     The \a fileName can be relative or empty,
@@ -103,13 +103,13 @@ QPlatformCameraImageCapture::QPlatformCameraImageCapture(QCameraImageCapture *pa
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::cancelCapture()
+    \fn QPlatformImageCapture::cancelCapture()
 
     Cancel pending capture requests.
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::imageExposed(int requestId)
+    \fn QPlatformImageCapture::imageExposed(int requestId)
 
     Signals that an image with it \a requestId
     has just been exposed.
@@ -117,14 +117,14 @@ QPlatformCameraImageCapture::QPlatformCameraImageCapture(QCameraImageCapture *pa
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::imageCaptured(int requestId, const QImage &preview)
+    \fn QPlatformImageCapture::imageCaptured(int requestId, const QImage &preview)
 
     Signals that an image with it \a requestId
     has been captured and a \a preview is available.
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::imageMetadataAvailable(int id, const QMediaMetaData &metaData)
+    \fn QPlatformImageCapture::imageMetadataAvailable(int id, const QMediaMetaData &metaData)
 
     Signals that a metadata for an image with request \a id is available.
 
@@ -132,20 +132,20 @@ QPlatformCameraImageCapture::QPlatformCameraImageCapture(QCameraImageCapture *pa
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::imageAvailable(int requestId, const QVideoFrame &buffer)
+    \fn QPlatformImageCapture::imageAvailable(int requestId, const QVideoFrame &buffer)
 
     Signals that a captured \a buffer with a \a requestId is available.
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::imageSaved(int requestId, const QString &fileName)
+    \fn QPlatformImageCapture::imageSaved(int requestId, const QString &fileName)
 
     Signals that a captured image with a \a requestId has been saved
     to \a fileName.
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::imageSettings() const
+    \fn QPlatformImageCapture::imageSettings() const
 
     Returns the currently used image encoder settings.
 
@@ -154,20 +154,20 @@ QPlatformCameraImageCapture::QPlatformCameraImageCapture(QCameraImageCapture *pa
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::setImageSettings(const QImageEncoderSettings &settings)
+    \fn QPlatformImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 
     Sets the selected image encoder \a settings.
 */
 
 /*!
-    \fn QPlatformCameraImageCapture::error(int id, int error, const QString &errorString)
+    \fn QPlatformImageCapture::error(int id, int error, const QString &errorString)
 
     Signals the capture request \a id failed with \a error code and message \a errorString.
 
-    \sa QCameraImageCapture::Error
+    \sa QImageCapture::Error
 */
 
 
 QT_END_NAMESPACE
 
-#include "moc_qplatformcameraimagecapture_p.cpp"
+#include "moc_qplatformimagecapture_p.cpp"
diff --git a/src/multimedia/platform/qplatformcameraimagecapture_p.h b/src/multimedia/platform/qplatformimagecapture_p.h
index 65f96a97d..441848ed0 100644
--- a/src/multimedia/platform/qplatformcameraimagecapture_p.h
+++ b/src/multimedia/platform/qplatformimagecapture_p.h
@@ -51,9 +51,9 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qcameraimagecapture.h>
+#include <QtMultimedia/qimagecapture.h>
 #include <QtMultimedia/qmediametadata.h>
-#include <QtMultimedia/qcameraimagecapture.h>
+#include <QtMultimedia/qimagecapture.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,9 +63,9 @@ class QPlatformMediaCaptureSession;
 class QImageEncoderSettingsPrivate;
 class Q_MULTIMEDIA_EXPORT QImageEncoderSettings
 {
-    QCameraImageCapture::FileFormat m_format = QCameraImageCapture::UnspecifiedFormat;
+    QImageCapture::FileFormat m_format = QImageCapture::UnspecifiedFormat;
     QSize m_resolution;
-    QCameraImageCapture::Quality m_quality = QCameraImageCapture::NormalQuality;
+    QImageCapture::Quality m_quality = QImageCapture::NormalQuality;
 
 public:
     bool operator==(const QImageEncoderSettings &other) {
@@ -75,18 +75,18 @@ public:
     }
     bool operator!=(const QImageEncoderSettings &other) { return !operator==(other); }
 
-    QCameraImageCapture::FileFormat format() const { return m_format; }
-    void setFormat(QCameraImageCapture::FileFormat f) { m_format = f; }
+    QImageCapture::FileFormat format() const { return m_format; }
+    void setFormat(QImageCapture::FileFormat f) { m_format = f; }
 
     QSize resolution() const { return m_resolution; }
     void setResolution(const QSize &s) { m_resolution = s; }
     void setResolution(int width, int height) { m_resolution = QSize(width, height); }
 
-    QCameraImageCapture::Quality quality() const { return m_quality; }
-    void setQuality(QCameraImageCapture::Quality quality) { m_quality = quality; }
+    QImageCapture::Quality quality() const { return m_quality; }
+    void setQuality(QImageCapture::Quality quality) { m_quality = quality; }
 };
 
-class Q_MULTIMEDIA_EXPORT QPlatformCameraImageCapture : public QObject
+class Q_MULTIMEDIA_EXPORT QPlatformImageCapture : public QObject
 {
     Q_OBJECT
 
@@ -102,7 +102,7 @@ public:
     virtual void setMetaData(const QMediaMetaData &m) { m_metaData = m; }
     QMediaMetaData metaData() const { return m_metaData; }
 
-    QCameraImageCapture *imageCapture() { return m_imageCapture; }
+    QImageCapture *imageCapture() { return m_imageCapture; }
 
 Q_SIGNALS:
     void readyForCaptureChanged(bool ready);
@@ -116,9 +116,9 @@ Q_SIGNALS:
     void error(int id, int error, const QString &errorString);
 
 protected:
-    explicit QPlatformCameraImageCapture(QCameraImageCapture *parent = nullptr);
+    explicit QPlatformImageCapture(QImageCapture *parent = nullptr);
 private:
-    QCameraImageCapture *m_imageCapture = nullptr;
+    QImageCapture *m_imageCapture = nullptr;
     QMediaMetaData m_metaData;
 };
 
diff --git a/src/multimedia/platform/qplatformmediacapture_p.h b/src/multimedia/platform/qplatformmediacapture_p.h
index 222a98686..a988f3de4 100644
--- a/src/multimedia/platform/qplatformmediacapture_p.h
+++ b/src/multimedia/platform/qplatformmediacapture_p.h
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 class QPlatformCamera;
-class QPlatformCameraImageCapture;
+class QPlatformImageCapture;
 class QPlatformMediaEncoder;
 class QAudioDevice;
 class QCameraDevice;
@@ -73,8 +73,8 @@ public:
     virtual QPlatformCamera *camera() = 0;
     virtual void setCamera(QPlatformCamera *) {}
 
-    virtual QPlatformCameraImageCapture *imageCapture() = 0;
-    virtual void setImageCapture(QPlatformCameraImageCapture *) {}
+    virtual QPlatformImageCapture *imageCapture() = 0;
+    virtual void setImageCapture(QPlatformImageCapture *) {}
 
     virtual QPlatformMediaEncoder *mediaEncoder() = 0;
     virtual void setMediaEncoder(QPlatformMediaEncoder *) {}
diff --git a/src/multimedia/platform/qplatformmediaformatinfo_p.h b/src/multimedia/platform/qplatformmediaformatinfo_p.h
index 9e56bee41..8842304ca 100644
--- a/src/multimedia/platform/qplatformmediaformatinfo_p.h
+++ b/src/multimedia/platform/qplatformmediaformatinfo_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <private/qtmultimediaglobal_p.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qmediaformat.h>
 
 QT_BEGIN_NAMESPACE
@@ -77,7 +77,7 @@ public:
     QList<CodecMap> encoders;
     QList<CodecMap> decoders;
 
-    QList<QCameraImageCapture::FileFormat> imageFormats;
+    QList<QImageCapture::FileFormat> imageFormats;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h
index 9d28a9528..67938d910 100644
--- a/src/multimedia/platform/qplatformmediaintegration_p.h
+++ b/src/multimedia/platform/qplatformmediaintegration_p.h
@@ -59,7 +59,7 @@ class QMediaPlayer;
 class QAudioDecoder;
 class QCamera;
 class QMediaRecorder;
-class QCameraImageCapture;
+class QImageCapture;
 class QMediaDevices;
 class QPlatformMediaDevices;
 class QPlatformMediaCaptureSession;
@@ -67,7 +67,7 @@ class QPlatformMediaPlayer;
 class QPlatformAudioDecoder;
 class QPlatformCamera;
 class QPlatformMediaEncoder;
-class QPlatformCameraImageCapture;
+class QPlatformImageCapture;
 class QPlatformMediaFormatInfo;
 class QObject;
 class QPlatformVideoSink;
@@ -94,7 +94,7 @@ public:
     virtual QPlatformMediaPlayer *createPlayer(QMediaPlayer *) { return nullptr; }
     virtual QPlatformCamera *createCamera(QCamera *) { return nullptr; }
     virtual QPlatformMediaEncoder *createEncoder(QMediaRecorder *) { return nullptr; }
-    virtual QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) { return nullptr; }
+    virtual QPlatformImageCapture *createImageCapture(QImageCapture *) { return nullptr; }
 
     virtual QPlatformAudioInput *createAudioInput(QAudioInput *);
     virtual QPlatformAudioOutput *createAudioOutput(QAudioOutput *);
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscameraimagecapture.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture.cpp
index b4499d61c..0c5e188ca 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscameraimagecapture.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qwindowscameraimagecapture_p.h"
+#include "qwindowsimagecapture_p.h"
 
 #include "qwindowsmediadevicesession_p.h"
 #include "qwindowsmediacapture_p.h"
@@ -47,21 +47,21 @@
 
 QT_BEGIN_NAMESPACE
 
-QWindowsCameraImageCapture::QWindowsCameraImageCapture(QCameraImageCapture *parent)
-    : QPlatformCameraImageCapture(parent)
+QWindowsImageCapture::QWindowsImageCapture(QImageCapture *parent)
+    : QPlatformImageCapture(parent)
 {
 }
 
-QWindowsCameraImageCapture::~QWindowsCameraImageCapture() = default;
+QWindowsImageCapture::~QWindowsImageCapture() = default;
 
-bool QWindowsCameraImageCapture::isReadyForCapture() const
+bool QWindowsImageCapture::isReadyForCapture() const
 {
     if (!m_mediaDeviceSession)
         return false;
     return !m_capturing && m_mediaDeviceSession->isActive() && !m_mediaDeviceSession->activeCamera().isNull();
 }
 
-int QWindowsCameraImageCapture::capture(const QString &fileName)
+int QWindowsImageCapture::capture(const QString &fileName)
 {
     QString ext = writerFormat(m_settings.format());
     QString path = m_storageLocation.generateFileName(fileName, QWindowsStorageLocation::Image,
@@ -69,12 +69,12 @@ int QWindowsCameraImageCapture::capture(const QString &fileName)
     return doCapture(path);
 }
 
-int QWindowsCameraImageCapture::captureToBuffer()
+int QWindowsImageCapture::captureToBuffer()
 {
     return doCapture(QString());
 }
 
-int QWindowsCameraImageCapture::doCapture(const QString &fileName)
+int QWindowsImageCapture::doCapture(const QString &fileName)
 {
     if (!isReadyForCapture())
         return -1;
@@ -83,17 +83,17 @@ int QWindowsCameraImageCapture::doCapture(const QString &fileName)
     return m_captureId;
 }
 
-QImageEncoderSettings QWindowsCameraImageCapture::imageSettings() const
+QImageEncoderSettings QWindowsImageCapture::imageSettings() const
 {
     return m_settings;
 }
 
-void QWindowsCameraImageCapture::setImageSettings(const QImageEncoderSettings &settings)
+void QWindowsImageCapture::setImageSettings(const QImageEncoderSettings &settings)
 {
     m_settings = settings;
 }
 
-void QWindowsCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
+void QWindowsImageCapture::setCaptureSession(QPlatformMediaCaptureSession *session)
 {
     QWindowsMediaCaptureService *captureService = static_cast<QWindowsMediaCaptureService *>(session);
     if (m_captureService == captureService)
@@ -118,7 +118,7 @@ void QWindowsCameraImageCapture::setCaptureSession(QPlatformMediaCaptureSession
             this, SLOT(handleNewVideoFrame(QVideoFrame)));
 }
 
-void QWindowsCameraImageCapture::handleNewVideoFrame(const QVideoFrame &frame)
+void QWindowsImageCapture::handleNewVideoFrame(const QVideoFrame &frame)
 {
     if (m_capturing) {
 
@@ -136,7 +136,7 @@ void QWindowsCameraImageCapture::handleNewVideoFrame(const QVideoFrame &frame)
 
         if (!m_fileName.isEmpty()) {
 
-            (void)QtConcurrent::run(&QWindowsCameraImageCapture::saveImage, this,
+            (void)QtConcurrent::run(&QWindowsImageCapture::saveImage, this,
                                     m_captureId, m_fileName, image, metaData, m_settings);
         }
 
@@ -145,7 +145,7 @@ void QWindowsCameraImageCapture::handleNewVideoFrame(const QVideoFrame &frame)
     }
 }
 
-void QWindowsCameraImageCapture::saveImage(int captureId, const QString &fileName,
+void QWindowsImageCapture::saveImage(int captureId, const QString &fileName,
                                            const QImage &image, const QMediaMetaData &metaData,
                                            const QImageEncoderSettings &settings)
 {
@@ -169,21 +169,21 @@ void QWindowsCameraImageCapture::saveImage(int captureId, const QString &fileNam
                               Q_ARG(int, captureId), Q_ARG(QString, fileName));
 }
 
-QString QWindowsCameraImageCapture::writerFormat(QCameraImageCapture::FileFormat reqFormat)
+QString QWindowsImageCapture::writerFormat(QImageCapture::FileFormat reqFormat)
 {
     QString format;
 
     switch (reqFormat) {
-    case QCameraImageCapture::FileFormat::JPEG:
+    case QImageCapture::FileFormat::JPEG:
         format = QLatin1String("jpg");
         break;
-    case QCameraImageCapture::FileFormat::PNG:
+    case QImageCapture::FileFormat::PNG:
         format = QLatin1String("png");
         break;
-    case QCameraImageCapture::FileFormat::WebP:
+    case QImageCapture::FileFormat::WebP:
         format = QLatin1String("webp");
         break;
-    case QCameraImageCapture::FileFormat::Tiff:
+    case QImageCapture::FileFormat::Tiff:
         format = QLatin1String("tiff");
         break;
     default:
@@ -198,22 +198,22 @@ QString QWindowsCameraImageCapture::writerFormat(QCameraImageCapture::FileFormat
     return QLatin1String("jpg");
 }
 
-int QWindowsCameraImageCapture::writerQuality(const QString &writerFormat,
-                                              QCameraImageCapture::Quality quality)
+int QWindowsImageCapture::writerQuality(const QString &writerFormat,
+                                              QImageCapture::Quality quality)
 {
     if (writerFormat.compare(QLatin1String("jpg"), Qt::CaseInsensitive) == 0 ||
             writerFormat.compare(QLatin1String("jpeg"), Qt::CaseInsensitive) == 0) {
 
         switch (quality) {
-        case QCameraImageCapture::Quality::VeryLowQuality:
+        case QImageCapture::Quality::VeryLowQuality:
             return 10;
-        case QCameraImageCapture::Quality::LowQuality:
+        case QImageCapture::Quality::LowQuality:
             return 30;
-        case QCameraImageCapture::Quality::NormalQuality:
+        case QImageCapture::Quality::NormalQuality:
             return 75;
-        case QCameraImageCapture::Quality::HighQuality:
+        case QImageCapture::Quality::HighQuality:
             return 90;
-        case QCameraImageCapture::Quality::VeryHighQuality:
+        case QImageCapture::Quality::VeryHighQuality:
             return 98;
         default:
             return 75;
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscameraimagecapture_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture_p.h
index 4cd405454..cafc71087 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscameraimagecapture_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsimagecapture_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWINDOWSCAMERAIMAGECAPTURE_H
-#define QWINDOWSCAMERAIMAGECAPTURE_H
+#ifndef QWindowsImageCapture_H
+#define QWindowsImageCapture_H
 
 //
 //  W A R N I N G
@@ -53,19 +53,19 @@
 
 #include "qwindowsstoragelocation_p.h"
 
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QWindowsMediaDeviceSession;
 class QWindowsMediaCaptureService;
 
-class QWindowsCameraImageCapture : public QPlatformCameraImageCapture
+class QWindowsImageCapture : public QPlatformImageCapture
 {
     Q_OBJECT
 public:
-    explicit QWindowsCameraImageCapture(QCameraImageCapture *parent);
-    virtual ~QWindowsCameraImageCapture();
+    explicit QWindowsImageCapture(QImageCapture *parent);
+    virtual ~QWindowsImageCapture();
 
     bool isReadyForCapture() const override;
 
@@ -85,9 +85,9 @@ private:
     void saveImage(int captureId, const QString &fileName,
                    const QImage &image, const QMediaMetaData &metaData,
                    const QImageEncoderSettings &settings);
-    QString writerFormat(QCameraImageCapture::FileFormat reqFormat);
+    QString writerFormat(QImageCapture::FileFormat reqFormat);
     int writerQuality(const QString &writerFormat,
-                      QCameraImageCapture::Quality quality);
+                      QImageCapture::Quality quality);
 
     QWindowsMediaCaptureService  *m_captureService = nullptr;
     QWindowsMediaDeviceSession   *m_mediaDeviceSession = nullptr;
@@ -100,4 +100,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // QWINDOWSCAMERAIMAGECAPTURE_H
+#endif  // QWindowsImageCapture_H
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
index 043e3ac41..34be2e7cb 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
@@ -42,7 +42,7 @@
 #include "qwindowsmediaencoder_p.h"
 #include "qwindowscamera_p.h"
 #include "qwindowsmediadevicesession_p.h"
-#include "qwindowscameraimagecapture_p.h"
+#include "qwindowsimagecapture_p.h"
 #include "qmediadevices.h"
 #include "qaudiodevice.h"
 #include "qplatformaudioinput_p.h"
@@ -79,14 +79,14 @@ void QWindowsMediaCaptureService::setCamera(QPlatformCamera *camera)
     emit cameraChanged();
 }
 
-QPlatformCameraImageCapture *QWindowsMediaCaptureService::imageCapture()
+QPlatformImageCapture *QWindowsMediaCaptureService::imageCapture()
 {
     return m_imageCapture;
 }
 
-void QWindowsMediaCaptureService::setImageCapture(QPlatformCameraImageCapture *imageCapture)
+void QWindowsMediaCaptureService::setImageCapture(QPlatformImageCapture *imageCapture)
 {
-    QWindowsCameraImageCapture *control = static_cast<QWindowsCameraImageCapture *>(imageCapture);
+    QWindowsImageCapture *control = static_cast<QWindowsImageCapture *>(imageCapture);
     if (m_imageCapture == control)
         return;
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
index f5da2f498..a1a167a6d 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QWindowsMediaEncoder;
 class QWindowsCamera;
 class QWindowsMediaDeviceSession;
-class QWindowsCameraImageCapture;
+class QWindowsImageCapture;
 class QPlatformAudioInput;
 
 class QWindowsMediaCaptureService : public QPlatformMediaCaptureSession
@@ -72,8 +72,8 @@ public:
     QPlatformCamera *camera() override;
     void setCamera(QPlatformCamera *camera) override;
 
-    QPlatformCameraImageCapture *imageCapture() override;
-    void setImageCapture(QPlatformCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *imageCapture() override;
+    void setImageCapture(QPlatformImageCapture *imageCapture) override;
 
     QPlatformMediaEncoder *mediaEncoder() override;
     void setMediaEncoder(QPlatformMediaEncoder *encoder) override;
@@ -87,7 +87,7 @@ public:
 private:
     QWindowsCamera              *m_camera = nullptr;
     QWindowsMediaDeviceSession  *m_mediaDeviceSession = nullptr;
-    QWindowsCameraImageCapture  *m_imageCapture = nullptr;
+    QWindowsImageCapture  *m_imageCapture = nullptr;
     QWindowsMediaEncoder        *m_encoder = nullptr;
 };
 
diff --git a/src/multimedia/platform/windows/qwindowsformatinfo.cpp b/src/multimedia/platform/windows/qwindowsformatinfo.cpp
index 2e308ffbe..cda24d6eb 100644
--- a/src/multimedia/platform/windows/qwindowsformatinfo.cpp
+++ b/src/multimedia/platform/windows/qwindowsformatinfo.cpp
@@ -81,7 +81,7 @@ QWindowsFormatInfo::QWindowsFormatInfo()
     };
 
     // ####
-    imageFormats = { QCameraImageCapture::JPEG, QCameraImageCapture::PNG };
+    imageFormats = { QImageCapture::JPEG, QImageCapture::PNG };
 
 }
 
diff --git a/src/multimedia/platform/windows/qwindowsintegration.cpp b/src/multimedia/platform/windows/qwindowsintegration.cpp
index 7509205a4..8f259beb7 100644
--- a/src/multimedia/platform/windows/qwindowsintegration.cpp
+++ b/src/multimedia/platform/windows/qwindowsintegration.cpp
@@ -41,7 +41,7 @@
 #include <private/qwindowsmediadevices_p.h>
 #include <private/qwindowsformatinfo_p.h>
 #include <private/qwindowsmediacapture_p.h>
-#include <private/qwindowscameraimagecapture_p.h>
+#include <private/qwindowsimagecapture_p.h>
 #include <private/qwindowscamera_p.h>
 #include <private/qwindowsmediaencoder_p.h>
 #include <private/mfplayercontrol_p.h>
@@ -113,9 +113,9 @@ QPlatformMediaEncoder *QWindowsIntegration::createEncoder(QMediaRecorder *encode
     return new QWindowsMediaEncoder(encoder);
 }
 
-QPlatformCameraImageCapture *QWindowsIntegration::createImageCapture(QCameraImageCapture *imageCapture)
+QPlatformImageCapture *QWindowsIntegration::createImageCapture(QImageCapture *imageCapture)
 {
-    return new QWindowsCameraImageCapture(imageCapture);
+    return new QWindowsImageCapture(imageCapture);
 }
 
 QPlatformVideoSink *QWindowsIntegration::createVideoSink(QVideoSink *sink)
diff --git a/src/multimedia/platform/windows/qwindowsintegration_p.h b/src/multimedia/platform/windows/qwindowsintegration_p.h
index 9d3c9b836..44edf8900 100644
--- a/src/multimedia/platform/windows/qwindowsintegration_p.h
+++ b/src/multimedia/platform/windows/qwindowsintegration_p.h
@@ -76,7 +76,7 @@ public:
     QPlatformMediaPlayer *createPlayer(QMediaPlayer *parent) override;
     QPlatformCamera *createCamera(QCamera *camera) override;
     QPlatformMediaEncoder *createEncoder(QMediaRecorder *encoder) override;
-    QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *imageCapture) override;
+    QPlatformImageCapture *createImageCapture(QImageCapture *imageCapture) override;
 
     QPlatformVideoSink *createVideoSink(QVideoSink *sink) override;
 
diff --git a/src/multimedia/recording/qmediacapturesession.cpp b/src/multimedia/recording/qmediacapturesession.cpp
index d82800e35..9343c5282 100644
--- a/src/multimedia/recording/qmediacapturesession.cpp
+++ b/src/multimedia/recording/qmediacapturesession.cpp
@@ -41,7 +41,7 @@
 #include "qaudiodevice.h"
 #include "qcamera.h"
 #include "qmediarecorder.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
 #include "qvideosink.h"
 
 #include <qpointer.h>
@@ -61,7 +61,7 @@ public:
     QAudioInput *audioInput = nullptr;
     QAudioOutput *audioOutput = nullptr;
     QCamera *camera = nullptr;
-    QCameraImageCapture *imageCapture = nullptr;
+    QImageCapture *imageCapture = nullptr;
     QMediaRecorder *encoder = nullptr;
     QVideoSink *videoSink = nullptr;
     QPointer<QObject> videoOutput;
@@ -94,13 +94,13 @@ public:
     A preview of the captured media can be seen by setting a QVideoSink of QVideoWidget using setVideoOutput()
     and heard by routing the audio to an output device using setAudioOutput().
 
-    You can capture still images from a camera by setting a QCameraImageCapture object on the capture session,
+    You can capture still images from a camera by setting a QImageCapture object on the capture session,
     and record audio/video using a QMediaRecorder.
 
     If you need a simple class that records media from the default camera and microphone, you can use QMediaRecorder.
     That class uses a QMediaCaptureSession behind the scene to support audio and video capture.
 
-    \sa QCamera, QAudioDevice, QMediaRecorder, QCameraImageCapture, QMediaRecorder
+    \sa QCamera, QAudioDevice, QMediaRecorder, QImageCapture, QMediaRecorder
 */
 
 /*!
@@ -194,15 +194,15 @@ void QMediaCaptureSession::setCamera(QCamera *camera)
 
     \brief the object used to capture still images.
 
-    Add a QCameraImageCapture object to the capture session to enable
+    Add a QImageCapture object to the capture session to enable
     capturing of still images from the camera.
 */
-QCameraImageCapture *QMediaCaptureSession::imageCapture()
+QImageCapture *QMediaCaptureSession::imageCapture()
 {
     return d_ptr->imageCapture;
 }
 
-void QMediaCaptureSession::setImageCapture(QCameraImageCapture *imageCapture)
+void QMediaCaptureSession::setImageCapture(QImageCapture *imageCapture)
 {
     if (d_ptr->imageCapture == imageCapture)
         return;
diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h
index 8d662a3bd..d556f9592 100644
--- a/src/multimedia/recording/qmediacapturesession.h
+++ b/src/multimedia/recording/qmediacapturesession.h
@@ -49,7 +49,7 @@ class QCamera;
 class QAudioInput;
 class QAudioOutput;
 class QCameraDevice;
-class QCameraImageCapture; // ### rename to QMediaImageCapture
+class QImageCapture; // ### rename to QMediaImageCapture
 class QMediaRecorder;
 class QPlatformMediaCaptureSession;
 class QVideoSink;
@@ -60,7 +60,7 @@ class Q_MULTIMEDIA_EXPORT QMediaCaptureSession : public QObject
     Q_OBJECT
     Q_PROPERTY(QAudioInput *audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
     Q_PROPERTY(QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
-    Q_PROPERTY(QCameraImageCapture *imageCapture READ imageCapture WRITE setImageCapture NOTIFY imageCaptureChanged)
+    Q_PROPERTY(QImageCapture *imageCapture READ imageCapture WRITE setImageCapture NOTIFY imageCaptureChanged)
     Q_PROPERTY(QMediaRecorder *encoder READ encoder WRITE setEncoder NOTIFY encoderChanged)
     Q_PROPERTY(QObject *videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged)
 public:
@@ -75,8 +75,8 @@ public:
     QCamera *camera() const;
     void setCamera(QCamera *camera);
 
-    QCameraImageCapture *imageCapture();
-    void setImageCapture(QCameraImageCapture *imageCapture);
+    QImageCapture *imageCapture();
+    void setImageCapture(QImageCapture *imageCapture);
 
     QMediaRecorder *encoder();
     void setEncoder(QMediaRecorder *recorder);
diff --git a/src/multimediaquick/qquickimagecapture.cpp b/src/multimediaquick/qquickimagecapture.cpp
index 27f655c85..76a25db46 100644
--- a/src/multimediaquick/qquickimagecapture.cpp
+++ b/src/multimediaquick/qquickimagecapture.cpp
@@ -87,7 +87,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QQuickImageCapture::QQuickImageCapture(QObject *parent)
-    : QCameraImageCapture(parent)
+    : QImageCapture(parent)
 {
     connect(this, SIGNAL(imageCaptured(int,QImage)), this, SLOT(_q_imageCaptured(int,QImage)));
 }
diff --git a/src/multimediaquick/qquickimagecapture_p.h b/src/multimediaquick/qquickimagecapture_p.h
index f01d95ecf..9b88232c0 100644
--- a/src/multimediaquick/qquickimagecapture_p.h
+++ b/src/multimediaquick/qquickimagecapture_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qcamera.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qmediametadata.h>
 
 #include <QtQml/qqml.h>
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QUrl;
 
-class QQuickImageCapture : public QCameraImageCapture
+class QQuickImageCapture : public QImageCapture
 {
     Q_OBJECT
     Q_PROPERTY(QString preview READ preview NOTIFY previewChanged)
diff --git a/src/multimediaquick/qtmultimediaquicktypes_p.h b/src/multimediaquick/qtmultimediaquicktypes_p.h
index f44e3245b..dc4de9450 100644
--- a/src/multimediaquick/qtmultimediaquicktypes_p.h
+++ b/src/multimediaquick/qtmultimediaquicktypes_p.h
@@ -85,10 +85,10 @@ struct QCameraForeign
     QML_NAMED_ELEMENT(Camera)
 };
 
-struct QCameraImageCaptureForeign
+struct QImageCaptureForeign
 {
     Q_GADGET
-    QML_FOREIGN(QCameraImageCapture)
+    QML_FOREIGN(QImageCapture)
     QML_NAMED_ELEMENT(ImageCapture)
 };
 
diff --git a/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp b/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp
index a63bf50a9..f6984e7d3 100644
--- a/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimediawidgets/doc/snippets/multimedia-snippets/camera.cpp
@@ -41,12 +41,12 @@
 // Extracted from src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
 #include "qcamera.h"
 #include "qvideowidget.h"
-#include "qcameraimagecapture.h"
+#include "qimagecapture.h"
 
 /* Globals so that everything is consistent. */
 QCamera *camera = 0;
 QCameraViewfinder *viewfinder = 0;
-QCameraImageCapture *imageCapture = 0;
+QImageCapture *imageCapture = 0;
 
 void camera_blah()
 {
@@ -58,7 +58,7 @@ void camera_blah()
 
     camera->setViewfinder(viewfinder);
 
-    imageCapture = new QCameraImageCapture(camera);
+    imageCapture = new QImageCapture(camera);
 
     camera->setCaptureMode(QCamera::CaptureStillImage);
     camera->start();
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 7bcc0dc72..a656c1da0 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -33,10 +33,10 @@
 #include <QDebug>
 
 #include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include <qcamera.h>
 #include <qcameradevice.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qmediacapturesession.h>
 #include <qobject.h>
 #include <qmediadevices.h>
@@ -158,7 +158,7 @@ void tst_QCameraBackend::testCameraStates()
     QMediaCaptureSession session;
     QCamera camera;
     camera.setCameraDevice(QCameraDevice());
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -218,7 +218,7 @@ void tst_QCameraBackend::testCameraCapture()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -229,11 +229,11 @@ void tst_QCameraBackend::testCameraCapture()
 
     QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage)));
     QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
-    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,const QString&)));
+    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,const QString&)));
 
     imageCapture.captureToFile();
     QTRY_COMPARE(errorSignal.size(), 1);
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError);
     QCOMPARE(capturedSignal.size(), 0);
     errorSignal.clear();
 
@@ -253,7 +253,7 @@ void tst_QCameraBackend::testCameraCapture()
     QTRY_COMPARE(capturedSignal.size(), 1);
     QCOMPARE(capturedSignal.last().first().toInt(), id);
     QCOMPARE(errorSignal.size(), 0);
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NoError);
 
     QCOMPARE(savedSignal.last().first().toInt(), id);
     QString location = savedSignal.last().last().toString();
@@ -274,7 +274,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
 
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -287,7 +287,7 @@ void tst_QCameraBackend::testCaptureToBuffer()
     QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage)));
     QSignalSpy imageAvailableSignal(&imageCapture, SIGNAL(imageAvailable(int,QVideoFrame)));
     QSignalSpy savedSignal(&imageCapture, SIGNAL(imageSaved(int,QString)));
-    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,const QString&)));
+    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,const QString&)));
 
     camera.start();
     QTRY_VERIFY(imageCapture.isReadyForCapture());
@@ -323,7 +323,7 @@ void tst_QCameraBackend::testCameraCaptureMetadata()
 
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.cpp b/tests/auto/unit/mockbackend/qmockimagecapture.cpp
index 23e9fad60..9e2396113 100644
--- a/tests/auto/unit/mockbackend/qmockimagecapture.cpp
+++ b/tests/auto/unit/mockbackend/qmockimagecapture.cpp
@@ -29,11 +29,11 @@
 #include <qmockimagecapture.h>
 #include <qmockcamera.h>
 #include <qmockmediacapturesession.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qcamera.h>
 
-QMockImageCapture::QMockImageCapture(QCameraImageCapture *parent)
-    : QPlatformCameraImageCapture(parent)
+QMockImageCapture::QMockImageCapture(QImageCapture *parent)
+    : QPlatformImageCapture(parent)
 {
 }
 
@@ -51,7 +51,7 @@ int QMockImageCapture::capture(const QString &fileName)
         QTimer::singleShot(5, this, SLOT(captured()));
         return m_captureRequest;
     } else {
-        emit error(-1, QCameraImageCapture::NotReadyError,
+        emit error(-1, QImageCapture::NotReadyError,
                    QLatin1String("Could not capture in stopped state"));
     }
 
diff --git a/tests/auto/unit/mockbackend/qmockimagecapture.h b/tests/auto/unit/mockbackend/qmockimagecapture.h
index 139c12474..8d7cea1a4 100644
--- a/tests/auto/unit/mockbackend/qmockimagecapture.h
+++ b/tests/auto/unit/mockbackend/qmockimagecapture.h
@@ -33,18 +33,18 @@
 #include <QTimer>
 #include <QtMultimedia/qmediametadata.h>
 
-#include "private/qplatformcameraimagecapture_p.h"
+#include "private/qplatformimagecapture_p.h"
 #include "private/qplatformcamera_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QMockMediaCaptureSession;
 
-class QMockImageCapture : public QPlatformCameraImageCapture
+class QMockImageCapture : public QPlatformImageCapture
 {
     Q_OBJECT
 public:
-    QMockImageCapture(QCameraImageCapture *parent);
+    QMockImageCapture(QImageCapture *parent);
 
     ~QMockImageCapture()
     {
diff --git a/tests/auto/unit/mockbackend/qmockintegration.cpp b/tests/auto/unit/mockbackend/qmockintegration.cpp
index 614542042..16e65a7b8 100644
--- a/tests/auto/unit/mockbackend/qmockintegration.cpp
+++ b/tests/auto/unit/mockbackend/qmockintegration.cpp
@@ -94,7 +94,7 @@ QPlatformCamera *QMockIntegration::createCamera(QCamera *parent)
     return m_lastCamera;
 }
 
-QPlatformCameraImageCapture *QMockIntegration::createImageCapture(QCameraImageCapture *capture)
+QPlatformImageCapture *QMockIntegration::createImageCapture(QImageCapture *capture)
 {
     return new QMockImageCapture(capture);
 }
diff --git a/tests/auto/unit/mockbackend/qmockintegration_p.h b/tests/auto/unit/mockbackend/qmockintegration_p.h
index e46b35713..7c32d7783 100644
--- a/tests/auto/unit/mockbackend/qmockintegration_p.h
+++ b/tests/auto/unit/mockbackend/qmockintegration_p.h
@@ -75,7 +75,7 @@ public:
     QPlatformMediaPlayer *createPlayer(QMediaPlayer *) override;
     QPlatformCamera *createCamera(QCamera *) override;
     QPlatformMediaEncoder *createEncoder(QMediaRecorder *) override;
-    QPlatformCameraImageCapture *createImageCapture(QCameraImageCapture *) override;
+    QPlatformImageCapture *createImageCapture(QImageCapture *) override;
     QPlatformMediaCaptureSession *createCaptureSession() override;
     QPlatformVideoSink *createVideoSink(QVideoSink *) override;
 
diff --git a/tests/auto/unit/mockbackend/qmockmediacapturesession.h b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
index 8ddbeefcd..1d18c664b 100644
--- a/tests/auto/unit/mockbackend/qmockmediacapturesession.h
+++ b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
@@ -60,11 +60,11 @@ public:
         mockCameraControl = control;
     }
 
-    void setImageCapture(QPlatformCameraImageCapture *imageCapture) override
+    void setImageCapture(QPlatformImageCapture *imageCapture) override
     {
         mockImageCapture = imageCapture;
     }
-    QPlatformCameraImageCapture *imageCapture() override { return hasControls ? mockImageCapture : nullptr; }
+    QPlatformImageCapture *imageCapture() override { return hasControls ? mockImageCapture : nullptr; }
 
     QPlatformMediaEncoder *mediaEncoder() override { return hasControls ? mockControl : nullptr; }
     void setMediaEncoder(QPlatformMediaEncoder *encoder) override
@@ -88,7 +88,7 @@ public:
     }
 
     QMockCamera *mockCameraControl = nullptr;
-    QPlatformCameraImageCapture *mockImageCapture = nullptr;
+    QPlatformImageCapture *mockImageCapture = nullptr;
     QMockMediaEncoder *mockControl = nullptr;
     QPlatformAudioInput *m_audioInput = nullptr;
     bool hasControls;
diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt
index d90d15903..46e48ca6c 100644
--- a/tests/auto/unit/multimedia/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(qaudioformat)
 add_subdirectory(qaudionamespace)
 add_subdirectory(qcamera)
 add_subdirectory(qcameradevice)
-add_subdirectory(qcameraimagecapture)
+add_subdirectory(qimagecapture)
 add_subdirectory(qmediaformat)
 add_subdirectory(qmediaplayer)
 add_subdirectory(qmediaplaylist)
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 7d231276b..8955e08fc 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -33,10 +33,10 @@
 
 #include <qvideosink.h>
 #include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include <qcamera.h>
 #include <qcameradevice.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qmediacapturesession.h>
 #include <qobject.h>
 #include <qmediadevices.h>
@@ -211,26 +211,26 @@ void tst_QCamera::testSimpleCameraCapture()
 
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
     QVERIFY(!imageCapture.isReadyForCapture());
     QVERIFY(imageCapture.isAvailable());
 
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NoError);
     QVERIFY(imageCapture.errorString().isEmpty());
 
-    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,QString)));
+    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString)));
     imageCapture.captureToFile(QString::fromLatin1("/dev/null"));
     QCOMPARE(errorSignal.size(), 1);
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError);
     QVERIFY(!imageCapture.errorString().isEmpty());
 
     camera.start();
     imageCapture.captureToFile(QString::fromLatin1("/dev/null"));
     QCOMPARE(errorSignal.size(), 1);
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NoError);
     QVERIFY(imageCapture.errorString().isEmpty());
 }
 
@@ -238,19 +238,19 @@ void tst_QCamera::testCameraCapture()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
     QVERIFY(!imageCapture.isReadyForCapture());
 
     QSignalSpy capturedSignal(&imageCapture, SIGNAL(imageCaptured(int,QImage)));
-    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,QString)));
+    QSignalSpy errorSignal(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString)));
 
     imageCapture.captureToFile(QString::fromLatin1("/dev/null"));
     QCOMPARE(capturedSignal.size(), 0);
     QCOMPARE(errorSignal.size(), 1);
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError);
 
     errorSignal.clear();
 
@@ -262,14 +262,14 @@ void tst_QCamera::testCameraCapture()
 
     QTRY_COMPARE(capturedSignal.size(), 1);
     QCOMPARE(errorSignal.size(), 0);
-    QCOMPARE(imageCapture.error(), QCameraImageCapture::NoError);
+    QCOMPARE(imageCapture.error(), QImageCapture::NoError);
 }
 
 void tst_QCamera::testCameraCaptureMetadata()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -440,7 +440,7 @@ void tst_QCamera::testCameraEncodingProperyChange()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt b/tests/auto/unit/multimedia/qimagecapture/CMakeLists.txt
index 11b5c643a..11a2c79bc 100644
--- a/tests/auto/unit/multimedia/qcameraimagecapture/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qimagecapture/CMakeLists.txt
@@ -1,12 +1,12 @@
-# Generated from qcameraimagecapture.pro.
+# Generated from qimagecapture.pro.
 
 #####################################################################
-## tst_qcameraimagecapture Test:
+## tst_qimagecapture Test:
 #####################################################################
 
-qt_internal_add_test(tst_qcameraimagecapture
+qt_internal_add_test(tst_qimagecapture
     SOURCES
-        tst_qcameraimagecapture.cpp
+        tst_qimagecapture.cpp
     INCLUDE_DIRECTORIES
         ../../mockbackend
     PUBLIC_LIBRARIES
diff --git a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp
index c69af0621..b81f989db 100644
--- a/tests/auto/unit/multimedia/qcameraimagecapture/tst_qcameraimagecapture.cpp
+++ b/tests/auto/unit/multimedia/qimagecapture/tst_qimagecapture.cpp
@@ -30,9 +30,9 @@
 #include <QDebug>
 
 #include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include <qcamera.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qmediacapturesession.h>
 
 #include "qmockmediacapturesession.h"
@@ -40,7 +40,7 @@
 
 QT_USE_NAMESPACE
 
-class tst_QCameraImageCapture: public QObject
+class tst_QImageCapture: public QObject
 {
     Q_OBJECT
 
@@ -68,40 +68,40 @@ private:
     QMockIntegration *mockIntegration;
 };
 
-void tst_QCameraImageCapture::initTestCase()
+void tst_QImageCapture::initTestCase()
 {
     mockIntegration = new QMockIntegration;
 }
 
-void tst_QCameraImageCapture::init()
+void tst_QImageCapture::init()
 {
 }
 
-void tst_QCameraImageCapture::cleanup()
+void tst_QImageCapture::cleanup()
 {
 }
 
-void tst_QCameraImageCapture::cleanupTestCase()
+void tst_QImageCapture::cleanupTestCase()
 {
     delete mockIntegration;
 }
 
-void tst_QCameraImageCapture::constructor()
+void tst_QImageCapture::constructor()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
     QVERIFY(imageCapture.isAvailable() == true);
 }
 
-void tst_QCameraImageCapture::isAvailable()
+void tst_QImageCapture::isAvailable()
 {
     {
         QMediaCaptureSession session;
-        QCameraImageCapture imageCapture;
+        QImageCapture imageCapture;
         session.setImageCapture(&imageCapture);
 
         QVERIFY(!imageCapture.isAvailable());
@@ -110,7 +110,7 @@ void tst_QCameraImageCapture::isAvailable()
     {
         QMediaCaptureSession session;
         QCamera camera;
-        QCameraImageCapture imageCapture;
+        QImageCapture imageCapture;
         session.setCamera(&camera);
         session.setImageCapture(&imageCapture);
 
@@ -118,11 +118,11 @@ void tst_QCameraImageCapture::isAvailable()
     }
 }
 
-void tst_QCameraImageCapture::deleteMediaSource()
+void tst_QImageCapture::deleteMediaSource()
 {
     QMediaCaptureSession session;
     QCamera *camera = new QCamera;
-    QCameraImageCapture *capture = new QCameraImageCapture;
+    QImageCapture *capture = new QImageCapture;
     session.setCamera(camera);
     session.setImageCapture(capture);
 
@@ -137,11 +137,11 @@ void tst_QCameraImageCapture::deleteMediaSource()
     delete capture;
 }
 
-void tst_QCameraImageCapture::isReadyForCapture()
+void tst_QImageCapture::isReadyForCapture()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -154,11 +154,11 @@ void tst_QCameraImageCapture::isReadyForCapture()
     camera.stop();
 }
 
-void tst_QCameraImageCapture::capture()
+void tst_QImageCapture::capture()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -172,77 +172,77 @@ void tst_QCameraImageCapture::capture()
     camera.stop();
 }
 
-void tst_QCameraImageCapture::encodingSettings()
+void tst_QImageCapture::encodingSettings()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
     QVERIFY(imageCapture.isAvailable() == true);
-    imageCapture.setFileFormat(QCameraImageCapture::JPEG);
-    imageCapture.setQuality(QCameraImageCapture::NormalQuality);
-    QVERIFY(imageCapture.fileFormat() == QCameraImageCapture::JPEG);
-    QVERIFY(imageCapture.quality() == QCameraImageCapture::NormalQuality);
+    imageCapture.setFileFormat(QImageCapture::JPEG);
+    imageCapture.setQuality(QImageCapture::NormalQuality);
+    QVERIFY(imageCapture.fileFormat() == QImageCapture::JPEG);
+    QVERIFY(imageCapture.quality() == QImageCapture::NormalQuality);
 }
 
-void tst_QCameraImageCapture::errors()
+void tst_QImageCapture::errors()
 {
     QMockCamera::Simple simple;
 
     {
         QMediaCaptureSession session;
         QCamera camera;
-        QCameraImageCapture imageCapture;
+        QImageCapture imageCapture;
         session.setCamera(&camera);
         session.setImageCapture(&imageCapture);
 
         QVERIFY(imageCapture.isAvailable() == true);
         imageCapture.captureToFile(QString::fromLatin1("/dev/null"));
-        QCOMPARE(imageCapture.error(), QCameraImageCapture::NotReadyError);
+        QCOMPARE(imageCapture.error(), QImageCapture::NotReadyError);
         QVERIFY(!imageCapture.errorString().isEmpty());
     }
 
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
     camera.start();
 
     QVERIFY(imageCapture.isAvailable() == true);
-    QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
+    QVERIFY(imageCapture.error() == QImageCapture::NoError);
     QVERIFY(imageCapture.errorString().isEmpty());
 
     imageCapture.captureToFile();
-    QVERIFY(imageCapture.error() == QCameraImageCapture::NoError);
+    QVERIFY(imageCapture.error() == QImageCapture::NoError);
     QVERIFY(imageCapture.errorString().isEmpty());
 }
 
-void tst_QCameraImageCapture::error()
+void tst_QImageCapture::error()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
-    QSignalSpy spy(&imageCapture, SIGNAL(errorOccurred(int,QCameraImageCapture::Error,QString)));
+    QSignalSpy spy(&imageCapture, SIGNAL(errorOccurred(int,QImageCapture::Error,QString)));
     imageCapture.captureToFile();
     QTest::qWait(30);
     QVERIFY(spy.count() == 1);
     QVERIFY(qvariant_cast<int>(spy.at(0).at(0)) == -1);
-    QVERIFY(qvariant_cast<QCameraImageCapture::Error>(spy.at(0).at(1)) == QCameraImageCapture::NotReadyError);
+    QVERIFY(qvariant_cast<QImageCapture::Error>(spy.at(0).at(1)) == QImageCapture::NotReadyError);
     QVERIFY(qvariant_cast<QString>(spy.at(0).at(2)) == "Could not capture in stopped state");
     spy.clear();
 }
 
-void tst_QCameraImageCapture::imageCaptured()
+void tst_QImageCapture::imageCaptured()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -261,11 +261,11 @@ void tst_QCameraImageCapture::imageCaptured()
     camera.stop();
 }
 
-void tst_QCameraImageCapture::imageExposed()
+void tst_QImageCapture::imageExposed()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -282,11 +282,11 @@ void tst_QCameraImageCapture::imageExposed()
     camera.stop();
 }
 
-void tst_QCameraImageCapture::imageSaved()
+void tst_QImageCapture::imageSaved()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -304,11 +304,11 @@ void tst_QCameraImageCapture::imageSaved()
     camera.stop();
 }
 
-void tst_QCameraImageCapture::readyForCaptureChanged()
+void tst_QImageCapture::readyForCaptureChanged()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
 
@@ -329,6 +329,6 @@ void tst_QCameraImageCapture::readyForCaptureChanged()
     spy.clear();
 }
 
-QTEST_MAIN(tst_QCameraImageCapture)
+QTEST_MAIN(tst_QImageCapture)
 
-#include "tst_qcameraimagecapture.moc"
+#include "tst_qimagecapture.moc"
diff --git a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
index 26facdd9a..7db456190 100644
--- a/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
+++ b/tests/auto/unit/multimediawidgets/qcamerawidgets/tst_qcamerawidgets.cpp
@@ -32,10 +32,10 @@
 #include <QDebug>
 
 #include <private/qplatformcamera_p.h>
-#include <private/qplatformcameraimagecapture_p.h>
+#include <private/qplatformimagecapture_p.h>
 #include <qmediacapturesession.h>
 #include <qcamera.h>
-#include <qcameraimagecapture.h>
+#include <qimagecapture.h>
 #include <qgraphicsvideoitem.h>
 #include <qobject.h>
 #include <qvideowidget.h>
@@ -76,7 +76,7 @@ void tst_QCameraWidgets::testCameraEncodingProperyChange()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    QCameraImageCapture imageCapture;
+    QImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
author	Lars Knoll <lars.knoll@qt.io>	2021-06-15 16:09:34 +0200
committer	Lars Knoll <lars.knoll@qt.io>	2021-06-17 13:40:52 +0200
commit	83a031c56b74d68fe6d349f78c48a1681e40374e (patch)
tree	fd4cd75d49009ed21c525564070c11492645afe2
parent	8fc76abb75b8a97bb5ef695d4bc8d59c6ef0c0b5 (diff)