Rename QCamera::cameraInfo to cameraDevice

And take the opportunity to clean up variable naming as well.

Change-Id: I510cc8295b8d35554534a3c2ac9d83bf6f5a9d65
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

22 files changed, 110 insertions, 110 deletions

diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
index bfe539468..72a502684 100644
--- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml
@@ -137,7 +137,7 @@ FocusScope {
 
             CameraListButton {
                 model: MediaDevices.videoInputs
-                onValueChanged: captureSession.camera.cameraInfo = value
+                onValueChanged: captureSession.camera.cameraDevice = value
             }
 
             CameraButton {
diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
index ac3cbe3e0..3fc787d30 100644
--- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml
+++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml
@@ -112,7 +112,7 @@ FocusScope {
 
             CameraListButton {
                 model: MediaDevices.videoInputs
-                onValueChanged: captureSession.camera.cameraInfo = value
+                onValueChanged: captureSession.camera.cameraDevice = value
             }
 
             CameraButton {
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index a9d1537d3..a07e7c468 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -119,18 +119,18 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDevice &deviceInfo)
     out << Qt::endl;
 }
 
-void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraInfo)
+void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraDevice)
 {
-    const auto isDefault = cameraInfo.isDefault() ? "Yes" : "No";
-    const auto position = cameraInfo.position();
-    const auto photoResolutions = cameraInfo.photoResolutions();
-    const auto videoFormats = cameraInfo.videoFormats();
+    const auto isDefault = cameraDevice.isDefault() ? "Yes" : "No";
+    const auto position = cameraDevice.position();
+    const auto photoResolutions = cameraDevice.photoResolutions();
+    const auto videoFormats = cameraDevice.videoFormats();
 
     out.setFieldWidth(30);
     out.setFieldAlignment(QTextStream::AlignLeft);
-    out << "Name: " << cameraInfo.description() << qSetFieldWidth(0) << Qt::endl;
+    out << "Name: " << cameraDevice.description() << qSetFieldWidth(0) << Qt::endl;
     out.setFieldWidth(30);
-    out << "Id: " <<  QString::fromLatin1(cameraInfo.id()) << qSetFieldWidth(0) << Qt::endl;
+    out << "Id: " <<  QString::fromLatin1(cameraDevice.id()) << qSetFieldWidth(0) << Qt::endl;
     out.setFieldWidth(30);
     out << "Default: " <<  isDefault << qSetFieldWidth(0) << Qt::endl;
     out.setFieldWidth(30);
@@ -173,8 +173,8 @@ int main()
         printAudioDeviceInfo(out, deviceInfo);
 
     out << Qt::endl << "Video devices detected: " << Qt::endl;
-    for (auto &cameraInfo: videoInputDevices)
-        printVideoDeviceInfo(out, cameraInfo);
+    for (auto &cameraDevice : videoInputDevices)
+        printVideoDeviceInfo(out, cameraDevice);
 
     return 0;
 }
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 552990496..043afeb29 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -93,9 +93,9 @@ Camera::Camera()
     setCamera(QMediaDevices::defaultVideoInput());
 }
 
-void Camera::setCamera(const QCameraDevice &cameraInfo)
+void Camera::setCamera(const QCameraDevice &cameraDevice)
 {
-    m_camera.reset(new QCamera(cameraInfo));
+    m_camera.reset(new QCamera(cameraDevice));
     m_captureSession.setCamera(m_camera.data());
 
     connect(m_camera.data(), &QCamera::activeChanged, this, &Camera::updateCameraActive);
@@ -358,11 +358,11 @@ void Camera::updateCameras()
 {
     ui->menuDevices->clear();
     const QList<QCameraDevice> availableCameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice &cameraInfo : availableCameras) {
-        QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup);
+    for (const QCameraDevice &cameraDevice : availableCameras) {
+        QAction *videoDeviceAction = new QAction(cameraDevice.description(), videoDevicesGroup);
         videoDeviceAction->setCheckable(true);
-        videoDeviceAction->setData(QVariant::fromValue(cameraInfo));
-        if (cameraInfo == QMediaDevices::defaultVideoInput())
+        videoDeviceAction->setData(QVariant::fromValue(cameraDevice));
+        if (cameraDevice == QMediaDevices::defaultVideoInput())
             videoDeviceAction->setChecked(true);
 
         ui->menuDevices->addAction(videoDeviceAction);
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 2b19dae86..c165aa201 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -80,7 +80,7 @@ public slots:
     void saveMetaData();
 
 private slots:
-    void setCamera(const QCameraDevice &cameraInfo);
+    void setCamera(const QCameraDevice &cameraDevice);
 
     void startCamera();
     void stopCamera();
diff --git a/examples/multimediawidgets/camera/imagesettings.cpp b/examples/multimediawidgets/camera/imagesettings.cpp
index 8e58fc7d4..fa619638d 100644
--- a/examples/multimediawidgets/camera/imagesettings.cpp
+++ b/examples/multimediawidgets/camera/imagesettings.cpp
@@ -75,7 +75,7 @@ ImageSettings::ImageSettings(QCameraImageCapture *imageCapture, QWidget *parent)
     ui->imageQualitySlider->setRange(0, int(QCameraImageCapture::VeryHighQuality));
 
     ui->imageResolutionBox->addItem(tr("Default Resolution"));
-    const QList<QSize> supportedResolutions = imagecapture->captureSession()->camera()->cameraInfo().photoResolutions();
+    const QList<QSize> supportedResolutions = imagecapture->captureSession()->camera()->cameraDevice().photoResolutions();
     for (const QSize &resolution : supportedResolutions) {
         ui->imageResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
                                         QVariant(resolution));
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index 22b82fb60..03c4f74c1 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -92,7 +92,7 @@ VideoSettings::VideoSettings(QMediaRecorder *mediaRecorder, QWidget *parent)
 
 
     ui->videoResolutionBox->addItem(tr("Default"));
-    auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraInfo().photoResolutions(); // ### Should use resolutions from video formats
+    auto supportedResolutions = mediaRecorder->captureSession()->camera()->cameraDevice().photoResolutions(); // ### Should use resolutions from video formats
     for (const QSize &resolution : supportedResolutions) {
         ui->videoResolutionBox->addItem(QString("%1x%2").arg(resolution.width()).arg(resolution.height()),
                                         QVariant(resolution));
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 9358e8c0d..409971c87 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -119,9 +119,9 @@ void QCameraPrivate::init()
         return;
     }
 
-    if (cameraInfo.isNull())
+    if (cameraDevice.isNull())
         _q_error(QCamera::CameraError, QString::fromUtf8("Invalid camera specified"));
-    control->setCamera(cameraInfo);
+    control->setCamera(cameraDevice);
     q->connect(control, SIGNAL(activeChanged(bool)), q, SIGNAL(activeChanged(bool)));
     q->connect(control, SIGNAL(error(int,QString)), q, SLOT(_q_error(int,QString)));
 }
@@ -140,17 +140,17 @@ QCamera::QCamera(QObject *parent)
 /*!
     \since 5.3
 
-    Construct a QCamera from a camera description \a cameraInfo and \a parent.
+    Construct a QCamera from a camera description \a cameraDevice and \a parent.
 */
 
-QCamera::QCamera(const QCameraDevice &cameraInfo, QObject *parent)
+QCamera::QCamera(const QCameraDevice &cameraDevice, QObject *parent)
     : QObject(*new QCameraPrivate, parent)
 {
     Q_D(QCamera);
 
-    d->cameraInfo = cameraInfo;
+    d->cameraDevice = cameraDevice;
     d->init();
-    setCameraInfo(cameraInfo);
+    setCameraDevice(cameraDevice);
 }
 
 /*!
@@ -180,7 +180,7 @@ QCamera::QCamera(QCameraDevice::Position position, QObject *parent)
     }
     if (info.isNull())
         info = QMediaDevices::defaultVideoInput();
-    d->cameraInfo = info;
+    d->cameraDevice = info;
     d->init();
 }
 
@@ -204,7 +204,7 @@ QCamera::~QCamera()
 bool QCamera::isAvailable() const
 {
     Q_D(const QCamera);
-    return d->control && !d->cameraInfo.isNull();
+    return d->control && !d->cameraDevice.isNull();
 }
 
 /*!
@@ -316,29 +316,29 @@ void QCamera::setCaptureSession(QMediaCaptureSession *session)
 /*!
     Returns the QCameraDevice object associated with this camera.
  */
-QCameraDevice QCamera::cameraInfo() const
+QCameraDevice QCamera::cameraDevice() const
 {
     Q_D(const QCamera);
-    return d->cameraInfo;
+    return d->cameraDevice;
 }
 
 /*!
     Sets the camera object to use the physical camera described by
-    \a cameraInfo.
+    \a cameraDevice.
 */
-void QCamera::setCameraInfo(const QCameraDevice &cameraInfo)
+void QCamera::setCameraDevice(const QCameraDevice &cameraDevice)
 {
     Q_D(QCamera);
-    if (d->cameraInfo == cameraInfo)
+    if (d->cameraDevice == cameraDevice)
         return;
-    d->cameraInfo = cameraInfo;
-    if (d->cameraInfo.isNull())
+    d->cameraDevice = cameraDevice;
+    if (d->cameraDevice.isNull())
         d->_q_error(QCamera::CameraError, QString::fromUtf8("Invalid camera specified"));
     else
         d->_q_error(QCamera::NoError, QString());
     if (d->control)
-        d->control->setCamera(d->cameraInfo);
-    emit cameraInfoChanged();
+        d->control->setCamera(d->cameraDevice);
+    emit cameraDeviceChanged();
     setCameraFormat({});
 }
 
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 881579ae0..e169901c3 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -65,7 +65,7 @@ class Q_MULTIMEDIA_EXPORT QCamera : public QObject
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
     Q_PROPERTY(QCamera::Status status READ status NOTIFY statusChanged)
-    Q_PROPERTY(QCameraDevice cameraInfo READ cameraInfo WRITE setCameraInfo NOTIFY cameraInfoChanged)
+    Q_PROPERTY(QCameraDevice cameraDevice READ cameraDevice WRITE setCameraDevice NOTIFY cameraDeviceChanged)
     Q_PROPERTY(Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
     Q_PROPERTY(QCameraFormat cameraFormat READ cameraFormat WRITE setCameraFormat NOTIFY cameraFormatChanged)
@@ -175,7 +175,7 @@ public:
     Q_DECLARE_FLAGS(Features, Feature)
 
     explicit QCamera(QObject *parent = nullptr);
-    explicit QCamera(const QCameraDevice& cameraInfo, QObject *parent = nullptr);
+    explicit QCamera(const QCameraDevice& cameraDevice, QObject *parent = nullptr);
     explicit QCamera(QCameraDevice::Position position, QObject *parent = nullptr);
     ~QCamera();
 
@@ -186,8 +186,8 @@ public:
 
     QMediaCaptureSession *captureSession() const;
 
-    QCameraDevice cameraInfo() const;
-    void setCameraInfo(const QCameraDevice &cameraInfo);
+    QCameraDevice cameraDevice() const;
+    void setCameraDevice(const QCameraDevice &cameraDevice);
 
     QCameraFormat cameraFormat() const;
     void setCameraFormat(const QCameraFormat &format);
@@ -270,7 +270,7 @@ Q_SIGNALS:
     void statusChanged(QCamera::Status status);
     void errorChanged();
     void errorOccurred(QCamera::Error error, const QString &errorString);
-    void cameraInfoChanged();
+    void cameraDeviceChanged();
     void cameraFormatChanged();
     void supportedFeaturesChanged();
 
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index 58f041d29..cb940eed2 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -79,7 +79,7 @@ public:
     QCamera::Error error;
     QString errorString;
 
-    QCameraDevice cameraInfo;
+    QCameraDevice cameraDevice;
     QCameraFormat cameraFormat;
 
     void _q_error(int error, const QString &errorString);
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index 3fa1cdc6e..0407be1aa 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -110,18 +110,18 @@ void overview_viewfinder_orientation()
     //! [Camera overview viewfinder orientation]
     // Assuming a QImage has been created from the QVideoFrame that needs to be presented
     QImage videoFrame;
-    QCameraDevice cameraInfo(camera); // needed to get the camera sensor position and orientation
+    QCameraDevice cameraDevice(camera); // needed to get the camera sensor position and orientation
 
     // Get the current display orientation
     const QScreen *screen = QGuiApplication::primaryScreen();
     const int screenAngle = screen->angleBetween(screen->nativeOrientation(), screen->orientation());
 
     int rotation;
-    if (cameraInfo.position() == QCameraDevice::BackFace) {
-        rotation = (cameraInfo.orientation() - screenAngle) % 360;
+    if (cameraDevice.position() == QCameraDevice::BackFace) {
+        rotation = (cameraDevice.orientation() - screenAngle) % 360;
     } else {
         // Front position, compensate the mirror
-        rotation = (360 - cameraInfo.orientation() + screenAngle) % 360;
+        rotation = (360 - cameraDevice.orientation() + screenAngle) % 360;
     }
 
     // Rotate the frame so it always shows in the correct orientation
@@ -174,8 +174,8 @@ void camera_listing()
 {
     //! [Camera listing]
     const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice &cameraInfo : cameras)
-        qDebug() << cameraInfo.description();
+    for (const QCameraDevice &cameraDevice : cameras)
+        qDebug() << cameraDevice.description();
     //! [Camera listing]
 }
 
@@ -183,9 +183,9 @@ void camera_selection()
 {
     //! [Camera selection]
     const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
-    for (const QCameraDevice &cameraInfo : cameras) {
-        if (cameraInfo.description() == "mycamera")
-            camera = new QCamera(cameraInfo);
+    for (const QCameraDevice &cameraDevice : cameras) {
+        if (cameraDevice.description() == "mycamera")
+            camera = new QCamera(cameraDevice);
     }
     //! [Camera selection]
 }
@@ -194,14 +194,14 @@ void camera_info()
 {
     //! [Camera info]
     QCamera myCamera;
-    QCameraDevice cameraInfo = camera->cameraInfo();
+    QCameraDevice cameraDevice = camera->cameraDevice();
 
-    if (cameraInfo.position() == QCameraDevice::FrontFace)
+    if (cameraDevice.position() == QCameraDevice::FrontFace)
         qDebug() << "The camera is on the front face of the hardware system.";
-    else if (cameraInfo.position() == QCameraDevice::BackFace)
+    else if (cameraDevice.position() == QCameraDevice::BackFace)
         qDebug() << "The camera is on the back face of the hardware system.";
 
-    qDebug() << "The camera sensor orientation is " << cameraInfo.orientation() << " degrees.";
+    qDebug() << "The camera sensor orientation is " << cameraDevice.orientation() << " degrees.";
     //! [Camera info]
 }
 
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index f1f33d79a..001ca1832 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -116,12 +116,12 @@ In C++:
 
      \snippet multimedia-snippets/camera.cpp Camera selection
 
-In QML, you can set the \c Camera \l{Camera::cameraInfo}{cameraInfo} property. All available cameras can
+In QML, you can set the \c Camera \l{Camera::cameraDevice}{cameraDevice} property. All available cameras can
 be retrieved from \l{QtMultimedia::MediaDevices::availableCameras}{MediaDevices.availableCameras}:
 
 \qml
 Camera {
-    cameraInfo: QtMultimedia.availableCameras[0]
+    cameraDevice: QtMultimedia.availableCameras[0]
 }
 \endqml
 
@@ -140,7 +140,7 @@ Camera {
 }
 \endqml
 
-If neither cameraInfo nor position is specified, the default camera will be used. On desktop
+If neither cameraDevice nor position is specified, the default camera will be used. On desktop
 platforms, the default camera is set by the user in the system settings. On a mobile device, the
 back-facing camera is usually the default camera. You can get information about the default camera
 using \l QCameraDevice::defaultCamera() in C++ or
diff --git a/src/multimedia/platform/darwin/camera/avfcamera.mm b/src/multimedia/platform/darwin/camera/avfcamera.mm
index 89c8aa0de..b52ee7743 100644
--- a/src/multimedia/platform/darwin/camera/avfcamera.mm
+++ b/src/multimedia/platform/darwin/camera/avfcamera.mm
@@ -176,7 +176,7 @@ void AVFCamera::setActive(bool active)
 {
     if (m_active == active)
         return;
-    if (m_cameraInfo.isNull() && active)
+    if (m_cameraDevice.isNull() && active)
         return;
 
     m_active = active;
@@ -204,9 +204,9 @@ QCamera::Status AVFCamera::status() const
 
 void AVFCamera::setCamera(const QCameraDevice &camera)
 {
-    if (m_cameraInfo == camera)
+    if (m_cameraDevice == camera)
         return;
-    m_cameraInfo = camera;
+    m_cameraDevice = camera;
     if (m_session)
         m_session->setActiveCamera(camera);
 }
@@ -229,7 +229,7 @@ void AVFCamera::setCaptureSession(QPlatformMediaCaptureSession *session)
 
     m_session->setActiveCamera(QCameraDevice());
     m_session->setActive(m_active);
-    m_session->setActiveCamera(m_cameraInfo);
+    m_session->setActiveCamera(m_cameraDevice);
 }
 
 void AVFCamera::updateStatus()
@@ -254,7 +254,7 @@ AVCaptureConnection *AVFCamera::videoConnection() const
 AVCaptureDevice *AVFCamera::device() const
 {
     AVCaptureDevice *device = nullptr;
-    QByteArray deviceId = m_cameraInfo.id();
+    QByteArray deviceId = m_cameraDevice.id();
     if (!deviceId.isEmpty()) {
         device = [AVCaptureDevice deviceWithUniqueID:
                     [NSString stringWithUTF8String:
diff --git a/src/multimedia/platform/darwin/camera/avfcamera_p.h b/src/multimedia/platform/darwin/camera/avfcamera_p.h
index 42999b917..296ef0350 100644
--- a/src/multimedia/platform/darwin/camera/avfcamera_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcamera_p.h
@@ -127,7 +127,7 @@ private:
     AVFCameraService *m_service = nullptr;
     AVFCameraSession *m_session = nullptr;
 
-    QCameraDevice m_cameraInfo;
+    QCameraDevice m_cameraDevice;
 
     bool m_active;
     QCamera::Status m_lastStatus;
diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession.mm b/src/multimedia/platform/darwin/camera/avfcamerasession.mm
index 61dd83459..7febe567f 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerasession.mm
+++ b/src/multimedia/platform/darwin/camera/avfcamerasession.mm
@@ -177,13 +177,13 @@ AVFCameraSession::~AVFCameraSession()
 
 void AVFCameraSession::setActiveCamera(const QCameraDevice &info)
 {
-    if (m_activeCameraInfo != info) {
-        m_activeCameraInfo = info;
+    if (m_activeCameraDevice != info) {
+        m_activeCameraDevice = info;
 
         [m_captureSession beginConfiguration];
 
         attachVideoInputDevice();
-        if (!m_activeCameraInfo.isNull() && !m_videoOutput)
+        if (!m_activeCameraDevice.isNull() && !m_videoOutput)
             setVideoOutput(new AVFCameraRenderer(this));
 
         [m_captureSession commitConfiguration];
@@ -254,7 +254,7 @@ void AVFCameraSession::setActive(bool active)
             attachAudioInputDevice();
             setAudioOutput();
         }
-        if (!m_activeCameraInfo.isNull()) {
+        if (!m_activeCameraDevice.isNull()) {
             attachVideoInputDevice();
             Q_EMIT readyToConfigureConnections();
             m_defaultCodec = 0;
@@ -309,7 +309,7 @@ AVCaptureDevice *AVFCameraSession::createVideoCaptureDevice()
 {
     AVCaptureDevice *device = nullptr;
 
-    QByteArray deviceId = m_activeCameraInfo.id();
+    QByteArray deviceId = m_activeCameraDevice.id();
     if (!deviceId.isEmpty()) {
         device = [AVCaptureDevice deviceWithUniqueID:
                     [NSString stringWithUTF8String:
@@ -330,7 +330,7 @@ void AVFCameraSession::attachVideoInputDevice()
 
     AVCaptureDevice *videoDevice = createVideoCaptureDevice();
     if (!videoDevice) {
-        m_activeCameraInfo = QCameraDevice();
+        m_activeCameraDevice = QCameraDevice();
         return;
     }
 
@@ -347,7 +347,7 @@ void AVFCameraSession::attachVideoInputDevice()
             [m_captureSession addInput:m_videoInput];
         } else {
             qWarning() << "Failed to connect video device input";
-            m_activeCameraInfo = QCameraDevice();
+            m_activeCameraDevice = QCameraDevice();
         }
     }
 }
diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession_p.h b/src/multimedia/platform/darwin/camera/avfcamerasession_p.h
index 9d863e7fa..fee807c21 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerasession_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcamerasession_p.h
@@ -75,7 +75,7 @@ public:
     AVFCameraSession(AVFCameraService *service, QObject *parent = nullptr);
     ~AVFCameraSession();
 
-    QCameraDevice activeCameraInfo() const { return m_activeCameraInfo; }
+    QCameraDevice activecameraDevice() const { return m_activeCameraDevice; }
     void setActiveCamera(const QCameraDevice &info);
 
     AVFCameraRenderer *videoOutput() const { return m_videoOutput; }
@@ -116,7 +116,7 @@ private:
     bool applyImageEncoderSettings();
     bool applyEncoderSettings();
 
-    QCameraDevice m_activeCameraInfo;
+    QCameraDevice m_activeCameraDevice;
 
     AVFCameraService *m_service;
     AVCaptureSession *m_captureSession;
diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
index 7919c1e72..6f881f986 100644
--- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
@@ -371,7 +371,7 @@ void AVFMediaEncoder::applySettings()
     if (m_state != QMediaRecorder::StoppedState)
         return;
 
-    const auto flag = (session->activeCameraInfo().isNull())
+    const auto flag = (session->activecameraDevice().isNull())
                               ? QMediaFormat::NoFlags
                               : QMediaFormat::RequiresVideo;
 
@@ -413,7 +413,7 @@ void AVFMediaEncoder::setEncoderSettings(const QMediaEncoderSettings &settings)
 QMediaEncoderSettings AVFMediaEncoder::encoderSettings() const
 {
     QMediaEncoderSettings s = m_settings;
-    const auto flag = (m_service->session()->activeCameraInfo().isNull())
+    const auto flag = (m_service->session()->activecameraDevice().isNull())
                             ? QMediaFormat::NoFlags
                             : QMediaFormat::RequiresVideo;
     s.resolveFormat(flag);
@@ -483,14 +483,14 @@ void AVFMediaEncoder::record()
         // Make sure the video is recorded in device orientation.
         // The top of the video will match the side of the device which is on top
         // when recording starts (regardless of the UI orientation).
-        // QCameraDevice cameraInfo = m_service->session()->activeCameraInfo();
+        // QCameraDevice cameraDevice = m_service->session()->activecameraDevice();
         // int screenOrientation = 360 - m_orientationHandler.currentOrientation();
 
             // ###
-    //        if (cameraInfo.position() == QCameraDevice::FrontFace)
-    //            rotation = (screenOrientation + cameraInfo.orientation()) % 360;
+    //        if (cameraDevice.position() == QCameraDevice::FrontFace)
+    //            rotation = (screenOrientation + cameraDevice.orientation()) % 360;
     //        else
-    //            rotation = (screenOrientation + (360 - cameraInfo.orientation())) % 360;
+    //            rotation = (screenOrientation + (360 - cameraDevice.orientation())) % 360;
     }
 
     const QString path(m_outputLocation.scheme() == QLatin1String("file") ?
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
index 521a1338f..c58ecaaf1 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
@@ -85,7 +85,7 @@ void QGstreamerCamera::setActive(bool active)
 {
     if (m_active == active)
         return;
-    if (m_cameraInfo.isNull() && active)
+    if (m_cameraDevice.isNull() && active)
         return;
 
     m_active = active;
@@ -96,11 +96,11 @@ void QGstreamerCamera::setActive(bool active)
 
 void QGstreamerCamera::setCamera(const QCameraDevice &camera)
 {
-    if (m_cameraInfo == camera)
+    if (m_cameraDevice == camera)
         return;
 //    qDebug() << "setCamera" << camera;
 
-    m_cameraInfo = camera;
+    m_cameraDevice = camera;
 
     bool havePipeline = !gstPipeline.isNull();
 
@@ -141,7 +141,7 @@ void QGstreamerCamera::setCameraFormatInternal(const QCameraFormat &format)
 {
     QCameraFormat f = format;
     if (f.isNull())
-        f = findBestCameraFormat(m_cameraInfo);
+        f = findBestCameraFormat(m_cameraDevice);
 
     // add jpeg decoder where required
     gstDecode.setStateSync(GST_STATE_NULL);
@@ -169,7 +169,7 @@ void QGstreamerCamera::setCameraFormatInternal(const QCameraFormat &format)
 
 bool QGstreamerCamera::setCameraFormat(const QCameraFormat &format)
 {
-    if (!m_cameraInfo.videoFormats().contains(format))
+    if (!m_cameraDevice.videoFormats().contains(format))
         return false;
     bool havePipeline = !gstPipeline.isNull();
     auto state = havePipeline ? gstPipeline.state() : GST_STATE_NULL;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h
index a87855049..51037119e 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h
@@ -125,7 +125,7 @@ private:
 
     QGstreamerMediaCapture *m_session = nullptr;
 
-    QCameraDevice m_cameraInfo;
+    QCameraDevice m_cameraDevice;
 
     QGstPipeline gstPipeline;
 
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 613b2f138..75e06a4a4 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -60,8 +60,8 @@ public slots:
     void cleanupTestCase();
 
 private slots:
-    void testCameraInfo();
-    void testCtorWithCameraInfo();
+    void testCameraDevice();
+    void testCtorWithCameraDevice();
     void testCtorWithPosition();
 
     void testCameraStates();
@@ -88,7 +88,7 @@ void tst_QCameraBackend::cleanupTestCase()
 {
 }
 
-void tst_QCameraBackend::testCameraInfo()
+void tst_QCameraBackend::testCameraDevice()
 {
     const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
     if (cameras.isEmpty()) {
@@ -104,13 +104,13 @@ void tst_QCameraBackend::testCameraInfo()
     }
 }
 
-void tst_QCameraBackend::testCtorWithCameraInfo()
+void tst_QCameraBackend::testCtorWithCameraDevice()
 {
     {
-        // loading an invalid CameraInfo should fail
+        // loading an invalid CameraDevice should fail
         QCamera camera(QCameraDevice{});
         QCOMPARE(camera.error(), QCamera::CameraError);
-        QVERIFY(camera.cameraInfo().isNull());
+        QVERIFY(camera.cameraDevice().isNull());
     }
 
     if (noCamera)
@@ -120,13 +120,13 @@ void tst_QCameraBackend::testCtorWithCameraInfo()
         QCameraDevice info = QMediaDevices::defaultVideoInput();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), info);
+        QCOMPARE(camera.cameraDevice(), info);
     }
     {
         QCameraDevice info = QMediaDevices::videoInputs().first();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), info);
+        QCOMPARE(camera.cameraDevice(), info);
     }
 }
 
@@ -157,7 +157,7 @@ void tst_QCameraBackend::testCameraStates()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    camera.setCameraInfo(QCameraDevice());
+    camera.setCameraDevice(QCameraDevice());
     QCameraImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
@@ -175,7 +175,7 @@ void tst_QCameraBackend::testCameraStates()
 
     if (noCamera)
         QSKIP("No camera available");
-    camera.setCameraInfo(QMediaDevices::defaultVideoInput());
+    camera.setCameraDevice(QMediaDevices::defaultVideoInput());
     QCOMPARE(camera.error(), QCamera::NoError);
 
     camera.start();
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 5e227f64a..946edcce0 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -577,36 +577,36 @@ void tst_QCamera::testConstructor()
         QCamera camera;
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), defaultCamera);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
 
     {
         QCamera camera(QCameraDevice::FrontFace);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), frontCamera);
+        QCOMPARE(camera.cameraDevice(), frontCamera);
     }
 
     {
         QCamera camera(QMediaDevices::defaultVideoInput());
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), defaultCamera);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
 
     {
-        QCameraDevice cameraInfo = QMediaDevices::videoInputs().at(0);
-        QCamera camera(cameraInfo);
+        QCameraDevice cameraDevice = QMediaDevices::videoInputs().at(0);
+        QCamera camera(cameraDevice);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), cameraInfo);
+        QCOMPARE(camera.cameraDevice(), cameraDevice);
     }
 
     {
         QCamera camera(QCameraDevice::BackFace);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), backCamera);
+        QCOMPARE(camera.cameraDevice(), backCamera);
     }
 
     {
@@ -614,7 +614,7 @@ void tst_QCamera::testConstructor()
         QCamera camera(QCameraDevice::UnspecifiedPosition);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
-        QCOMPARE(camera.cameraInfo(), defaultCamera);
+        QCOMPARE(camera.cameraDevice(), defaultCamera);
     }
 }
 
diff --git a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
index 458c77efa..c8f93330f 100644
--- a/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
+++ b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
@@ -74,7 +74,7 @@ void tst_QCameraDevice::constructor()
     {
         // default camera
         QCamera camera;
-        QCameraDevice info(camera.cameraInfo());
+        QCameraDevice info(camera.cameraDevice());
         QVERIFY(!info.isNull());
         QCOMPARE(info.id(), QStringLiteral("default"));
         QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
@@ -90,7 +90,7 @@ void tst_QCameraDevice::constructor()
     QVERIFY(!info.isNull());
 
     QCamera camera(info);
-    QCOMPARE(info, camera.cameraInfo());
+    QCOMPARE(info, camera.cameraDevice());
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("back"));
     QCOMPARE(info.description(), QStringLiteral("backCamera"));
@@ -113,7 +113,7 @@ void tst_QCameraDevice::defaultCamera()
     QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
 
     QCamera camera(info);
-    QCOMPARE(camera.cameraInfo(), info);
+    QCOMPARE(camera.cameraDevice(), info);
 }
 
 void tst_QCameraDevice::availableCameras()
@@ -152,13 +152,13 @@ void tst_QCameraDevice::equality_operators()
 
     {
         QCamera camera(defaultCamera);
-        QVERIFY(camera.cameraInfo() == defaultCamera);
-        QVERIFY(camera.cameraInfo() == cameras.at(0));
+        QVERIFY(camera.cameraDevice() == defaultCamera);
+        QVERIFY(camera.cameraDevice() == cameras.at(0));
     }
 
     {
         QCamera camera(cameras.at(1));
-        QVERIFY(camera.cameraInfo() == cameras.at(1));
+        QVERIFY(camera.cameraDevice() == cameras.at(1));
     }
 }