Rename QCameraInfo/QAudioDeviceInfo to QCamera/AudioDevice

Those classes represent the physical device and it's properties, thus
that name fits best.

Change-Id: I0f45fc875ae6110452c1f2fb17f32adbe5155d01
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

18 files changed, 135 insertions, 135 deletions

diff --git a/tests/auto/integration/CMakeLists.txt b/tests/auto/integration/CMakeLists.txt
index 53225e1c0..f6d202fee 100644
--- a/tests/auto/integration/CMakeLists.txt
+++ b/tests/auto/integration/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 # special case begin
 add_subdirectory(qaudiodecoderbackend)
-add_subdirectory(qaudiodeviceinfo)
+add_subdirectory(qaudiodevice)
 add_subdirectory(qaudiosource)
 add_subdirectory(qaudiosink)
 add_subdirectory(qmediaplayerbackend)
diff --git a/tests/auto/integration/qaudiodeviceinfo/BLACKLIST b/tests/auto/integration/qaudiodevice/BLACKLIST
index 40dc63a09..40dc63a09 100644
--- a/tests/auto/integration/qaudiodeviceinfo/BLACKLIST
+++ b/tests/auto/integration/qaudiodevice/BLACKLIST
diff --git a/tests/auto/integration/qaudiodeviceinfo/CMakeLists.txt b/tests/auto/integration/qaudiodevice/CMakeLists.txt
index e9d6167b3..059e62f87 100644
--- a/tests/auto/integration/qaudiodeviceinfo/CMakeLists.txt
+++ b/tests/auto/integration/qaudiodevice/CMakeLists.txt
@@ -1,12 +1,12 @@
-# Generated from qaudiodeviceinfo.pro.
+# Generated from qaudiodevice.pro.
 
 #####################################################################
-## tst_qaudiodeviceinfo Test:
+## tst_qaudiodevice Test:
 #####################################################################
 
-qt_internal_add_test(tst_qaudiodeviceinfo
+qt_internal_add_test(tst_qaudiodevice
     SOURCES
-        tst_qaudiodeviceinfo.cpp
+        tst_qaudiodevice.cpp
     PUBLIC_LIBRARIES
         Qt::Gui
         Qt::MultimediaPrivate
diff --git a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/integration/qaudiodevice/tst_qaudiodevice.cpp
index ee85d7a63..af48c4f3a 100644
--- a/tests/auto/integration/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp
+++ b/tests/auto/integration/qaudiodevice/tst_qaudiodevice.cpp
@@ -29,7 +29,7 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/qlocale.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 
 #include <QStringList>
 #include <QList>
@@ -37,11 +37,11 @@
 
 //TESTED_COMPONENT=src/multimedia
 
-class tst_QAudioDeviceInfo : public QObject
+class tst_QAudioDevice : public QObject
 {
     Q_OBJECT
 public:
-    tst_QAudioDeviceInfo(QObject* parent=nullptr) : QObject(parent) {}
+    tst_QAudioDevice(QObject* parent=nullptr) : QObject(parent) {}
 
 private slots:
     void initTestCase();
@@ -59,62 +59,62 @@ private slots:
     void equalityOperator();
 
 private:
-    QAudioDeviceInfo* device;
+    QAudioDevice* device;
 };
 
-void tst_QAudioDeviceInfo::initTestCase()
+void tst_QAudioDevice::initTestCase()
 {
     // Only perform tests if audio output device exists!
-    QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
+    QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
     if (devices.size() == 0) {
         QSKIP("NOTE: no audio output device found, no tests will be performed");
     } else {
-        device = new QAudioDeviceInfo(devices.at(0));
+        device = new QAudioDevice(devices.at(0));
     }
 }
 
-void tst_QAudioDeviceInfo::cleanupTestCase()
+void tst_QAudioDevice::cleanupTestCase()
 {
     delete device;
 }
 
-void tst_QAudioDeviceInfo::checkAvailableDefaultInput()
+void tst_QAudioDevice::checkAvailableDefaultInput()
 {
     // Only perform tests if audio input device exists!
-    QList<QAudioDeviceInfo> devices = QMediaDevices::audioInputs();
+    QList<QAudioDevice> devices = QMediaDevices::audioInputs();
     if (devices.size() > 0) {
         QVERIFY(!QMediaDevices::defaultAudioInput().isNull());
     }
 }
 
-void tst_QAudioDeviceInfo::checkAvailableDefaultOutput()
+void tst_QAudioDevice::checkAvailableDefaultOutput()
 {
     // Only perform tests if audio input device exists!
-    QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
+    QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
     if (devices.size() > 0) {
         QVERIFY(!QMediaDevices::defaultAudioOutput().isNull());
     }
 }
 
-void tst_QAudioDeviceInfo::channels()
+void tst_QAudioDevice::channels()
 {
     QVERIFY(device->minimumChannelCount() > 0);
     QVERIFY(device->maximumChannelCount() >= device->minimumChannelCount());
 }
 
-void tst_QAudioDeviceInfo::sampleFormat()
+void tst_QAudioDevice::sampleFormat()
 {
     QList<QAudioFormat::SampleFormat> avail = device->supportedSampleFormats();
     QVERIFY(avail.size() > 0);
 }
 
-void tst_QAudioDeviceInfo::sampleRates()
+void tst_QAudioDevice::sampleRates()
 {
     QVERIFY(device->minimumSampleRate() > 0);
     QVERIFY(device->maximumSampleRate() >= device->minimumSampleRate());
 }
 
-void tst_QAudioDeviceInfo::isFormatSupported()
+void tst_QAudioDevice::isFormatSupported()
 {
     QAudioFormat format;
     format.setSampleRate(44100);
@@ -125,54 +125,54 @@ void tst_QAudioDeviceInfo::isFormatSupported()
     QVERIFY(device->isFormatSupported(format));
 }
 
-void tst_QAudioDeviceInfo::preferred()
+void tst_QAudioDevice::preferred()
 {
     QAudioFormat format = device->preferredFormat();
     QVERIFY(format.isValid());
     QVERIFY(device->isFormatSupported(format));
 }
 
-// QAudioDeviceInfo's assignOperator method
-void tst_QAudioDeviceInfo::assignOperator()
+// QAudioDevice's assignOperator method
+void tst_QAudioDevice::assignOperator()
 {
-    QAudioDeviceInfo dev;
+    QAudioDevice dev;
     QVERIFY(dev.id().isNull());
     QVERIFY(dev.isNull() == true);
 
-    QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
+    QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
     QVERIFY(devices.size() > 0);
-    QAudioDeviceInfo dev1(devices.at(0));
+    QAudioDevice dev1(devices.at(0));
     dev = dev1;
     QVERIFY(dev.isNull() == false);
     QVERIFY(dev.id() == dev1.id());
 }
 
-void tst_QAudioDeviceInfo::id()
+void tst_QAudioDevice::id()
 {
     QVERIFY(!device->id().isNull());
     QVERIFY(device->id() == QMediaDevices::audioOutputs().at(0).id());
 }
 
-// QAudioDeviceInfo's defaultConstructor method
-void tst_QAudioDeviceInfo::defaultConstructor()
+// QAudioDevice's defaultConstructor method
+void tst_QAudioDevice::defaultConstructor()
 {
-    QAudioDeviceInfo dev;
+    QAudioDevice dev;
     QVERIFY(dev.isNull() == true);
     QVERIFY(dev.id().isNull());
 }
 
-void tst_QAudioDeviceInfo::equalityOperator()
+void tst_QAudioDevice::equalityOperator()
 {
     // Get some default device infos
-    QAudioDeviceInfo dev1;
-    QAudioDeviceInfo dev2;
+    QAudioDevice dev1;
+    QAudioDevice dev2;
 
     QVERIFY(dev1 == dev2);
     QVERIFY(!(dev1 != dev2));
 
     // Make sure each available device is not equal to null
     const auto infos = QMediaDevices::audioOutputs();
-    for (const QAudioDeviceInfo &info : infos) {
+    for (const QAudioDevice &info : infos) {
         QVERIFY(dev1 != info);
         QVERIFY(!(dev1 == info));
 
@@ -188,6 +188,6 @@ void tst_QAudioDeviceInfo::equalityOperator()
     // XXX Perhaps each available device should not be equal to any other
 }
 
-QTEST_MAIN(tst_QAudioDeviceInfo)
+QTEST_MAIN(tst_QAudioDevice)
 
-#include "tst_qaudiodeviceinfo.moc"
+#include "tst_qaudiodevice.moc"
diff --git a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
index b0738e01d..55fdd6663 100644
--- a/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
+++ b/tests/auto/integration/qaudiosink/tst_qaudiosink.cpp
@@ -35,7 +35,7 @@
 #include <QtCore/QScopedPointer>
 
 #include <qaudiosink.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qaudioformat.h>
 #include <qaudio.h>
 #include <qmediadevices.h>
@@ -89,7 +89,7 @@ private:
 
     void generate_audiofile_testrows();
 
-    QAudioDeviceInfo audioDevice;
+    QAudioDevice audioDevice;
     QList<QAudioFormat> testFormats;
     QList<FilePtr> audioFiles;
     QScopedPointer<QTemporaryDir> m_temporaryDir;
@@ -166,7 +166,7 @@ void tst_QAudioSink::generate_audiofile_testrows()
 void tst_QAudioSink::initTestCase()
 {
     // Only perform tests if audio output device exists
-    const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
+    const QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
 
     if (devices.size() <= 0)
         QSKIP("No audio backend");
diff --git a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
index 13c3ed5bb..098f634bb 100644
--- a/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
+++ b/tests/auto/integration/qaudiosource/tst_qaudiosource.cpp
@@ -33,7 +33,7 @@
 #include <QtCore/QScopedPointer>
 
 #include <qaudiosource.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qaudioformat.h>
 #include <qaudio.h>
 #include <qmediadevices.h>
@@ -94,7 +94,7 @@ private:
 
     void generate_audiofile_testrows();
 
-    QAudioDeviceInfo audioDevice;
+    QAudioDevice audioDevice;
     QList<QAudioFormat> testFormats;
     QList<FilePtr> audioFiles;
     QScopedPointer<QTemporaryDir> m_temporaryDir;
@@ -131,7 +131,7 @@ QString tst_QAudioSource::formatToFileName(const QAudioFormat &format)
 void tst_QAudioSource::initTestCase()
 {
     // Only perform tests if audio output device exists
-    const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
+    const QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
 
     if (devices.size() <= 0)
         QSKIP("No audio backend");
diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
index 69d3553f0..5a653c1f8 100644
--- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
+++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp
@@ -35,7 +35,7 @@
 #include <private/qplatformcamera_p.h>
 #include <private/qplatformcameraimagecapture_p.h>
 #include <qcamera.h>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 #include <qcameraimagecapture.h>
 #include <qmediacapturesession.h>
 #include <qobject.h>
@@ -90,7 +90,7 @@ void tst_QCameraBackend::cleanupTestCase()
 
 void tst_QCameraBackend::testCameraInfo()
 {
-    const QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
+    const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
     if (cameras.isEmpty()) {
         QVERIFY(noCamera);
         QVERIFY(QMediaDevices::defaultVideoInput().isNull());
@@ -98,7 +98,7 @@ void tst_QCameraBackend::testCameraInfo()
     }
     QVERIFY(!noCamera);
 
-    for (const QCameraInfo &info : cameras) {
+    for (const QCameraDevice &info : cameras) {
         QVERIFY(!info.id().isEmpty());
         QVERIFY(!info.description().isEmpty());
     }
@@ -108,7 +108,7 @@ void tst_QCameraBackend::testCtorWithCameraInfo()
 {
     {
         // loading an invalid CameraInfo should fail
-        QCamera camera(QCameraInfo{});
+        QCamera camera(QCameraDevice{});
         QCOMPARE(camera.error(), QCamera::CameraError);
         QVERIFY(camera.cameraInfo().isNull());
     }
@@ -117,13 +117,13 @@ void tst_QCameraBackend::testCtorWithCameraInfo()
         QSKIP("No camera available");
 
     {
-        QCameraInfo info = QMediaDevices::defaultVideoInput();
+        QCameraDevice info = QMediaDevices::defaultVideoInput();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), info);
     }
     {
-        QCameraInfo info = QMediaDevices::videoInputs().first();
+        QCameraDevice info = QMediaDevices::videoInputs().first();
         QCamera camera(info);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), info);
@@ -136,17 +136,17 @@ void tst_QCameraBackend::testCtorWithPosition()
         QSKIP("No camera available");
 
     {
-        QCamera camera(QCameraInfo::UnspecifiedPosition);
+        QCamera camera(QCameraDevice::UnspecifiedPosition);
         QCOMPARE(camera.error(), QCamera::NoError);
     }
     {
-        QCamera camera(QCameraInfo::FrontFace);
+        QCamera camera(QCameraDevice::FrontFace);
         // even if no camera is available at this position, it should not fail
         // and load the default camera
         QCOMPARE(camera.error(), QCamera::NoError);
     }
     {
-        QCamera camera(QCameraInfo::BackFace);
+        QCamera camera(QCameraDevice::BackFace);
         // even if no camera is available at this position, it should not fail
         // and load the default camera
         QCOMPARE(camera.error(), QCamera::NoError);
@@ -157,7 +157,7 @@ void tst_QCameraBackend::testCameraStates()
 {
     QMediaCaptureSession session;
     QCamera camera;
-    camera.setCameraInfo(QCameraInfo());
+    camera.setCameraInfo(QCameraDevice());
     QCameraImageCapture imageCapture;
     session.setCamera(&camera);
     session.setImageCapture(&imageCapture);
@@ -169,7 +169,7 @@ void tst_QCameraBackend::testCameraStates()
     QCOMPARE(camera.isActive(), false);
     QCOMPARE(camera.status(), QCamera::InactiveStatus);
 
-    // Camera should not startup with a null QCameraInfo as device
+    // Camera should not startup with a null QCameraDevice as device
     camera.start();
     QCOMPARE(camera.isActive(), false);
 
@@ -433,7 +433,7 @@ void tst_QCameraBackend::testExposureMode()
 
 void tst_QCameraBackend::testVideoRecording_data()
 {
-    QTest::addColumn<QCameraInfo>("device");
+    QTest::addColumn<QCameraDevice>("device");
 
     const auto devices = QMediaDevices::videoInputs();
 
@@ -441,12 +441,12 @@ void tst_QCameraBackend::testVideoRecording_data()
         QTest::newRow(device.description().toUtf8()) << device;
 
     if (devices.isEmpty())
-        QTest::newRow("Null device") << QCameraInfo();
+        QTest::newRow("Null device") << QCameraDevice();
 }
 
 void tst_QCameraBackend::testVideoRecording()
 {
-    QFETCH(QCameraInfo, device);
+    QFETCH(QCameraDevice, device);
 
     QMediaCaptureSession session;
     QScopedPointer<QCamera> camera(new QCamera(device));
diff --git a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
index b5330f311..21cda97b2 100644
--- a/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
+++ b/tests/auto/integration/qsoundeffect/tst_qsoundeffect.cpp
@@ -30,7 +30,7 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/qlocale.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qaudio.h>
 #include "qsoundeffect.h"
 #include "qmediadevices.h"
@@ -383,9 +383,9 @@ void tst_QSoundEffect::testSupportedMimeTypes_data()
 {
     // Verify also passing of audio device info as parameter
     QTest::addColumn<QSoundEffect*>("instance");
-    QTest::newRow("without QAudioDeviceInfo") << sound;
-    QAudioDeviceInfo deviceInfo(QMediaDevices::defaultAudioOutput());
-    QTest::newRow("with QAudioDeviceInfo")    << new QSoundEffect(deviceInfo, this);
+    QTest::newRow("without QAudioDevice") << sound;
+    QAudioDevice deviceInfo(QMediaDevices::defaultAudioOutput());
+    QTest::newRow("with QAudioDevice")    << new QSoundEffect(deviceInfo, this);
 }
 
 void tst_QSoundEffect::testSupportedMimeTypes()
diff --git a/tests/auto/unit/mockbackend/qmockcamera.h b/tests/auto/unit/mockbackend/qmockcamera.h
index 07cb916c9..ac0329c68 100644
--- a/tests/auto/unit/mockbackend/qmockcamera.h
+++ b/tests/auto/unit/mockbackend/qmockcamera.h
@@ -30,7 +30,7 @@
 #define QMOCKCAMERA_H
 
 #include "private/qplatformcamera_p.h"
-#include "qcamerainfo.h"
+#include "qcameradevice.h"
 #include <qtimer.h>
 
 QT_BEGIN_NAMESPACE
@@ -90,7 +90,7 @@ public:
         emit statusChanged(newStatus);
     }
 
-    void setCamera(const QCameraInfo &camera) override
+    void setCamera(const QCameraDevice &camera) override
     {
         m_camera = camera;
     }
@@ -184,7 +184,7 @@ public:
 
     bool m_active = false;
     QCamera::Status m_status;
-    QCameraInfo m_camera;
+    QCameraDevice m_camera;
     bool m_propertyChangesSupported;
 };
 
diff --git a/tests/auto/unit/mockbackend/qmockmediacapturesession.h b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
index c136892c0..a895a4227 100644
--- a/tests/auto/unit/mockbackend/qmockmediacapturesession.h
+++ b/tests/auto/unit/mockbackend/qmockmediacapturesession.h
@@ -104,11 +104,11 @@ public:
             emit volumeChanged(m_volume = volume);
     }
 
-    QAudioDeviceInfo audioInput() const override
+    QAudioDevice audioInput() const override
     {
         return m_audioInput;
     }
-    bool setAudioInput(const QAudioDeviceInfo &id) override
+    bool setAudioInput(const QAudioDevice &id) override
     {
         m_audioInput = id;
         return true;
@@ -118,7 +118,7 @@ public:
     QPlatformCameraImageCapture *mockImageCapture = nullptr;
     QMockMediaEncoder *mockControl = nullptr;
 
-    QAudioDeviceInfo m_audioInput;
+    QAudioDevice m_audioInput;
     bool m_muted = false;
     qreal m_volume = 1.0;
     bool hasControls;
diff --git a/tests/auto/unit/mockbackend/qmockmediadevices.cpp b/tests/auto/unit/mockbackend/qmockmediadevices.cpp
index b8b38e83e..bc9b21885 100644
--- a/tests/auto/unit/mockbackend/qmockmediadevices.cpp
+++ b/tests/auto/unit/mockbackend/qmockmediadevices.cpp
@@ -38,57 +38,57 @@
 ****************************************************************************/
 
 #include "qmockmediadevices_p.h"
-#include "private/qcamerainfo_p.h"
+#include "private/qcameradevice_p.h"
 
 QT_BEGIN_NAMESPACE
 
 QMockMediaDevices::QMockMediaDevices()
     : QPlatformMediaDevices()
 {
-    QCameraInfoPrivate *info = new QCameraInfoPrivate;
+    QCameraDevicePrivate *info = new QCameraDevicePrivate;
     info->description = QString::fromUtf8("defaultCamera");
     info->id = "default";
     info->isDefault = true;
     m_cameraDevices.append(info->create());
-    info = new QCameraInfoPrivate;
+    info = new QCameraDevicePrivate;
     info->description = QString::fromUtf8("frontCamera");
     info->id = "front";
     info->isDefault = false;
-    info->position = QCameraInfo::FrontFace;
+    info->position = QCameraDevice::FrontFace;
     m_cameraDevices.append(info->create());
-    info = new QCameraInfoPrivate;
+    info = new QCameraDevicePrivate;
     info->description = QString::fromUtf8("backCamera");
     info->id = "back";
     info->isDefault = false;
-    info->position = QCameraInfo::BackFace;
+    info->position = QCameraDevice::BackFace;
     m_cameraDevices.append(info->create());
 
 }
 
 QMockMediaDevices::~QMockMediaDevices() = default;
 
-QList<QAudioDeviceInfo> QMockMediaDevices::audioInputs() const
+QList<QAudioDevice> QMockMediaDevices::audioInputs() const
 {
     return m_inputDevices;
 }
 
-QList<QAudioDeviceInfo> QMockMediaDevices::audioOutputs() const
+QList<QAudioDevice> QMockMediaDevices::audioOutputs() const
 {
     return m_outputDevices;
 }
 
-QList<QCameraInfo> QMockMediaDevices::videoInputs() const
+QList<QCameraDevice> QMockMediaDevices::videoInputs() const
 {
     return m_cameraDevices;
 }
 
-QPlatformAudioSource *QMockMediaDevices::createAudioSource(const QAudioDeviceInfo &info)
+QPlatformAudioSource *QMockMediaDevices::createAudioSource(const QAudioDevice &info)
 {
     Q_UNUSED(info);
     return nullptr;// ###
 }
 
-QPlatformAudioSink *QMockMediaDevices::createAudioSink(const QAudioDeviceInfo &info)
+QPlatformAudioSink *QMockMediaDevices::createAudioSink(const QAudioDevice &info)
 {
     Q_UNUSED(info);
     return nullptr; //###
diff --git a/tests/auto/unit/mockbackend/qmockmediadevices_p.h b/tests/auto/unit/mockbackend/qmockmediadevices_p.h
index 5e1b9e8ae..cfa0398f3 100644
--- a/tests/auto/unit/mockbackend/qmockmediadevices_p.h
+++ b/tests/auto/unit/mockbackend/qmockmediadevices_p.h
@@ -53,12 +53,12 @@
 
 #include <private/qplatformmediadevices_p.h>
 #include <qelapsedtimer.h>
-#include <qaudiodeviceinfo.h>
-#include <qcamerainfo.h>
+#include <qaudiodevice.h>
+#include <qcameradevice.h>
 
 QT_BEGIN_NAMESPACE
 
-class QCameraInfo;
+class QCameraDevice;
 
 class QMockMediaDevices : public QPlatformMediaDevices
 {
@@ -66,16 +66,16 @@ public:
     QMockMediaDevices();
     ~QMockMediaDevices();
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &info) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &info) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &info) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &info) override;
 
 private:
-    QList<QAudioDeviceInfo> m_inputDevices;
-    QList<QAudioDeviceInfo> m_outputDevices;
-    QList<QCameraInfo> m_cameraDevices;
+    QList<QAudioDevice> m_inputDevices;
+    QList<QAudioDevice> m_outputDevices;
+    QList<QCameraDevice> m_cameraDevices;
 };
 
 QT_END_NAMESPACE
diff --git a/tests/auto/unit/mockbackend/qmockmediaencoder.h b/tests/auto/unit/mockbackend/qmockmediaencoder.h
index 84dfec434..ecdf21e61 100644
--- a/tests/auto/unit/mockbackend/qmockmediaencoder.h
+++ b/tests/auto/unit/mockbackend/qmockmediaencoder.h
@@ -30,7 +30,7 @@
 #define MOCKRECORDERCONTROL_H
 
 #include <QUrl>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 
 #include "private/qplatformmediaencoder_p.h"
 
diff --git a/tests/auto/unit/multimedia/CMakeLists.txt b/tests/auto/unit/multimedia/CMakeLists.txt
index 0a68e5ee9..63c459cae 100644
--- a/tests/auto/unit/multimedia/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(qaudiorecorder)
 add_subdirectory(qaudioformat)
 add_subdirectory(qaudionamespace)
 add_subdirectory(qcamera)
-add_subdirectory(qcamerainfo)
+add_subdirectory(qcameradevice)
 add_subdirectory(qcameraimagecapture)
 add_subdirectory(qmediaplayer)
 add_subdirectory(qmediaplaylist)
diff --git a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
index 4afd879ae..c9b49b2ab 100644
--- a/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
+++ b/tests/auto/unit/multimedia/qaudiorecorder/tst_qaudiorecorder.cpp
@@ -33,7 +33,7 @@
 
 #include <qmediaencoder.h>
 #include <private/qplatformmediaencoder_p.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qaudiosource.h>
 #include <qmediacapturesession.h>
 
@@ -98,7 +98,7 @@ void tst_QAudioRecorder::testAudioSource()
 void tst_QAudioRecorder::testDevices()
 {
 //    audiosource = new QMediaRecorder;
-//    QList<QAudioDeviceInfo> devices = mockIntegration->audioInputs();
+//    QList<QAudioDevice> devices = mockIntegration->audioInputs();
 //    QVERIFY(devices.size() > 0);
 //    QVERIFY(devices.at(0).id() == "device1");
 //    QVERIFY(audiosource->audioInputDescription("device1").compare("dev1 comment") == 0);
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 85bf07a76..682f480a8 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -35,7 +35,7 @@
 #include <private/qplatformcamera_p.h>
 #include <private/qplatformcameraimagecapture_p.h>
 #include <qcamera.h>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 #include <qcameraimagecapture.h>
 #include <qmediacapturesession.h>
 #include <qobject.h>
@@ -640,8 +640,8 @@ void tst_QCamera::testEnumDebug()
     qDebug() << QCamera::ActiveStatus;
     QTest::ignoreMessage(QtDebugMsg, "QCamera::CameraError");
     qDebug() << QCamera::CameraError;
-//    QTest::ignoreMessage(QtDebugMsg, "QCameraInfo::FrontFace");
-//    qDebug() << QCameraInfo::FrontFace;
+//    QTest::ignoreMessage(QtDebugMsg, "QCameraDevice::FrontFace");
+//    qDebug() << QCameraDevice::FrontFace;
 }
 
 void tst_QCamera::testCameraControl()
@@ -654,12 +654,12 @@ void tst_QCamera::testCameraControl()
 void tst_QCamera::testConstructor()
 {
     auto cameras = QMediaDevices::videoInputs();
-    QCameraInfo defaultCamera = QMediaDevices::defaultVideoInput();
-    QCameraInfo frontCamera, backCamera;
+    QCameraDevice defaultCamera = QMediaDevices::defaultVideoInput();
+    QCameraDevice frontCamera, backCamera;
     for (const auto &c : cameras) {
-        if (frontCamera.isNull() && c.position() == QCameraInfo::FrontFace)
+        if (frontCamera.isNull() && c.position() == QCameraDevice::FrontFace)
             frontCamera = c;
-        if (backCamera.isNull() && c.position() == QCameraInfo::BackFace)
+        if (backCamera.isNull() && c.position() == QCameraDevice::BackFace)
             backCamera = c;
     }
     QVERIFY(!defaultCamera.isNull());
@@ -674,7 +674,7 @@ void tst_QCamera::testConstructor()
     }
 
     {
-        QCamera camera(QCameraInfo::FrontFace);
+        QCamera camera(QCameraDevice::FrontFace);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), frontCamera);
@@ -688,7 +688,7 @@ void tst_QCamera::testConstructor()
     }
 
     {
-        QCameraInfo cameraInfo = QMediaDevices::videoInputs().at(0);
+        QCameraDevice cameraInfo = QMediaDevices::videoInputs().at(0);
         QCamera camera(cameraInfo);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
@@ -696,7 +696,7 @@ void tst_QCamera::testConstructor()
     }
 
     {
-        QCamera camera(QCameraInfo::BackFace);
+        QCamera camera(QCameraDevice::BackFace);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), backCamera);
@@ -704,7 +704,7 @@ void tst_QCamera::testConstructor()
 
     {
         // Should load the default camera when UnspecifiedPosition is requested
-        QCamera camera(QCameraInfo::UnspecifiedPosition);
+        QCamera camera(QCameraDevice::UnspecifiedPosition);
         QCOMPARE(camera.isAvailable(), true);
         QCOMPARE(camera.error(), QCamera::NoError);
         QCOMPARE(camera.cameraInfo(), defaultCamera);
diff --git a/tests/auto/unit/multimedia/qcamerainfo/CMakeLists.txt b/tests/auto/unit/multimedia/qcameradevice/CMakeLists.txt
index 2b6dc1d97..150307fea 100644
--- a/tests/auto/unit/multimedia/qcamerainfo/CMakeLists.txt
+++ b/tests/auto/unit/multimedia/qcameradevice/CMakeLists.txt
@@ -1,12 +1,12 @@
-# Generated from qcamerainfo.pro.
+# Generated from qcameradevice.pro.
 
 #####################################################################
-## tst_qcamerainfo Test:
+## tst_qcameradevice Test:
 #####################################################################
 
-qt_internal_add_test(tst_qcamerainfo
+qt_internal_add_test(tst_qcameradevice
     SOURCES
-        tst_qcamerainfo.cpp
+        tst_qcameradevice.cpp
     INCLUDE_DIRECTORIES
         ../../mockbackend
     PUBLIC_LIBRARIES
diff --git a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
index 5582c82dc..458c77efa 100644
--- a/tests/auto/unit/multimedia/qcamerainfo/tst_qcamerainfo.cpp
+++ b/tests/auto/unit/multimedia/qcameradevice/tst_qcameradevice.cpp
@@ -30,7 +30,7 @@
 #include <QDebug>
 
 #include <qcamera.h>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 #include <qmediadevices.h>
 
 #include "qmockintegration_p.h"
@@ -38,7 +38,7 @@
 
 QT_USE_NAMESPACE
 
-class tst_QCameraInfo: public QObject
+class tst_QCameraDevice: public QObject
 {
     Q_OBJECT
 
@@ -57,34 +57,34 @@ private:
     QMockIntegration integration;
 };
 
-void tst_QCameraInfo::initTestCase()
+void tst_QCameraDevice::initTestCase()
 {
 }
 
-void tst_QCameraInfo::init()
+void tst_QCameraDevice::init()
 {
 }
 
-void tst_QCameraInfo::cleanup()
+void tst_QCameraDevice::cleanup()
 {
 }
 
-void tst_QCameraInfo::constructor()
+void tst_QCameraDevice::constructor()
 {
     {
         // default camera
         QCamera camera;
-        QCameraInfo info(camera.cameraInfo());
+        QCameraDevice info(camera.cameraInfo());
         QVERIFY(!info.isNull());
         QCOMPARE(info.id(), QStringLiteral("default"));
         QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
-        QCOMPARE(info.position(), QCameraInfo::UnspecifiedPosition);
+        QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
     }
 
     auto cameras = QMediaDevices::videoInputs();
-    QCameraInfo info;
+    QCameraDevice info;
     for (const auto &c : cameras) {
-        if (c.position() == QCameraInfo::BackFace)
+        if (c.position() == QCameraDevice::BackFace)
             info = c;
     }
     QVERIFY(!info.isNull());
@@ -94,57 +94,57 @@ void tst_QCameraInfo::constructor()
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("back"));
     QCOMPARE(info.description(), QStringLiteral("backCamera"));
-    QCOMPARE(info.position(), QCameraInfo::BackFace);
+    QCOMPARE(info.position(), QCameraDevice::BackFace);
 
-    QCameraInfo info2(info);
+    QCameraDevice info2(info);
     QVERIFY(!info2.isNull());
     QCOMPARE(info2.id(), QStringLiteral("back"));
     QCOMPARE(info2.description(), QStringLiteral("backCamera"));
-    QCOMPARE(info2.position(), QCameraInfo::BackFace);
+    QCOMPARE(info2.position(), QCameraDevice::BackFace);
 }
 
-void tst_QCameraInfo::defaultCamera()
+void tst_QCameraDevice::defaultCamera()
 {
-    QCameraInfo info = QMediaDevices::defaultVideoInput();
+    QCameraDevice info = QMediaDevices::defaultVideoInput();
 
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("default"));
     QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
-    QCOMPARE(info.position(), QCameraInfo::UnspecifiedPosition);
+    QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
 
     QCamera camera(info);
     QCOMPARE(camera.cameraInfo(), info);
 }
 
-void tst_QCameraInfo::availableCameras()
+void tst_QCameraDevice::availableCameras()
 {
-    QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
+    QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
     QCOMPARE(cameras.count(), 3);
 
-    QCameraInfo info = cameras.at(0);
+    QCameraDevice info = cameras.at(0);
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("default"));
     QCOMPARE(info.description(), QStringLiteral("defaultCamera"));
-    QCOMPARE(info.position(), QCameraInfo::UnspecifiedPosition);
+    QCOMPARE(info.position(), QCameraDevice::UnspecifiedPosition);
 
     info = cameras.at(1);
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("front"));
     QCOMPARE(info.description(), QStringLiteral("frontCamera"));
-    QCOMPARE(info.position(), QCameraInfo::FrontFace);
+    QCOMPARE(info.position(), QCameraDevice::FrontFace);
 
     QCOMPARE(cameras.count(), 3);
     info = cameras.at(2);
     QVERIFY(!info.isNull());
     QCOMPARE(info.id(), QStringLiteral("back"));
     QCOMPARE(info.description(), QStringLiteral("backCamera"));
-    QCOMPARE(info.position(), QCameraInfo::BackFace);
+    QCOMPARE(info.position(), QCameraDevice::BackFace);
 }
 
-void tst_QCameraInfo::equality_operators()
+void tst_QCameraDevice::equality_operators()
 {
-    QCameraInfo defaultCamera = QMediaDevices::defaultVideoInput();
-    QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
+    QCameraDevice defaultCamera = QMediaDevices::defaultVideoInput();
+    QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
 
     QVERIFY(defaultCamera == cameras.at(0));
     QVERIFY(defaultCamera != cameras.at(1));
@@ -163,6 +163,6 @@ void tst_QCameraInfo::equality_operators()
 }
 
 
-QTEST_MAIN(tst_QCameraInfo)
+QTEST_MAIN(tst_QCameraDevice)
 
-#include "tst_qcamerainfo.moc"
+#include "tst_qcameradevice.moc"