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>

169 files changed, 775 insertions, 772 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 5ec944013..ecd097a50 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -147,7 +147,7 @@ void AudioTest::deviceChanged(int idx)
         return;
 
     // device has changed
-    m_deviceInfo = deviceBox->itemData(idx).value<QAudioDeviceInfo>();
+    m_deviceInfo = deviceBox->itemData(idx).value<QAudioDevice>();
 
     sampleRateSpinBox->clear();
     sampleRateSpinBox->setMinimum(m_deviceInfo.minimumSampleRate());
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 7b74cc65a..18c968ca1 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -51,7 +51,7 @@
 #ifndef AUDIODEVICES_H
 #define AUDIODEVICES_H
 
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QMediaDevices>
 #include <QMainWindow>
 #include <QObject>
@@ -73,7 +73,7 @@ public:
     explicit AudioTest(QWidget *parent = nullptr);
 
 private:
-    QAudioDeviceInfo m_deviceInfo;
+    QAudioDevice m_deviceInfo;
     QAudioFormat m_settings;
     QAudio::Mode m_mode = QAudio::AudioInput;
     QMediaDevices *m_devices = nullptr;
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index faf5c0555..3e3460251 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -50,7 +50,7 @@
 
 #include "audiooutput.h"
 
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QAudioSink>
 #include <QDebug>
 #include <QVBoxLayout>
@@ -159,7 +159,7 @@ void AudioTest::initializeWindow()
     QVBoxLayout *layout = new QVBoxLayout;
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioOutput();
+    const QAudioDevice &defaultDeviceInfo = m_devices->defaultAudioOutput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
     for (auto &deviceInfo: m_devices->audioOutputs()) {
         if (deviceInfo != defaultDeviceInfo)
@@ -194,7 +194,7 @@ void AudioTest::initializeWindow()
     window->show();
 }
 
-void AudioTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
+void AudioTest::initializeAudio(const QAudioDevice &deviceInfo)
 {
     QAudioFormat format = deviceInfo.preferredFormat();
 
@@ -216,7 +216,7 @@ void AudioTest::deviceChanged(int index)
     m_generator->stop();
     m_audioOutput->stop();
     m_audioOutput->disconnect(this);
-    initializeAudio(m_deviceBox->itemData(index).value<QAudioDeviceInfo>());
+    initializeAudio(m_deviceBox->itemData(index).value<QAudioDevice>());
 }
 
 void AudioTest::volumeChanged(int value)
diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index 1a7bf9f63..156cc775c 100644
--- a/examples/multimedia/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
@@ -99,7 +99,7 @@ public:
 
 private:
     void initializeWindow();
-    void initializeAudio(const QAudioDeviceInfo &deviceInfo);
+    void initializeAudio(const QAudioDevice &deviceInfo);
 
 private:
     QMediaDevices *m_devices = nullptr;
diff --git a/examples/multimedia/audiorecorder/audiorecorder.cpp b/examples/multimedia/audiorecorder/audiorecorder.cpp
index 7ff792330..53575c45a 100644
--- a/examples/multimedia/audiorecorder/audiorecorder.cpp
+++ b/examples/multimedia/audiorecorder/audiorecorder.cpp
@@ -59,7 +59,7 @@
 #include <QMediaEncoder>
 #include <QStandardPaths>
 #include <qmediadevices.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qaudiobuffer.h>
 
 static QList<qreal> getBufferLevels(const QAudioBuffer &buffer);
@@ -189,7 +189,7 @@ static QVariant boxValue(const QComboBox *box)
 void AudioRecorder::toggleRecord()
 {
     if (m_audioEncoder->state() == QMediaEncoder::StoppedState) {
-        m_captureSession.setAudioInput(boxValue(ui->audioDeviceBox).value<QAudioDeviceInfo>());
+        m_captureSession.setAudioInput(boxValue(ui->audioDeviceBox).value<QAudioDevice>());
 
         QMediaEncoderSettings settings;
         settings.setFileFormat(boxValue(ui->containerBox).value<QMediaFormat::FileFormat>());
diff --git a/examples/multimedia/audiosource/audiosource.cpp b/examples/multimedia/audiosource/audiosource.cpp
index 3469a44f0..04e8e0f40 100644
--- a/examples/multimedia/audiosource/audiosource.cpp
+++ b/examples/multimedia/audiosource/audiosource.cpp
@@ -57,7 +57,7 @@
 #include <QDebug>
 #include <QPainter>
 #include <QVBoxLayout>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QAudioSource>
 #include <qendian.h>
 
@@ -163,7 +163,7 @@ void InputTest::initializeWindow()
     layout->addWidget(m_canvas);
 
     m_deviceBox = new QComboBox(this);
-    const QAudioDeviceInfo &defaultDeviceInfo = m_devices->defaultAudioInput();
+    const QAudioDevice &defaultDeviceInfo = m_devices->defaultAudioInput();
     m_deviceBox->addItem(defaultDeviceInfo.description(), QVariant::fromValue(defaultDeviceInfo));
     for (auto &deviceInfo: m_devices->audioInputs()) {
         if (deviceInfo != defaultDeviceInfo)
@@ -193,7 +193,7 @@ void InputTest::initializeWindow()
     window->show();
 }
 
-void InputTest::initializeAudio(const QAudioDeviceInfo &deviceInfo)
+void InputTest::initializeAudio(const QAudioDevice &deviceInfo)
 {
     QAudioFormat format;
     format.setSampleRate(8000);
@@ -263,7 +263,7 @@ void InputTest::deviceChanged(int index)
     m_audioInput->stop();
     m_audioInput->disconnect(this);
 
-    initializeAudio(m_deviceBox->itemData(index).value<QAudioDeviceInfo>());
+    initializeAudio(m_deviceBox->itemData(index).value<QAudioDevice>());
 }
 
 void InputTest::sliderChanged(int value)
diff --git a/examples/multimedia/audiosource/audiosource.h b/examples/multimedia/audiosource/audiosource.h
index f1a48bd9b..c5662a397 100644
--- a/examples/multimedia/audiosource/audiosource.h
+++ b/examples/multimedia/audiosource/audiosource.h
@@ -114,7 +114,7 @@ public:
 
 private:
     void initializeWindow();
-    void initializeAudio(const QAudioDeviceInfo &deviceInfo);
+    void initializeAudio(const QAudioDevice &deviceInfo);
 
 private slots:
     void toggleMode();
diff --git a/examples/multimedia/devices/main.cpp b/examples/multimedia/devices/main.cpp
index ce43c7079..a9d1537d3 100644
--- a/examples/multimedia/devices/main.cpp
+++ b/examples/multimedia/devices/main.cpp
@@ -52,8 +52,8 @@
 #include <QString>
 #include <QAudioFormat>
 
-#include <QAudioDeviceInfo>
-#include <QCameraInfo>
+#include <QAudioDevice>
+#include <QCameraDevice>
 #include <qmediadevices.h>
 
 #include <stdio.h>
@@ -74,19 +74,19 @@ QString formatToString(QAudioFormat::SampleFormat sampleFormat)
     }
 }
 
-QString positionToString(QCameraInfo::Position position)
+QString positionToString(QCameraDevice::Position position)
 {
     switch (position) {
-        case QCameraInfo::BackFace:
+        case QCameraDevice::BackFace:
             return "BackFace";
-        case QCameraInfo::FrontFace:
+        case QCameraDevice::FrontFace:
             return "FrontFace";
         default:
             return "Unspecified";
     }
 }
 
-void printAudioDeviceInfo(QTextStream &out, const QAudioDeviceInfo &deviceInfo)
+void printAudioDeviceInfo(QTextStream &out, const QAudioDevice &deviceInfo)
 {
     const auto isDefault = deviceInfo.isDefault() ? "Yes" : "No";
     const auto preferredFormat = deviceInfo.preferredFormat();
@@ -119,7 +119,7 @@ void printAudioDeviceInfo(QTextStream &out, const QAudioDeviceInfo &deviceInfo)
     out << Qt::endl;
 }
 
-void printVideoDeviceInfo(QTextStream &out, const QCameraInfo &cameraInfo)
+void printVideoDeviceInfo(QTextStream &out, const QCameraDevice &cameraInfo)
 {
     const auto isDefault = cameraInfo.isDefault() ? "Yes" : "No";
     const auto position = cameraInfo.position();
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 25d7361eb..78aef1412 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -304,7 +304,7 @@ void Engine::suspend()
     }
 }
 
-void Engine::setAudioInputDevice(const QAudioDeviceInfo &device)
+void Engine::setAudioInputDevice(const QAudioDevice &device)
 {
     if (device.id() != m_audioInputDevice.id()) {
         m_audioInputDevice = device;
@@ -312,7 +312,7 @@ void Engine::setAudioInputDevice(const QAudioDeviceInfo &device)
     }
 }
 
-void Engine::setAudioOutputDevice(const QAudioDeviceInfo &device)
+void Engine::setAudioOutputDevice(const QAudioDevice &device)
 {
     if (device.id() != m_audioOutputDevice.id()) {
         m_audioOutputDevice = device;
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index d82f17da2..1ee87a2a5 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -54,7 +54,7 @@
 #include "spectrum.h"
 #include "spectrumanalyser.h"
 
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QAudioFormat>
 #include <QBuffer>
 #include <QByteArray>
@@ -93,10 +93,10 @@ public:
     explicit Engine(QObject *parent = 0);
     ~Engine();
 
-    const QList<QAudioDeviceInfo> &availableAudioInputDevices() const
+    const QList<QAudioDevice> &availableAudioInputDevices() const
                                     { return m_availableAudioInputDevices; }
 
-    const QList<QAudioDeviceInfo> &availableAudioOutputDevices() const
+    const QList<QAudioDevice> &availableAudioOutputDevices() const
                                     { return m_availableAudioOutputDevices; }
 
     QAudio::Mode mode() const { return m_mode; }
@@ -178,8 +178,8 @@ public slots:
     void startRecording();
     void startPlayback();
     void suspend();
-    void setAudioInputDevice(const QAudioDeviceInfo &device);
-    void setAudioOutputDevice(const QAudioDeviceInfo &device);
+    void setAudioInputDevice(const QAudioDevice &device);
+    void setAudioOutputDevice(const QAudioDevice &device);
 
 signals:
     void stateChanged(QAudio::Mode mode, QAudio::State state);
@@ -291,14 +291,14 @@ private:
 
     QAudioFormat        m_format;
 
-    const QList<QAudioDeviceInfo> m_availableAudioInputDevices;
-    QAudioDeviceInfo    m_audioInputDevice;
+    const QList<QAudioDevice> m_availableAudioInputDevices;
+    QAudioDevice    m_audioInputDevice;
     QAudioSource*        m_audioInput;
     QIODevice*          m_audioInputIODevice;
     qint64              m_recordPosition;
 
-    const QList<QAudioDeviceInfo> m_availableAudioOutputDevices;
-    QAudioDeviceInfo    m_audioOutputDevice;
+    const QList<QAudioDevice> m_availableAudioOutputDevices;
+    QAudioDevice    m_audioOutputDevice;
     QAudioSink*       m_audioOutput;
     qint64              m_playPosition;
     QBuffer             m_audioOutputIODevice;
diff --git a/examples/multimedia/spectrum/app/settingsdialog.cpp b/examples/multimedia/spectrum/app/settingsdialog.cpp
index 455e1dd5a..3ec9c6956 100644
--- a/examples/multimedia/spectrum/app/settingsdialog.cpp
+++ b/examples/multimedia/spectrum/app/settingsdialog.cpp
@@ -59,8 +59,8 @@
 #include <QVBoxLayout>
 
 SettingsDialog::SettingsDialog(
-            const QList<QAudioDeviceInfo> &availableInputDevices,
-            const QList<QAudioDeviceInfo> &availableOutputDevices,
+            const QList<QAudioDevice> &availableInputDevices,
+            const QList<QAudioDevice> &availableOutputDevices,
             QWidget *parent)
     :   QDialog(parent)
     ,   m_windowFunction(DefaultWindowFunction)
@@ -72,10 +72,10 @@ SettingsDialog::SettingsDialog(
 
     // Populate combo boxes
 
-    for (const QAudioDeviceInfo &device : availableInputDevices)
+    for (const QAudioDevice &device : availableInputDevices)
         m_inputDeviceComboBox->addItem(device.description(),
                                        QVariant::fromValue(device));
-    for (const QAudioDeviceInfo &device : availableOutputDevices)
+    for (const QAudioDevice &device : availableOutputDevices)
         m_outputDeviceComboBox->addItem(device.description(),
                                        QVariant::fromValue(device));
 
@@ -141,11 +141,11 @@ void SettingsDialog::windowFunctionChanged(int index)
 
 void SettingsDialog::inputDeviceChanged(int index)
 {
-    m_inputDevice = m_inputDeviceComboBox->itemData(index).value<QAudioDeviceInfo>();
+    m_inputDevice = m_inputDeviceComboBox->itemData(index).value<QAudioDevice>();
 }
 
 void SettingsDialog::outputDeviceChanged(int index)
 {
-    m_outputDevice = m_outputDeviceComboBox->itemData(index).value<QAudioDeviceInfo>();
+    m_outputDevice = m_outputDeviceComboBox->itemData(index).value<QAudioDevice>();
 }
 
diff --git a/examples/multimedia/spectrum/app/settingsdialog.h b/examples/multimedia/spectrum/app/settingsdialog.h
index 3200ccf54..e6563b6ce 100644
--- a/examples/multimedia/spectrum/app/settingsdialog.h
+++ b/examples/multimedia/spectrum/app/settingsdialog.h
@@ -53,7 +53,7 @@
 
 #include "spectrum.h"
 #include <QDialog>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
@@ -72,14 +72,14 @@ class SettingsDialog : public QDialog
     Q_OBJECT
 
 public:
-    SettingsDialog(const QList<QAudioDeviceInfo> &availableInputDevices,
-                   const QList<QAudioDeviceInfo> &availableOutputDevices,
+    SettingsDialog(const QList<QAudioDevice> &availableInputDevices,
+                   const QList<QAudioDevice> &availableOutputDevices,
                    QWidget *parent = 0);
     ~SettingsDialog();
 
     WindowFunction windowFunction() const { return m_windowFunction; }
-    const QAudioDeviceInfo &inputDevice() const { return m_inputDevice; }
-    const QAudioDeviceInfo &outputDevice() const { return m_outputDevice; }
+    const QAudioDevice &inputDevice() const { return m_inputDevice; }
+    const QAudioDevice &outputDevice() const { return m_outputDevice; }
 
 private slots:
     void windowFunctionChanged(int index);
@@ -88,8 +88,8 @@ private slots:
 
 private:
     WindowFunction   m_windowFunction;
-    QAudioDeviceInfo m_inputDevice;
-    QAudioDeviceInfo m_outputDevice;
+    QAudioDevice m_inputDevice;
+    QAudioDevice m_outputDevice;
 
     QComboBox *m_inputDeviceComboBox;
     QComboBox *m_outputDeviceComboBox;
diff --git a/examples/multimedia/spectrum/app/tonegeneratordialog.h b/examples/multimedia/spectrum/app/tonegeneratordialog.h
index 48a44a152..5095cbb7d 100644
--- a/examples/multimedia/spectrum/app/tonegeneratordialog.h
+++ b/examples/multimedia/spectrum/app/tonegeneratordialog.h
@@ -52,7 +52,7 @@
 #define TONEGENERATORDIALOG_H
 
 #include "spectrum.h"
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QDialog>
 
 QT_BEGIN_NAMESPACE
diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index a237c38de..8e339a6cb 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -56,10 +56,10 @@
 
 #include <QMediaEncoder>
 #include <QVideoWidget>
-#include <QCameraInfo>
+#include <QCameraDevice>
 #include <QMediaMetaData>
 #include <QMediaDevices>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 
 #include <QMessageBox>
 #include <QPalette>
@@ -89,7 +89,7 @@ Camera::Camera()
     setCamera(QMediaDevices::defaultVideoInput());
 }
 
-void Camera::setCamera(const QCameraInfo &cameraInfo)
+void Camera::setCamera(const QCameraDevice &cameraInfo)
 {
     m_camera.reset(new QCamera(cameraInfo));
     m_captureSession.setCamera(m_camera.data());
@@ -320,7 +320,7 @@ void Camera::displayCameraError()
 
 void Camera::updateCameraDevice(QAction *action)
 {
-    setCamera(qvariant_cast<QCameraInfo>(action->data()));
+    setCamera(qvariant_cast<QCameraDevice>(action->data()));
 }
 
 void Camera::displayViewfinder()
@@ -362,8 +362,8 @@ void Camera::closeEvent(QCloseEvent *event)
 void Camera::updateCameras()
 {
     ui->menuDevices->clear();
-    const QList<QCameraInfo> availableCameras = QMediaDevices::videoInputs();
-    for (const QCameraInfo &cameraInfo : availableCameras) {
+    const QList<QCameraDevice> availableCameras = QMediaDevices::videoInputs();
+    for (const QCameraDevice &cameraInfo : availableCameras) {
         QAction *videoDeviceAction = new QAction(cameraInfo.description(), videoDevicesGroup);
         videoDeviceAction->setCheckable(true);
         videoDeviceAction->setData(QVariant::fromValue(cameraInfo));
diff --git a/examples/multimediawidgets/camera/camera.h b/examples/multimediawidgets/camera/camera.h
index 2424b57d0..95e436744 100644
--- a/examples/multimediawidgets/camera/camera.h
+++ b/examples/multimediawidgets/camera/camera.h
@@ -79,7 +79,7 @@ public slots:
     void saveMetaData();
 
 private slots:
-    void setCamera(const QCameraInfo &cameraInfo);
+    void setCamera(const QCameraDevice &cameraInfo);
 
     void startCamera();
     void stopCamera();
diff --git a/examples/multimediawidgets/camera/videosettings.cpp b/examples/multimediawidgets/camera/videosettings.cpp
index c6c0182ab..aafd4b5f3 100644
--- a/examples/multimediawidgets/camera/videosettings.cpp
+++ b/examples/multimediawidgets/camera/videosettings.cpp
@@ -56,9 +56,9 @@
 #include <QDebug>
 #include <QMediaEncoder>
 #include <QMediaFormat>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QMediaCaptureSession>
-#include <QCameraInfo>
+#include <QCameraDevice>
 #include <QCamera>
 
 VideoSettings::VideoSettings(QMediaEncoder *mediaRecorder, QWidget *parent)
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index d3e3128a5..7c9d74b9c 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -58,7 +58,7 @@
 #include <QMediaPlaylist>
 #include <QMediaMetaData>
 #include <QMediaDevices>
-#include <QAudioDeviceInfo>
+#include <QAudioDevice>
 #include <QMediaFormat>
 #include <QtWidgets>
 
@@ -187,7 +187,7 @@ Player::Player(QWidget *parent)
     connect(m_colorButton, &QPushButton::clicked, this, &Player::showColorDialog);
 
     m_audioOutput = new QComboBox(this);
-    m_audioOutput->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDeviceInfo()));
+    m_audioOutput->addItem(QString::fromUtf8("Default"), QVariant::fromValue(QAudioDevice()));
     for (auto &deviceInfo: QMediaDevices::audioOutputs())
         m_audioOutput->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
     connect(m_audioOutput, QOverload<int>::of(&QComboBox::activated), this, &Player::audioOutputChanged);
@@ -583,7 +583,7 @@ void Player::showColorDialog()
 
 void Player::audioOutputChanged(int index)
 {
-    auto device = m_audioOutput->itemData(index).value<QAudioDeviceInfo>();
+    auto device = m_audioOutput->itemData(index).value<QAudioDevice>();
     m_player->setAudioOutput(device);
 }
 
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt
index e08a34ac5..2e18d36bd 100644
--- a/src/multimedia/CMakeLists.txt
+++ b/src/multimedia/CMakeLists.txt
@@ -17,7 +17,7 @@ qt_internal_add_module(Multimedia
         audio/qaudio.cpp audio/qaudio.h
         audio/qaudiobuffer.cpp audio/qaudiobuffer.h
         audio/qaudiodecoder.cpp audio/qaudiodecoder.h
-        audio/qaudiodeviceinfo.cpp audio/qaudiodeviceinfo.h audio/qaudiodeviceinfo_p.h
+        audio/qaudiodevice.cpp audio/qaudiodevice.h audio/qaudiodevice_p.h
         audio/qaudioformat.cpp audio/qaudioformat.h
         audio/qaudiohelpers.cpp audio/qaudiohelpers_p.h
         audio/qaudiosource.cpp audio/qaudiosource.h
@@ -27,8 +27,8 @@ qt_internal_add_module(Multimedia
         audio/qsoundeffect.cpp audio/qsoundeffect.h
         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/qcamerainfo.cpp camera/qcamerainfo.h camera/qcamerainfo_p.h
         platform/qplatformaudiodecoder.cpp platform/qplatformaudiodecoder_p.h
         platform/qplatformcamera.cpp platform/qplatformcamera_p.h
         platform/qplatformcameraimagecapture.cpp platform/qplatformcameraimagecapture_p.h
@@ -129,7 +129,7 @@ endif()
 
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
     SOURCES
-        platform/windows/audio/qwindowsaudiodeviceinfo.cpp platform/windows/audio/qwindowsaudiodeviceinfo_p.h
+        platform/windows/audio/qwindowsaudiodevice.cpp platform/windows/audio/qwindowsaudiodevice_p.h
         platform/windows/audio/qwindowsaudiosource.cpp platform/windows/audio/qwindowsaudiosource_p.h
         platform/windows/audio/qwindowsaudiosink.cpp platform/windows/audio/qwindowsaudiosink_p.h
         platform/windows/audio/qwindowsaudioutils.cpp platform/windows/audio/qwindowsaudioutils_p.h
@@ -202,7 +202,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf
 
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer
     SOURCES
-        platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
+        platform/gstreamer/audio/qgstreameraudiodevice.cpp platform/gstreamer/audio/qgstreameraudiodevice_p.h
         platform/gstreamer/audio/qgstreameraudiosource.cpp platform/gstreamer/audio/qgstreameraudiosource_p.h
         platform/gstreamer/audio/qgstreameraudiosink.cpp platform/gstreamer/audio/qgstreameraudiosink_p.h
         platform/gstreamer/audio/qgstreameraudiodecoder.cpp platform/gstreamer/audio/qgstreameraudiodecoder_p.h
@@ -272,7 +272,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID AND QT_FEATURE_gstreamer
 
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
     SOURCES
-        platform/pulseaudio/qaudiodeviceinfo_pulse.cpp platform/pulseaudio/qaudiodeviceinfo_pulse_p.h
+        platform/pulseaudio/qpulseaudiodevice.cpp platform/pulseaudio/qpulseaudiodevice_p.h
         platform/pulseaudio/qaudioengine_pulse.cpp platform/pulseaudio/qaudioengine_pulse_p.h
         platform/pulseaudio/qpulseaudiosource.cpp platform/pulseaudio/qpulseaudiosource_p.h
         platform/pulseaudio/qpulseaudiosink.cpp platform/pulseaudio/qpulseaudiosink_p.h
@@ -285,7 +285,7 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_pulseaudio
 
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_alsa
     SOURCES
-        platform/alsa/qalsaaudiodeviceinfo.cpp platform/alsa/qalsaaudiodeviceinfo_p.h
+        platform/alsa/qalsaaudiodevice.cpp platform/alsa/qalsaaudiodevice_p.h
         platform/alsa/qalsaaudiosource.cpp platform/alsa/qalsaaudiosource_p.h
         platform/alsa/qalsaaudiosink.cpp platform/alsa/qalsaaudiosink_p.h
         platform/alsa/qalsamediadevices.cpp platform/alsa/qalsamediadevices_p.h
@@ -298,7 +298,7 @@ qt_internal_extend_target(Multimedia CONDITION ANDROID
     SOURCES
         platform/android/audio/qandroidaudiosource.cpp platform/android/audio/qandroidaudiosource_p.h
         platform/android/audio/qandroidaudiosink.cpp platform/android/audio/qandroidaudiosink_p.h
-        platform/android/audio/qopenslesdeviceinfo.cpp platform/android/audio/qopenslesdeviceinfo_p.h
+        platform/android/audio/qandroidaudiodevice.cpp platform/android/audio/qandroidaudiodevice_p.h
         platform/android/audio/qopenslesengine.cpp platform/android/audio/qopenslesengine_p.h
         platform/android/common/qandroidglobal_p.h
         platform/android/common/qandroidmultimediautils.cpp platform/android/common/qandroidmultimediautils_p.h
@@ -352,7 +352,7 @@ qt_internal_extend_target(Multimedia CONDITION TARGET Qt::Widgets AND WIN32
 
 qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT WATCHOS
     SOURCES
-        platform/darwin/audio/qcoreaudiodeviceinfo.mm platform/darwin/audio/qcoreaudiodeviceinfo_p.h
+        platform/darwin/audio/qdarwinaudiodevice.mm platform/darwin/audio/qdarwinaudiodevice_p.h
         platform/darwin/audio/qdarwinaudiosource.mm platform/darwin/audio/qdarwinaudiosource_p.h
         platform/darwin/audio/qdarwinaudiosink.mm platform/darwin/audio/qdarwinaudiosink_p.h
         platform/darwin/audio/qcoreaudioutils.mm platform/darwin/audio/qcoreaudioutils_p.h
@@ -427,7 +427,7 @@ qt_internal_extend_target(Multimedia CONDITION APPLE AND NOT IOS AND NOT TVOS AN
 qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_mmrenderer
     SOURCES
         platform/qnx/audio/neutrinoserviceplugin.cpp platform/qnx/audio/neutrinoserviceplugin_p.h
-        platform/qnx/audio/qnxaudiodeviceinfo.cpp platform/qnx/audio/qnxaudiodeviceinfo_p.h
+        platform/qnx/audio/qqnxaudiodevice.cpp platform/qnx/audio/qqnxaudiodevice_p.h
         platform/qnx/audio/qqnxaudiosource.cpp platform/qnx/audio/qqnxaudiosource_p.h
         platform/qnx/audio/qqnxaudiosink.cpp platform/qnx/audio/qqnxaudiosink_p.h
         platform/qnx/audio/qnxaudioutils.cpp platform/qnx/audio/qnxaudioutils_p.h
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodevice.cpp
index 83b2d8d48..dc4615c79 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.cpp
+++ b/src/multimedia/audio/qaudiodevice.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qaudiosystem_p.h"
-#include "qaudiodeviceinfo_p.h"
+#include "qaudiodevice_p.h"
 #include <private/qplatformmediadevices_p.h>
 #include <private/qplatformmediaintegration_p.h>
 
@@ -46,20 +46,20 @@
 
 QT_BEGIN_NAMESPACE
 
-QAudioDeviceInfoPrivate::~QAudioDeviceInfoPrivate() = default;
+QAudioDevicePrivate::~QAudioDevicePrivate() = default;
 
-QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDeviceInfoPrivate);
+QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDevicePrivate);
 
 /*!
-    \class QAudioDeviceInfo
-    \brief The QAudioDeviceInfo class provides an information about audio devices and their functionality.
+    \class QAudioDevice
+    \brief The QAudioDevice class provides an information about audio devices and their functionality.
     \inmodule QtMultimedia
     \ingroup multimedia
     \ingroup multimedia_audio
 
-    QAudioDeviceInfo describes an audio device available in the system, either for input or for playback.
+    QAudioDevice describes an audio device available in the system, either for input or for playback.
 
-    A QAudioDeviceInfo is used by Qt to construct
+    A QAudioDevice is used by Qt to construct
     classes that communicate with the device -- such as
     QAudioSource, and QAudioSink. It is also used to determine the
     input or output device to use in a capture session or during media playback.
@@ -92,17 +92,17 @@ QT_DEFINE_QESDP_SPECIALIZATION_DTOR(QAudioDeviceInfoPrivate);
 */
 
 /*!
-    Constructs an empty QAudioDeviceInfo object.
+    Constructs a null QAudioDevice object.
 */
-QAudioDeviceInfo::QAudioDeviceInfo() = default;
+QAudioDevice::QAudioDevice() = default;
 
 /*!
     Constructs a copy of \a other.
 */
-QAudioDeviceInfo::QAudioDeviceInfo(const QAudioDeviceInfo& other) = default;
+QAudioDevice::QAudioDevice(const QAudioDevice& other) = default;
 
 /*!
-    \fn QAudioDeviceInfo::QAudioDeviceInfo(QAudioDeviceInfo &&other)
+    \fn QAudioDevice::QAudioDevice(QAudioDevice &&other)
 
     Move constructs from \a other.
 */
@@ -110,24 +110,24 @@ QAudioDeviceInfo::QAudioDeviceInfo(const QAudioDeviceInfo& other) = default;
 /*!
     Destroy this audio device info.
 */
-QAudioDeviceInfo::~QAudioDeviceInfo() = default;
+QAudioDevice::~QAudioDevice() = default;
 
 /*!
-    Sets the QAudioDeviceInfo object to be equal to \a other.
+    Sets the QAudioDevice object to be equal to \a other.
 */
-QAudioDeviceInfo& QAudioDeviceInfo::operator=(const QAudioDeviceInfo &other) = default;
+QAudioDevice& QAudioDevice::operator=(const QAudioDevice &other) = default;
 
 /*!
-    \fn QAudioDeviceInfo& QAudioDeviceInfo::operator=(QAudioDeviceInfo &&other)
+    \fn QAudioDevice& QAudioDevice::operator=(QAudioDevice &&other)
 
-    Moves \a other into this QAudioDeviceInfo object.
+    Moves \a other into this QAudioDevice object.
 */
 
 /*!
-    Returns true if this QAudioDeviceInfo class represents the
+    Returns true if this QAudioDevice class represents the
     same audio device as \a other.
 */
-bool QAudioDeviceInfo::operator ==(const QAudioDeviceInfo &other) const
+bool QAudioDevice::operator ==(const QAudioDevice &other) const
 {
     if (d == other.d)
         return true;
@@ -139,18 +139,18 @@ bool QAudioDeviceInfo::operator ==(const QAudioDeviceInfo &other) const
 }
 
 /*!
-    Returns true if this QAudioDeviceInfo class represents a
+    Returns true if this QAudioDevice class represents a
     different audio device than \a other
 */
-bool QAudioDeviceInfo::operator !=(const QAudioDeviceInfo &other) const
+bool QAudioDevice::operator !=(const QAudioDevice &other) const
 {
     return !operator==(other);
 }
 
 /*!
-    Returns whether this QAudioDeviceInfo object holds a valid device definition.
+    Returns whether this QAudioDevice object holds a valid device definition.
 */
-bool QAudioDeviceInfo::isNull() const
+bool QAudioDevice::isNull() const
 {
     return d == nullptr;
 }
@@ -162,7 +162,7 @@ bool QAudioDeviceInfo::isNull() const
 
     They are a unique identifier for the audio device.
 */
-QByteArray QAudioDeviceInfo::id() const
+QByteArray QAudioDevice::id() const
 {
     return isNull() ? QByteArray() : d->id;
 }
@@ -172,7 +172,7 @@ QByteArray QAudioDeviceInfo::id() const
 
     Use this string to present the device to the user.
 */
-QString QAudioDeviceInfo::description() const
+QString QAudioDevice::description() const
 {
     return isNull() ? QString() : d->description;
 }
@@ -180,16 +180,16 @@ QString QAudioDeviceInfo::description() const
 /*!
     Returns true if this is the default audio device for it's mode.
 */
-bool QAudioDeviceInfo::isDefault() const
+bool QAudioDevice::isDefault() const
 {
     return d ? d->isDefault : false;
 }
 
 /*!
     Returns true if the supplied \a settings are supported by the audio
-    device described by this QAudioDeviceInfo.
+    device described by this QAudioDevice.
 */
-bool QAudioDeviceInfo::isFormatSupported(const QAudioFormat &settings) const
+bool QAudioDevice::isFormatSupported(const QAudioFormat &settings) const
 {
     if (isNull())
         return false;
@@ -215,7 +215,7 @@ bool QAudioDeviceInfo::isFormatSupported(const QAudioFormat &settings) const
     \li Output settings: 48000Hz stereo 16 bit.
     \endlist
 */
-QAudioFormat QAudioDeviceInfo::preferredFormat() const
+QAudioFormat QAudioDevice::preferredFormat() const
 {
     return isNull() ? QAudioFormat() : d->preferredFormat;
 }
@@ -223,7 +223,7 @@ QAudioFormat QAudioDeviceInfo::preferredFormat() const
 /*!
     Returns the minimum supported sample rate (in Hertz).
 */
-int QAudioDeviceInfo::minimumSampleRate() const
+int QAudioDevice::minimumSampleRate() const
 {
     return isNull() ? 0 : d->minimumSampleRate;
 }
@@ -231,7 +231,7 @@ int QAudioDeviceInfo::minimumSampleRate() const
 /*!
     Returns the maximum supported sample rate (in Hertz).
 */
-int QAudioDeviceInfo::maximumSampleRate() const
+int QAudioDevice::maximumSampleRate() const
 {
     return isNull() ? 0 : d->maximumSampleRate;
 }
@@ -241,7 +241,7 @@ int QAudioDeviceInfo::maximumSampleRate() const
 
     This is typically 1 for mono sound, or 2 for stereo sound.
 */
-int QAudioDeviceInfo::minimumChannelCount() const
+int QAudioDevice::minimumChannelCount() const
 {
     return isNull() ? 0 : d->minimumChannelCount;
 }
@@ -251,7 +251,7 @@ int QAudioDeviceInfo::minimumChannelCount() const
 
     This is typically 1 for mono sound, or 2 for stereo sound.
 */
-int QAudioDeviceInfo::maximumChannelCount() const
+int QAudioDevice::maximumChannelCount() const
 {
     return isNull() ? 0 : d->maximumChannelCount;
 }
@@ -259,7 +259,7 @@ int QAudioDeviceInfo::maximumChannelCount() const
 /*!
     Returns a list of supported sample types.
 */
-QList<QAudioFormat::SampleFormat> QAudioDeviceInfo::supportedSampleFormats() const
+QList<QAudioFormat::SampleFormat> QAudioDevice::supportedSampleFormats() const
 {
     return isNull() ? QList<QAudioFormat::SampleFormat>() : d->supportedSampleFormats;
 }
@@ -267,14 +267,14 @@ QList<QAudioFormat::SampleFormat> QAudioDeviceInfo::supportedSampleFormats() con
 /*!
     \internal
 */
-QAudioDeviceInfo::QAudioDeviceInfo(QAudioDeviceInfoPrivate *p)
+QAudioDevice::QAudioDevice(QAudioDevicePrivate *p)
     : d(p)
 {}
 
 /*!
     returns whether this device is an input or output device.
 */
-QAudio::Mode QAudioDeviceInfo::mode() const
+QAudio::Mode QAudioDevice::mode() const
 {
     return d->mode;
 }
diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodevice.h
index 27d550be5..5afd1ebfa 100644
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodevice.h
@@ -54,29 +54,29 @@
 
 QT_BEGIN_NAMESPACE
 
-class QAudioDeviceInfoPrivate;
-QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QAudioDeviceInfoPrivate, Q_MULTIMEDIA_EXPORT)
+class QAudioDevicePrivate;
+QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QAudioDevicePrivate, Q_MULTIMEDIA_EXPORT)
 
-class Q_MULTIMEDIA_EXPORT QAudioDeviceInfo
+class Q_MULTIMEDIA_EXPORT QAudioDevice
 {
     Q_GADGET
     Q_PROPERTY(QByteArray id READ id CONSTANT)
     Q_PROPERTY(QString description READ description CONSTANT)
     Q_PROPERTY(bool isDefault READ isDefault CONSTANT)
 public:
-    QAudioDeviceInfo();
-    QAudioDeviceInfo(const QAudioDeviceInfo& other);
-    ~QAudioDeviceInfo();
+    QAudioDevice();
+    QAudioDevice(const QAudioDevice& other);
+    ~QAudioDevice();
 
-    QAudioDeviceInfo(QAudioDeviceInfo &&other) noexcept = default;
-    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QAudioDeviceInfo)
-    void swap(QAudioDeviceInfo &other) noexcept
+    QAudioDevice(QAudioDevice &&other) noexcept = default;
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QAudioDevice)
+    void swap(QAudioDevice &other) noexcept
     { qSwap(d, other.d); }
 
-    QAudioDeviceInfo& operator=(const QAudioDeviceInfo& other);
+    QAudioDevice& operator=(const QAudioDevice& other);
 
-    bool operator==(const QAudioDeviceInfo &other) const;
-    bool operator!=(const QAudioDeviceInfo &other) const;
+    bool operator==(const QAudioDevice &other) const;
+    bool operator!=(const QAudioDevice &other) const;
 
     bool isNull() const;
 
@@ -95,11 +95,11 @@ public:
     int maximumChannelCount() const;
     QList<QAudioFormat::SampleFormat> supportedSampleFormats() const;
 
-    const QAudioDeviceInfoPrivate *handle() const { return d.get(); }
+    const QAudioDevicePrivate *handle() const { return d.get(); }
 private:
-    friend class QAudioDeviceInfoPrivate;
-    QAudioDeviceInfo(QAudioDeviceInfoPrivate *p);
-    QExplicitlySharedDataPointer<QAudioDeviceInfoPrivate> d;
+    friend class QAudioDevicePrivate;
+    QAudioDevice(QAudioDevicePrivate *p);
+    QExplicitlySharedDataPointer<QAudioDevicePrivate> d;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiodeviceinfo_p.h b/src/multimedia/audio/qaudiodevice_p.h
index 89df89882..dbebac034 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_p.h
+++ b/src/multimedia/audio/qaudiodevice_p.h
@@ -52,18 +52,18 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 
 QT_BEGIN_NAMESPACE
 
-class QAudioDeviceInfoPrivate : public QSharedData
+class QAudioDevicePrivate : public QSharedData
 {
 public:
-    QAudioDeviceInfoPrivate(const QByteArray &i, QAudio::Mode m)
+    QAudioDevicePrivate(const QByteArray &i, QAudio::Mode m)
         : id(i),
           mode(m)
     {}
-    virtual ~QAudioDeviceInfoPrivate();
+    virtual ~QAudioDevicePrivate();
     QByteArray  id;
     QAudio::Mode mode = QAudio::AudioOutput;
     bool isDefault = false;
@@ -76,7 +76,7 @@ public:
     int maximumChannelCount = 0;
     QList<QAudioFormat::SampleFormat> supportedSampleFormats;
 
-    QAudioDeviceInfo create() { return QAudioDeviceInfo(this); }
+    QAudioDevice create() { return QAudioDevice(this); }
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudioformat.cpp b/src/multimedia/audio/qaudioformat.cpp
index 7318cb9ad..2de431dc9 100644
--- a/src/multimedia/audio/qaudioformat.cpp
+++ b/src/multimedia/audio/qaudioformat.cpp
@@ -80,9 +80,9 @@ QT_BEGIN_NAMESPACE
     samples in memory.
 
     You can obtain audio formats compatible with the audio device used
-    through functions in QAudioDeviceInfo. This class also lets you
+    through functions in QAudioDevice. This class also lets you
     query available parameter values for a device, so that you can set
-    the parameters yourself. See the \l QAudioDeviceInfo class
+    the parameters yourself. See the \l QAudioDevice class
     description for details. You need to know the format of the audio
     streams you wish to play or record.
 
diff --git a/src/multimedia/audio/qaudiosink.cpp b/src/multimedia/audio/qaudiosink.cpp
index 2f490157d..10ee5e470 100644
--- a/src/multimedia/audio/qaudiosink.cpp
+++ b/src/multimedia/audio/qaudiosink.cpp
@@ -39,7 +39,7 @@
 
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include "qaudiosystem_p.h"
 #include "qaudiosink.h"
 
@@ -57,9 +57,9 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_audio
 
     You can construct an audio output with the system's
-    \l{QAudioDeviceInfo::defaultOutputDevice()}{default audio output
+    \l{QAudioDevice::defaultOutputDevice()}{default audio output
     device}. It is also possible to create QAudioSink with a
-    specific QAudioDeviceInfo. When you create the audio output, you
+    specific QAudioDevice. When you create the audio output, you
     should also send in the QAudioFormat to be used for the playback
     (see the QAudioFormat class description for details).
 
@@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet multimedia-snippets/audio.cpp Audio output state changed
 
-    \sa QAudioSource, QAudioDeviceInfo
+    \sa QAudioSource, QAudioDevice
 */
 
 /*!
@@ -118,7 +118,7 @@ QAudioSink::QAudioSink(const QAudioFormat &format, QObject *parent)
     The device referenced by \a audioDevice is used with the output
     \a format parameters.
 */
-QAudioSink::QAudioSink(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent):
+QAudioSink::QAudioSink(const QAudioDevice &audioDevice, const QAudioFormat &format, QObject *parent):
     QObject(parent)
 {
     d = QPlatformMediaIntegration::instance()->devices()->audioOutputDevice(format, audioDevice);
diff --git a/src/multimedia/audio/qaudiosink.h b/src/multimedia/audio/qaudiosink.h
index 7b852f1a2..c3fc30bf0 100644
--- a/src/multimedia/audio/qaudiosink.h
+++ b/src/multimedia/audio/qaudiosink.h
@@ -47,7 +47,7 @@
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +62,7 @@ class Q_MULTIMEDIA_EXPORT QAudioSink : public QObject
 
 public:
     explicit QAudioSink(const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
-    explicit QAudioSink(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
+    explicit QAudioSink(const QAudioDevice &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
     ~QAudioSink();
 
     bool isNull() const { return !d; }
diff --git a/src/multimedia/audio/qaudiosource.cpp b/src/multimedia/audio/qaudiosource.cpp
index f94bb194f..0b7e3e1df 100644
--- a/src/multimedia/audio/qaudiosource.cpp
+++ b/src/multimedia/audio/qaudiosource.cpp
@@ -39,7 +39,7 @@
 
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include "qaudiosystem_p.h"
 #include "qaudiosource.h"
 
@@ -57,9 +57,9 @@ QT_BEGIN_NAMESPACE
     \ingroup multimedia_audio
 
     You can construct an audio input with the system's
-    \l{QAudioDeviceInfo::defaultInputDevice()}{default audio input
+    \l{QAudioDevice::defaultInputDevice()}{default audio input
     device}. It is also possible to create QAudioSource with a
-    specific QAudioDeviceInfo. When you create the audio input, you
+    specific QAudioDevice. When you create the audio input, you
     should also send in the QAudioFormat to be used for the recording
     (see the QAudioFormat class description for details).
 
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
 
     QAudioSource lets you record audio with an audio input device. The
     default constructor of this class will use the systems default
-    audio device, but you can also specify a QAudioDeviceInfo for a
+    audio device, but you can also specify a QAudioDevice for a
     specific device. You also need to pass in the QAudioFormat in
     which you wish to record.
 
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
 
     This will start recording if the format specified is supported by
     the input device (you can check this with
-    QAudioDeviceInfo::isFormatSupported(). In case there are any
+    QAudioDevice::isFormatSupported(). In case there are any
     snags, use the error() function to check what went wrong. We stop
     recording in the \c stopRecording() slot.
 
@@ -109,7 +109,7 @@ QT_BEGIN_NAMESPACE
 
     \snippet multimedia-snippets/audio.cpp Audio input state changed
 
-    \sa QAudioSink, QAudioDeviceInfo
+    \sa QAudioSink, QAudioDevice
 */
 
 /*!
@@ -129,7 +129,7 @@ QAudioSource::QAudioSource(const QAudioFormat &format, QObject *parent)
     \a format parameters.
 */
 
-QAudioSource::QAudioSource(const QAudioDeviceInfo &audioDevice, const QAudioFormat &format, QObject *parent):
+QAudioSource::QAudioSource(const QAudioDevice &audioDevice, const QAudioFormat &format, QObject *parent):
     QObject(parent)
 {
     d = QPlatformMediaIntegration::instance()->devices()->audioInputDevice(format, audioDevice);
diff --git a/src/multimedia/audio/qaudiosource.h b/src/multimedia/audio/qaudiosource.h
index ab62396f6..9c11b85d3 100644
--- a/src/multimedia/audio/qaudiosource.h
+++ b/src/multimedia/audio/qaudiosource.h
@@ -47,7 +47,7 @@
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ class Q_MULTIMEDIA_EXPORT QAudioSource : public QObject
 
 public:
     explicit QAudioSource(const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
-    explicit QAudioSource(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
+    explicit QAudioSource(const QAudioDevice &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = nullptr);
     ~QAudioSource();
 
     bool isNull() const { return !d; }
diff --git a/src/multimedia/audio/qaudiosystem_p.h b/src/multimedia/audio/qaudiosystem_p.h
index e88f0122e..2adfcd0f2 100644
--- a/src/multimedia/audio/qaudiosystem_p.h
+++ b/src/multimedia/audio/qaudiosystem_p.h
@@ -55,7 +55,7 @@
 
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 
 #include <QtCore/qelapsedtimer.h>
 
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index 6aaf7e895..126d8a727 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -40,7 +40,7 @@
 #include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include "qsoundeffect.h"
 #include "qsamplecache_p.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include "qaudiosink.h"
 #include "qmediadevices.h"
 #include <QtCore/qloggingcategory.h>
@@ -54,7 +54,7 @@ Q_GLOBAL_STATIC(QSampleCache, sampleCache)
 class QSoundEffectPrivate : public QIODevice
 {
 public:
-    QSoundEffectPrivate(QSoundEffect *q, const QAudioDeviceInfo &audioDevice = QAudioDeviceInfo());
+    QSoundEffectPrivate(QSoundEffect *q, const QAudioDevice &audioDevice = QAudioDevice());
     ~QSoundEffectPrivate() override = default;
 
     qint64 readData(char *data, qint64 len) override;
@@ -100,10 +100,10 @@ public:
     bool m_sampleReady = false;
     qint64 m_offset = 0;
     QAudio::Role m_role;
-    QAudioDeviceInfo m_audioDevice;
+    QAudioDevice m_audioDevice;
 };
 
-QSoundEffectPrivate::QSoundEffectPrivate(QSoundEffect *q, const QAudioDeviceInfo &audioDevice)
+QSoundEffectPrivate::QSoundEffectPrivate(QSoundEffect *q, const QAudioDevice &audioDevice)
     : QIODevice(q)
     , q_ptr(q)
     , m_audioDevice(audioDevice)
@@ -296,14 +296,14 @@ void QSoundEffectPrivate::setPlaying(bool playing)
     Creates a QSoundEffect with the given \a parent.
 */
 QSoundEffect::QSoundEffect(QObject *parent)
-    : QSoundEffect(QAudioDeviceInfo(), parent)
+    : QSoundEffect(QAudioDevice(), parent)
 {
 }
 
 /*!
     Creates a QSoundEffect with the given \a audioDevice and \a parent.
 */
-QSoundEffect::QSoundEffect(const QAudioDeviceInfo &audioDevice, QObject *parent)
+QSoundEffect::QSoundEffect(const QAudioDevice &audioDevice, QObject *parent)
     : QObject(parent)
     , d(new QSoundEffectPrivate(this, audioDevice))
 {
@@ -331,7 +331,7 @@ QSoundEffect::~QSoundEffect()
 QStringList QSoundEffect::supportedMimeTypes()
 {
     // Only return supported mime types if we have a audio device available
-    const QList<QAudioDeviceInfo> devices = QMediaDevices::audioOutputs();
+    const QList<QAudioDevice> devices = QMediaDevices::audioOutputs();
     if (devices.isEmpty())
         return QStringList();
 
diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index 026b673a2..85e80b704 100644
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 
 class QSoundEffectPrivate;
-class QAudioDeviceInfo;
+class QAudioDevice;
 
 class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
 {
@@ -83,7 +83,7 @@ public:
     };
 
     explicit QSoundEffect(QObject *parent = nullptr);
-    explicit QSoundEffect(const QAudioDeviceInfo &audioDevice, QObject *parent = nullptr);
+    explicit QSoundEffect(const QAudioDevice &audioDevice, QObject *parent = nullptr);
     ~QSoundEffect();
 
     static QStringList supportedMimeTypes();
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 773fe1bea..9358e8c0d 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -40,7 +40,7 @@
 
 #include "qcamera_p.h"
 
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 #include <private/qplatformcamera_p.h>
 #include <private/qplatformcameraimagecapture_p.h>
 #include <private/qplatformmediaintegration_p.h>
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
 
     QCamera can be used within a QMediaCaptureSession for video recording and image taking.
 
-    You can use QCameraInfo to list available cameras and choose which one to use.
+    You can use QCameraDevice to list available cameras and choose which one to use.
 
     \snippet multimedia-snippets/camera.cpp Camera selection
 
@@ -143,7 +143,7 @@ QCamera::QCamera(QObject *parent)
     Construct a QCamera from a camera description \a cameraInfo and \a parent.
 */
 
-QCamera::QCamera(const QCameraInfo &cameraInfo, QObject *parent)
+QCamera::QCamera(const QCameraDevice &cameraInfo, QObject *parent)
     : QObject(*new QCameraPrivate, parent)
 {
     Q_D(QCamera);
@@ -162,15 +162,15 @@ QCamera::QCamera(const QCameraInfo &cameraInfo, QObject *parent)
     back-facing cameras.
 
     If no camera is available at the specified \a position or if \a position is
-    QCameraInfo::UnspecifiedPosition, the default camera is used.
+    QCameraDevice::UnspecifiedPosition, the default camera is used.
 */
 
-QCamera::QCamera(QCameraInfo::Position position, QObject *parent)
+QCamera::QCamera(QCameraDevice::Position position, QObject *parent)
     : QObject(*new QCameraPrivate, parent)
 {
     Q_D(QCamera);
 
-    QCameraInfo info;
+    QCameraDevice info;
     auto cameras = QMediaDevices::videoInputs();
     for (const auto &c : cameras) {
         if (c.position() == position) {
@@ -314,9 +314,9 @@ void QCamera::setCaptureSession(QMediaCaptureSession *session)
 }
 
 /*!
-    Returns the QCameraInfo object associated with this camera.
+    Returns the QCameraDevice object associated with this camera.
  */
-QCameraInfo QCamera::cameraInfo() const
+QCameraDevice QCamera::cameraInfo() const
 {
     Q_D(const QCamera);
     return d->cameraInfo;
@@ -326,7 +326,7 @@ QCameraInfo QCamera::cameraInfo() const
     Sets the camera object to use the physical camera described by
     \a cameraInfo.
 */
-void QCamera::setCameraInfo(const QCameraInfo &cameraInfo)
+void QCamera::setCameraInfo(const QCameraDevice &cameraInfo)
 {
     Q_D(QCamera);
     if (d->cameraInfo == cameraInfo)
@@ -419,7 +419,7 @@ void QCamera::setCameraFormat(const QCameraFormat &format)
 */
 
 /*!
-    \enum QCameraInfo::Position
+    \enum QCameraDevice::Position
     \since 5.3
 
     This enum specifies the physical position of the camera on the system hardware.
@@ -434,7 +434,7 @@ void QCamera::setCameraFormat(const QCameraFormat &format)
     front-facing cameras are mirrored horizontally, so the users can see themselves as looking
     into a mirror. Captured images or videos are not mirrored.
 
-    \sa QCameraInfo::position()
+    \sa QCameraDevice::position()
 */
 
 /*!
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 6c2e226f6..12d241f31 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -48,14 +48,14 @@
 
 #include <QtCore/qobject.h>
 
-#include <QtMultimedia/qcamerainfo.h>
+#include <QtMultimedia/qcameradevice.h>
 
 #include <QtMultimedia/qmediaenumdebug.h>
 
 QT_BEGIN_NAMESPACE
 
 
-class QCameraInfo;
+class QCameraDevice;
 class QPlatformMediaCaptureSession;
 class QMediaCaptureSession;
 
@@ -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(QCameraInfo cameraInfo READ cameraInfo WRITE setCameraInfo NOTIFY cameraInfoChanged)
+    Q_PROPERTY(QCameraDevice cameraInfo READ cameraInfo WRITE setCameraInfo NOTIFY cameraInfoChanged)
     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)
@@ -178,8 +178,8 @@ public:
     Q_DECLARE_FLAGS(Features, Feature)
 
     explicit QCamera(QObject *parent = nullptr);
-    explicit QCamera(const QCameraInfo& cameraInfo, QObject *parent = nullptr);
-    explicit QCamera(QCameraInfo::Position position, QObject *parent = nullptr);
+    explicit QCamera(const QCameraDevice& cameraInfo, QObject *parent = nullptr);
+    explicit QCamera(QCameraDevice::Position position, QObject *parent = nullptr);
     ~QCamera();
 
     bool isAvailable() const;
@@ -189,8 +189,8 @@ public:
 
     QMediaCaptureSession *captureSession() const;
 
-    QCameraInfo cameraInfo() const;
-    void setCameraInfo(const QCameraInfo &cameraInfo);
+    QCameraDevice cameraInfo() const;
+    void setCameraInfo(const QCameraDevice &cameraInfo);
 
     QCameraFormat cameraFormat() const;
     void setCameraFormat(const QCameraFormat &format);
@@ -307,7 +307,7 @@ private:
     Q_DISABLE_COPY(QCamera)
     Q_DECLARE_PRIVATE(QCamera)
     Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))
-    friend class QCameraInfo;
+    friend class QCameraDevice;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QCamera::Features)
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index f0ace5bab..58f041d29 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -53,7 +53,7 @@
 
 #include "private/qobject_p.h"
 #include "qcamera.h"
-#include "qcamerainfo.h"
+#include "qcameradevice.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -79,7 +79,7 @@ public:
     QCamera::Error error;
     QString errorString;
 
-    QCameraInfo cameraInfo;
+    QCameraDevice cameraInfo;
     QCameraFormat cameraFormat;
 
     void _q_error(int error, const QString &errorString);
diff --git a/src/multimedia/camera/qcamerainfo.cpp b/src/multimedia/camera/qcameradevice.cpp
index a8d2bbb42..06c6aaacd 100644
--- a/src/multimedia/camera/qcamerainfo.cpp
+++ b/src/multimedia/camera/qcameradevice.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 
 #include "qcamera_p.h"
 
@@ -90,14 +90,14 @@ bool QCameraFormat::operator==(const QCameraFormat &other) const
 }
 
 /*!
-    \class QCameraInfo
-    \brief The QCameraInfo class provides general information about camera devices.
+    \class QCameraDevice
+    \brief The QCameraDevice class provides general information about camera devices.
     \since 5.3
     \inmodule QtMultimedia
     \ingroup multimedia
     \ingroup multimedia_camera
 
-    QCameraInfo lets you query for camera devices that are currently available on the system.
+    QCameraDevice lets you query for camera devices that are currently available on the system.
 
     The static functions defaultCamera() and availableCameras() provide you a list of all
     available cameras.
@@ -106,12 +106,12 @@ bool QCameraFormat::operator==(const QCameraFormat &other) const
 
     \snippet multimedia-snippets/camera.cpp Camera listing
 
-    A QCameraInfo can be used to construct a QCamera. The following example instantiates a QCamera
+    A QCameraDevice can be used to construct a QCamera. The following example instantiates a QCamera
     whose camera device is named 'mycamera':
 
     \snippet multimedia-snippets/camera.cpp Camera selection
 
-    You can also use QCameraInfo to get general information about a camera device such as
+    You can also use QCameraDevice to get general information about a camera device such as
     description, physical position on the system, or camera sensor orientation.
 
     \snippet multimedia-snippets/camera.cpp Camera info
@@ -119,22 +119,25 @@ bool QCameraFormat::operator==(const QCameraFormat &other) const
     \sa QCamera
 */
 
-QCameraInfo::QCameraInfo() = default;
+/*!
+  Constructs a null camera device
+*/
+QCameraDevice::QCameraDevice() = default;
 
 /*!
     Constructs a copy of \a other.
 */
-QCameraInfo::QCameraInfo(const QCameraInfo &other) = default;
+QCameraDevice::QCameraDevice(const QCameraDevice &other) = default;
 
 /*!
-    Destroys the QCameraInfo.
+    Destroys the QCameraDevice.
 */
-QCameraInfo::~QCameraInfo() = default;
+QCameraDevice::~QCameraDevice() = default;
 
 /*!
-    Returns true if this QCameraInfo is equal to \a other.
+    Returns true if this QCameraDevice is equal to \a other.
 */
-bool QCameraInfo::operator==(const QCameraInfo &other) const
+bool QCameraDevice::operator==(const QCameraDevice &other) const
 {
     if (d == other.d)
         return true;
@@ -148,9 +151,9 @@ bool QCameraInfo::operator==(const QCameraInfo &other) const
 }
 
 /*!
-    Returns true if this QCameraInfo is null or invalid.
+    Returns true if this QCameraDevice is null or invalid.
 */
-bool QCameraInfo::isNull() const
+bool QCameraDevice::isNull() const
 {
     return !d;
 }
@@ -160,12 +163,12 @@ bool QCameraInfo::isNull() const
 
     This is a unique ID to identify the camera and may not be human-readable.
 */
-QByteArray QCameraInfo::id() const
+QByteArray QCameraDevice::id() const
 {
     return d ? d->id : QByteArray();
 }
 
-bool QCameraInfo::isDefault() const
+bool QCameraDevice::isDefault() const
 {
     return d ? d->isDefault : false;
 }
@@ -173,7 +176,7 @@ bool QCameraInfo::isDefault() const
 /*!
     Returns the human-readable description of the camera.
 */
-QString QCameraInfo::description() const
+QString QCameraDevice::description() const
 {
     return d ? d->description : QString();
 }
@@ -181,12 +184,12 @@ QString QCameraInfo::description() const
 /*!
     Returns the physical position of the camera on the hardware system.
 */
-QCameraInfo::Position QCameraInfo::position() const
+QCameraDevice::Position QCameraDevice::position() const
 {
-    return d ? d->position : QCameraInfo::UnspecifiedPosition;
+    return d ? d->position : QCameraDevice::UnspecifiedPosition;
 }
 
-QList<QSize> QCameraInfo::photoResolutions() const
+QList<QSize> QCameraDevice::photoResolutions() const
 {
     return d->photoResolutions;
 }
@@ -194,30 +197,30 @@ QList<QSize> QCameraInfo::photoResolutions() const
 /*!
     Returns the video formats supported by the camera.
 */
-QList<QCameraFormat> QCameraInfo::videoFormats() const
+QList<QCameraFormat> QCameraDevice::videoFormats() const
 {
     return d ? d->videoFormats : QList<QCameraFormat>{};
 }
 
-QCameraInfo::QCameraInfo(QCameraInfoPrivate *p)
+QCameraDevice::QCameraDevice(QCameraDevicePrivate *p)
     : d(p)
 {}
 
 /*!
-    Sets the QCameraInfo object to be equal to \a other.
+    Sets the QCameraDevice object to be equal to \a other.
 */
-QCameraInfo& QCameraInfo::operator=(const QCameraInfo& other) = default;
+QCameraDevice& QCameraDevice::operator=(const QCameraDevice& other) = default;
 
 /*!
-    \fn QCameraInfo::operator!=(const QCameraInfo &other) const
+    \fn QCameraDevice::operator!=(const QCameraDevice &other) const
 
-    Returns true if this QCameraInfo is different from \a other.
+    Returns true if this QCameraDevice is different from \a other.
 */
 
 #ifndef QT_NO_DEBUG_STREAM
-QDebug operator<<(QDebug d, const QCameraInfo &camera)
+QDebug operator<<(QDebug d, const QCameraDevice &camera)
 {
-    d.maybeSpace() << QStringLiteral("QCameraInfo(name=%1, position=%2, orientation=%3)")
+    d.maybeSpace() << QStringLiteral("QCameraDevice(name=%1, position=%2, orientation=%3)")
                           .arg(camera.description())
                           .arg(QString::fromLatin1(QCamera::staticMetaObject.enumerator(QCamera::staticMetaObject.indexOfEnumerator("Position"))
                                .valueToKey(camera.position())));
diff --git a/src/multimedia/camera/qcamerainfo.h b/src/multimedia/camera/qcameradevice.h
index c1044fadb..7918d058b 100644
--- a/src/multimedia/camera/qcamerainfo.h
+++ b/src/multimedia/camera/qcameradevice.h
@@ -71,8 +71,8 @@ private:
     QExplicitlySharedDataPointer<QCameraFormatPrivate> d;
 };
 
-class QCameraInfoPrivate;
-class Q_MULTIMEDIA_EXPORT QCameraInfo
+class QCameraDevicePrivate;
+class Q_MULTIMEDIA_EXPORT QCameraDevice
 {
     Q_GADGET
     Q_PROPERTY(QByteArray id READ id CONSTANT)
@@ -81,20 +81,20 @@ class Q_MULTIMEDIA_EXPORT QCameraInfo
     Q_PROPERTY(Position position READ position CONSTANT)
     Q_ENUMS(Position)
 public:
-    QCameraInfo();
-    QCameraInfo(const QCameraInfo& other);
-    QCameraInfo& operator=(const QCameraInfo& other);
-    ~QCameraInfo();
+    QCameraDevice();
+    QCameraDevice(const QCameraDevice& other);
+    QCameraDevice& operator=(const QCameraDevice& other);
+    ~QCameraDevice();
 
-    bool operator==(const QCameraInfo &other) const;
-    inline bool operator!=(const QCameraInfo &other) const;
+    bool operator==(const QCameraDevice &other) const;
+    inline bool operator!=(const QCameraDevice &other) const;
 
     bool isNull() const;
 
     QByteArray id() const;
     QString description() const;
 
-    // ### Add here and to QAudioDeviceInfo
+    // ### Add here and to QAudioDevice
 //    QByteArray groupId() const;
 //    QString groupDescription() const;
 
@@ -115,15 +115,15 @@ public:
     // ### Add zoom and other camera information
 
 private:
-    friend class QCameraInfoPrivate;
-    QCameraInfo(QCameraInfoPrivate *p);
-    QExplicitlySharedDataPointer<QCameraInfoPrivate> d;
+    friend class QCameraDevicePrivate;
+    QCameraDevice(QCameraDevicePrivate *p);
+    QExplicitlySharedDataPointer<QCameraDevicePrivate> d;
 };
 
-bool QCameraInfo::operator!=(const QCameraInfo &other) const { return !operator==(other); }
+bool QCameraDevice::operator!=(const QCameraDevice &other) const { return !operator==(other); }
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QCameraInfo&);
+Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QCameraDevice&);
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/camera/qcamerainfo_p.h b/src/multimedia/camera/qcameradevice_p.h
index db6f7edd1..ede736244 100644
--- a/src/multimedia/camera/qcamerainfo_p.h
+++ b/src/multimedia/camera/qcameradevice_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include <QtMultimedia/qcamerainfo.h>
+#include <QtMultimedia/qcameradevice.h>
 #include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_NAMESPACE
@@ -67,18 +67,18 @@ public:
     QCameraFormat create() { return QCameraFormat(this); }
 };
 
-class QCameraInfoPrivate : public QSharedData
+class QCameraDevicePrivate : public QSharedData
 {
 public:
     QByteArray id;
     QString description;
     bool isDefault = false;
-    QCameraInfo::Position position = QCameraInfo::UnspecifiedPosition;
+    QCameraDevice::Position position = QCameraDevice::UnspecifiedPosition;
     int orientation = 0;
     QList<QSize> photoResolutions;
     QList<QCameraFormat> videoFormats;
 
-    QCameraInfo create() { return QCameraInfo(this); }
+    QCameraDevice create() { return QCameraDevice(this); }
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
index 54be5b57f..6cc3d3151 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
@@ -44,7 +44,7 @@
 #include <qobject.h>
 #include <qfile.h>
 
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include "qaudiosource.h"
 #include "qaudiooutput.h"
 #include "qaudiodecoder.h"
@@ -81,7 +81,7 @@ void AudioInputExample::setup()
     format.setChannelCount(1);
     format.setSampleFormat(QAudioFormat::UInt8);
 
-    QAudioDeviceInfo info = QMediaDevices::defaultAudioInput();
+    QAudioDevice info = QMediaDevices::defaultAudioInput();
     if (!info.isFormatSupported(format)) {
         qWarning() << "Default format not supported, trying to use the nearest.";
     }
@@ -156,7 +156,7 @@ void AudioOutputExample::setup()
     format.setChannelCount(1);
     format.setSampleFormat(QAudioFormat::UInt8);
 
-    QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
+    QAudioDevice info(QAudioDevice::defaultOutputDevice());
     if (!info.isFormatSupported(format)) {
         qWarning() << "Raw audio format not supported by backend, cannot play audio.";
         return;
@@ -204,7 +204,7 @@ void AudioDeviceInfo()
 
     //! [Dumping audio formats]
     const auto deviceInfos = QMediaDevices::availableDevices(QAudio::AudioOutput);
-    for (const QAudioDeviceInfo &deviceInfo : deviceInfos)
+    for (const QAudioDevice &deviceInfo : deviceInfos)
         qDebug() << "Device: " << deviceInfo.description();
     //! [Dumping audio formats]
 }
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
index af8176f4b..af0724ed7 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp
@@ -40,13 +40,13 @@
 /* Camera snippets */
 
 #include "qcamera.h"
-#include "qcamerainfo.h"
+#include "qcameradevice.h"
 #include "qmediaencoder.h"
 #include "qmediadevices.h"
 #include "qmediacapturesession.h"
 #include "qcameraimagecapture.h"
 #include "qvideosink.h"
-#include "QtMultmediaWidgets/qvideowidget.h>
+#include <QtMultimediaWidgets/qvideowidget.h>
 #include <QtGui/qscreen.h>
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qimage.h>
@@ -83,7 +83,7 @@ void overview_viewfinder()
 void overview_camera_by_position()
 {
     //! [Camera overview position]
-    camera = new QCamera(QCameraInfo::FrontFace);
+    camera = new QCamera(QCameraDevice::FrontFace);
     //! [Camera overview position]
 }
 
@@ -110,14 +110,14 @@ void overview_viewfinder_orientation()
     //! [Camera overview viewfinder orientation]
     // Assuming a QImage has been created from the QVideoFrame that needs to be presented
     QImage videoFrame;
-    QCameraInfo cameraInfo(camera); // needed to get the camera sensor position and orientation
+    QCameraDevice cameraInfo(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() == QCameraInfo::BackFace) {
+    if (cameraInfo.position() == QCameraDevice::BackFace) {
         rotation = (cameraInfo.orientation() - screenAngle) % 360;
     } else {
         // Front position, compensate the mirror
@@ -174,8 +174,8 @@ void overview_movie()
 void camera_listing()
 {
     //! [Camera listing]
-    const QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
-    for (const QCameraInfo &cameraInfo : cameras)
+    const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
+    for (const QCameraDevice &cameraInfo : cameras)
         qDebug() << cameraInfo.description();
     //! [Camera listing]
 }
@@ -183,8 +183,8 @@ void camera_listing()
 void camera_selection()
 {
     //! [Camera selection]
-    const QList<QCameraInfo> cameras = QMediaDevices::videoInputs();
-    for (const QCameraInfo &cameraInfo : cameras) {
+    const QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
+    for (const QCameraDevice &cameraInfo : cameras) {
         if (cameraInfo.description() == "mycamera")
             camera = new QCamera(cameraInfo);
     }
@@ -195,11 +195,11 @@ void camera_info()
 {
     //! [Camera info]
     QCamera myCamera;
-    QCameraInfo cameraInfo = camera->cameraInfo();
+    QCameraDevice cameraInfo = camera->cameraInfo();
 
-    if (cameraInfo.position() == QCameraInfo::FrontFace)
+    if (cameraInfo.position() == QCameraDevice::FrontFace)
         qDebug() << "The camera is on the front face of the hardware system.";
-    else if (cameraInfo.position() == QCameraInfo::BackFace)
+    else if (cameraInfo.position() == QCameraDevice::BackFace)
         qDebug() << "The camera is on the back face of the hardware system.";
 
     qDebug() << "The camera sensor orientation is " << cameraInfo.orientation() << " degrees.";
diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc
index 6b3880b1c..1ade899b0 100644
--- a/src/multimedia/doc/src/cameraoverview.qdoc
+++ b/src/multimedia/doc/src/cameraoverview.qdoc
@@ -94,7 +94,7 @@ Many of these tasks have classes to assist them.
 
 Before using the camera APIs, you should check that a camera is available at runtime. If there
 is none, you could for example disable camera related features in your application. To perform this
-check in C++, use the \l QCameraInfo::availableCameras() function, as shown in the example below:
+check in C++, use the \l QCameraDevice::availableCameras() function, as shown in the example below:
 
     \snippet multimedia-snippets/camera.cpp Camera overview check
 
@@ -143,7 +143,7 @@ Camera {
 If neither cameraInfo 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 QCameraInfo::defaultCamera() in C++ or
+using \l QCameraDevice::defaultCamera() in C++ or
 \l{QtMultimedia::MediaDevices::defaultCamera}{MediaDevices.defaultCamera} in QML.
 
 \section2 Preview
diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc
index a6a8d85b0..c554d5898 100644
--- a/src/multimedia/doc/src/multimedia.qdoc
+++ b/src/multimedia/doc/src/multimedia.qdoc
@@ -103,7 +103,7 @@ For some quick recipes, look at the overviews above and consult this table:
         \li Discovering raw audio devices
         \li \l{Audio Devices Example}{audiodevices}
         \li
-        \li QAudioDeviceInfo
+        \li QAudioDevice
     \row
         \li Video Playback
         \li \l{Media Player Example}{player},
diff --git a/src/multimedia/platform/alsa/qalsaaudiodeviceinfo.cpp b/src/multimedia/platform/alsa/qalsaaudiodevice.cpp
index 642516268..1b0ed0941 100644
--- a/src/multimedia/platform/alsa/qalsaaudiodeviceinfo.cpp
+++ b/src/multimedia/platform/alsa/qalsaaudiodevice.cpp
@@ -48,14 +48,14 @@
 // INTERNAL USE ONLY: Do NOT use for any other purpose.
 //
 
-#include "qalsaaudiodeviceinfo_p.h"
+#include "qalsaaudiodevice_p.h"
 
 #include <alsa/version.h>
 
 QT_BEGIN_NAMESPACE
 
 QAlsaAudioDeviceInfo::QAlsaAudioDeviceInfo(const QByteArray &dev, const QString &desc, QAudio::Mode mode)
-    : QAudioDeviceInfoPrivate(dev, mode)
+    : QAudioDevicePrivate(dev, mode)
 {
     description = desc;
 
diff --git a/src/multimedia/platform/alsa/qalsaaudiodeviceinfo_p.h b/src/multimedia/platform/alsa/qalsaaudiodevice_p.h
index 92dbccce0..9c946dc34 100644
--- a/src/multimedia/platform/alsa/qalsaaudiodeviceinfo_p.h
+++ b/src/multimedia/platform/alsa/qalsaaudiodevice_p.h
@@ -60,13 +60,13 @@
 #include <QtCore/qdebug.h>
 
 #include <QtMultimedia/qaudio.h>
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 #include <private/qaudiosystem_p.h>
 
 QT_BEGIN_NAMESPACE
 
 
-class QAlsaAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QAlsaAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
     QAlsaAudioDeviceInfo(const QByteArray &dev, const QString &description, QAudio::Mode mode);
diff --git a/src/multimedia/platform/alsa/qalsaaudiosink.cpp b/src/multimedia/platform/alsa/qalsaaudiosink.cpp
index ed2bfb127..7157e9508 100644
--- a/src/multimedia/platform/alsa/qalsaaudiosink.cpp
+++ b/src/multimedia/platform/alsa/qalsaaudiosink.cpp
@@ -52,7 +52,7 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtMultimedia/private/qaudiohelpers_p.h>
 #include "qalsaaudiosink_p.h"
-#include "qalsaaudiodeviceinfo_p.h"
+#include "qalsaaudiodevice_p.h"
 #include <QLoggingCategory>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/alsa/qalsaaudiosink_p.h b/src/multimedia/platform/alsa/qalsaaudiosink_p.h
index c87e26652..9c6da2557 100644
--- a/src/multimedia/platform/alsa/qalsaaudiosink_p.h
+++ b/src/multimedia/platform/alsa/qalsaaudiosink_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/qiodevice.h>
 
 #include <QtMultimedia/qaudio.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/alsa/qalsaaudiosource.cpp b/src/multimedia/platform/alsa/qalsaaudiosource.cpp
index bd44cc5e6..19c85542e 100644
--- a/src/multimedia/platform/alsa/qalsaaudiosource.cpp
+++ b/src/multimedia/platform/alsa/qalsaaudiosource.cpp
@@ -52,7 +52,7 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QtMultimedia/private/qaudiohelpers_p.h>
 #include "qalsaaudiosource_p.h"
-#include "qalsaaudiodeviceinfo_p.h"
+#include "qalsaaudiodevice_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/alsa/qalsaaudiosource_p.h b/src/multimedia/platform/alsa/qalsaaudiosource_p.h
index 9c24ef940..95df8008b 100644
--- a/src/multimedia/platform/alsa/qalsaaudiosource_p.h
+++ b/src/multimedia/platform/alsa/qalsaaudiosource_p.h
@@ -63,7 +63,7 @@
 #include <QtCore/qiodevice.h>
 
 #include <QtMultimedia/qaudio.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/multimedia/platform/alsa/qalsamediadevices.cpp b/src/multimedia/platform/alsa/qalsamediadevices.cpp
index 3253f8fee..6871cad16 100644
--- a/src/multimedia/platform/alsa/qalsamediadevices.cpp
+++ b/src/multimedia/platform/alsa/qalsamediadevices.cpp
@@ -39,11 +39,11 @@
 
 #include "qalsamediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 
 #include "private/qalsaaudiosource_p.h"
 #include "private/qalsaaudiosink_p.h"
-#include "private/qalsaaudiodeviceinfo_p.h"
+#include "private/qalsaaudiodevice_p.h"
 
 #include <alsa/asoundlib.h>
 
@@ -54,9 +54,9 @@ QAlsaMediaDevices::QAlsaMediaDevices()
 {
 }
 
-static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode)
+static QList<QAudioDevice> availableDevices(QAudio::Mode mode)
 {
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
 
     QByteArray filter;
 
@@ -100,27 +100,27 @@ static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode)
     return devices;
 }
 
-QList<QAudioDeviceInfo> QAlsaMediaDevices::audioInputs() const
+QList<QAudioDevice> QAlsaMediaDevices::audioInputs() const
 {
     return availableDevices(QAudio::AudioInput);
 }
 
-QList<QAudioDeviceInfo> QAlsaMediaDevices::audioOutputs() const
+QList<QAudioDevice> QAlsaMediaDevices::audioOutputs() const
 {
     return availableDevices(QAudio::AudioOutput);
 }
 
-QList<QCameraInfo> QAlsaMediaDevices::videoInputs() const
+QList<QCameraDevice> QAlsaMediaDevices::videoInputs() const
 {
     return {};
 }
 
-QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDevice &deviceInfo)
 {
     return new QAlsaAudioSource(deviceInfo.id());
 }
 
-QPlatformAudioSink *QAlsaMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink *QAlsaMediaDevices::createAudioSink(const QAudioDevice &deviceInfo)
 {
     return new QAlsaAudioSink(deviceInfo.id());
 }
diff --git a/src/multimedia/platform/alsa/qalsamediadevices_p.h b/src/multimedia/platform/alsa/qalsamediadevices_p.h
index 403bfbde0..54df9c851 100644
--- a/src/multimedia/platform/alsa/qalsamediadevices_p.h
+++ b/src/multimedia/platform/alsa/qalsamediadevices_p.h
@@ -64,11 +64,11 @@ class QAlsaMediaDevices : public QPlatformMediaDevices
 public:
     QAlsaMediaDevices();
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/android/audio/qopenslesdeviceinfo.cpp b/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp
index 7d5240c0b..07cf9c12e 100644
--- a/src/multimedia/platform/android/audio/qopenslesdeviceinfo.cpp
+++ b/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include "qopenslesdeviceinfo_p.h"
+#include "qandroidaudiodevice_p.h"
 
 #include "qopenslesengine_p.h"
 
 QT_BEGIN_NAMESPACE
 
 QOpenSLESDeviceInfo::QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudio::Mode mode)
-    : QAudioDeviceInfoPrivate(device, mode),
+    : QAudioDevicePrivate(device, mode),
       m_engine(QOpenSLESEngine::instance())
 {
     description = desc;
diff --git a/src/multimedia/platform/android/audio/qopenslesdeviceinfo_p.h b/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h
index 2213544ab..626037f73 100644
--- a/src/multimedia/platform/android/audio/qopenslesdeviceinfo_p.h
+++ b/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h
@@ -52,13 +52,13 @@
 //
 
 #include <qaudiosystem_p.h>
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QOpenSLESEngine;
 
-class QOpenSLESDeviceInfo : public QAudioDeviceInfoPrivate
+class QOpenSLESDeviceInfo : public QAudioDevicePrivate
 {
 public:
     QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudio::Mode mode);
diff --git a/src/multimedia/platform/android/audio/qopenslesengine.cpp b/src/multimedia/platform/android/audio/qopenslesengine.cpp
index b252b3d7f..3bddea920 100644
--- a/src/multimedia/platform/android/audio/qopenslesengine.cpp
+++ b/src/multimedia/platform/android/audio/qopenslesengine.cpp
@@ -40,7 +40,7 @@
 #include "qopenslesengine_p.h"
 
 #include "qandroidaudiosource_p.h"
-#include "qopenslesdeviceinfo_p.h"
+#include "qandroidaudiodevice_p.h"
 
 #include <qdebug.h>
 
@@ -103,9 +103,9 @@ SLDataFormat_PCM QOpenSLESEngine::audioFormatToSLFormatPCM(const QAudioFormat &f
 
 }
 
-QList<QAudioDeviceInfo> QOpenSLESEngine::availableDevices(QAudio::Mode mode)
+QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudio::Mode mode)
 {
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
     QJniObject devs;
     if (mode == QAudio::AudioInput) {
         devs = QJniObject::callStaticObjectMethod(
diff --git a/src/multimedia/platform/android/audio/qopenslesengine_p.h b/src/multimedia/platform/android/audio/qopenslesengine_p.h
index 625045aa8..4427235d7 100644
--- a/src/multimedia/platform/android/audio/qopenslesengine_p.h
+++ b/src/multimedia/platform/android/audio/qopenslesengine_p.h
@@ -55,7 +55,7 @@
 #include <qaudio.h>
 #include <qlist.h>
 #include <qaudioformat.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <SLES/OpenSLES.h>
 
 QT_BEGIN_NAMESPACE
@@ -74,7 +74,7 @@ public:
 
     static SLDataFormat_PCM audioFormatToSLFormatPCM(const QAudioFormat &format);
 
-    static QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode);
+    static QList<QAudioDevice> availableDevices(QAudio::Mode mode);
     QList<int> supportedChannelCounts(QAudio::Mode mode) const;
     QList<int> supportedSampleRates(QAudio::Mode mode) const;
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
index e355fcd0b..3e3f58b51 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
@@ -42,7 +42,7 @@
 #include "qandroidcameravideorenderercontrol_p.h"
 #include "qandroidcaptureservice_p.h"
 #include <qmediadevices.h>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 #include <qtimer.h>
 #include "qandroidmultimediautils_p.h"
 
@@ -78,7 +78,7 @@ QCamera::Status QAndroidCameraControl::status() const
     return m_cameraSession->status();
 }
 
-void QAndroidCameraControl::setCamera(const QCameraInfo &camera)
+void QAndroidCameraControl::setCamera(const QCameraDevice &camera)
 {
     int id = 0;
     auto cameras = QMediaDevices::videoInputs();
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
index a6c1a3c75..56901a637 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol_p.h
@@ -72,7 +72,7 @@ public:
 
     QCamera::Status status() const override;
 
-    void setCamera(const QCameraInfo &camera) override;
+    void setCamera(const QCameraDevice &camera) override;
 
     void setCaptureSession(QPlatformMediaCaptureSession *session) override;
 
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
index 803988f65..1f1229944 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession.cpp
@@ -52,11 +52,11 @@
 #include <qdebug.h>
 #include <qvideoframe.h>
 #include <private/qmemoryvideobuffer_p.h>
-#include <private/qcamerainfo_p.h>
+#include <private/qcameradevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
-Q_GLOBAL_STATIC(QList<QCameraInfo>, g_availableCameras)
+Q_GLOBAL_STATIC(QList<QCameraDevice>, g_availableCameras)
 
 QAndroidCameraSession::QAndroidCameraSession(QObject *parent)
     : QObject(parent)
@@ -141,7 +141,7 @@ void QAndroidCameraSession::updateAvailableCameras()
 
     const int numCameras = AndroidCamera::getNumberOfCameras();
     for (int i = 0; i < numCameras; ++i) {
-        QCameraInfoPrivate *info = new QCameraInfoPrivate;
+        QCameraDevicePrivate *info = new QCameraDevicePrivate;
         AndroidCamera::getCameraInfo(i, info);
 
         if (!info->id.isEmpty())
@@ -149,7 +149,7 @@ void QAndroidCameraSession::updateAvailableCameras()
     }
 }
 
-const QList<QCameraInfo> &QAndroidCameraSession::availableCameras()
+const QList<QCameraDevice> &QAndroidCameraSession::availableCameras()
 {
     if (g_availableCameras->isEmpty())
         updateAvailableCameras();
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
index 9f642ac3d..7caf782e9 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcamerasession_p.h
@@ -73,7 +73,7 @@ public:
     explicit QAndroidCameraSession(QObject *parent = 0);
     ~QAndroidCameraSession();
 
-    static const QList<QCameraInfo> &availableCameras();
+    static const QList<QCameraDevice> &availableCameras();
 
     void setSelectedCamera(int cameraId) { m_selectedCamera = cameraId; }
     AndroidCamera *camera() const { return m_camera; }
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
index 6a84f324a..cd1e8dde5 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice.cpp
@@ -47,7 +47,7 @@
 #include "qandroidcameravideorenderercontrol_p.h"
 #include "qandroidcameraimagecapturecontrol_p.h"
 #include "qmediadevices.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -162,7 +162,7 @@ void QAndroidCaptureService::setVolume(qreal volume)
     qWarning("QMediaRecorder::setVolume() is not supported on Android.");
 }
 
-QAudioDeviceInfo QAndroidCaptureService::audioInput() const
+QAudioDevice QAndroidCaptureService::audioInput() const
 {
     const auto devices = QMediaDevices::audioInputs();
     QByteArray id = m_captureSession->audioInput().toLatin1();
@@ -174,7 +174,7 @@ QAudioDeviceInfo QAndroidCaptureService::audioInput() const
     return QMediaDevices::defaultAudioInput();
 }
 
-bool QAndroidCaptureService::setAudioInput(const QAudioDeviceInfo &info)
+bool QAndroidCaptureService::setAudioInput(const QAudioDevice &info)
 {
     m_captureSession->setAudioInput(QString::fromLatin1(info.id()));
     return true;
diff --git a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
index b49eb4eef..4d69908d3 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
+++ b/src/multimedia/platform/android/mediacapture/qandroidcaptureservice_p.h
@@ -84,8 +84,8 @@ public:
     void setMuted(bool muted) override;
     qreal volume() const override;
     void setVolume(qreal volume) override;
-    QAudioDeviceInfo audioInput() const override;
-    bool setAudioInput(const QAudioDeviceInfo &id) override;
+    QAudioDevice audioInput() const override;
+    bool setAudioInput(const QAudioDevice &id) override;
 
     void setVideoPreview(QVideoSink *sink) override;
 
diff --git a/src/multimedia/platform/android/qandroidmediadevices.cpp b/src/multimedia/platform/android/qandroidmediadevices.cpp
index 010bb54f1..a0cfee354 100644
--- a/src/multimedia/platform/android/qandroidmediadevices.cpp
+++ b/src/multimedia/platform/android/qandroidmediadevices.cpp
@@ -39,11 +39,11 @@
 
 #include "qandroidmediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 
 #include "private/qandroidaudiosource_p.h"
 #include "private/qandroidaudiosink_p.h"
-#include "private/qopenslesdeviceinfo_p.h"
+#include "private/qandroidaudiodevice_p.h"
 #include "private/qopenslesengine_p.h"
 #include "private/qplatformmediaintegration_p.h"
 #include "private/qandroidcamerasession_p.h"
@@ -55,27 +55,27 @@ QAndroidMediaDevices::QAndroidMediaDevices()
 {
 }
 
-QList<QAudioDeviceInfo> QAndroidMediaDevices::audioInputs() const
+QList<QAudioDevice> QAndroidMediaDevices::audioInputs() const
 {
     return QOpenSLESEngine::availableDevices(QAudio::AudioInput);
 }
 
-QList<QAudioDeviceInfo> QAndroidMediaDevices::audioOutputs() const
+QList<QAudioDevice> QAndroidMediaDevices::audioOutputs() const
 {
     return QOpenSLESEngine::availableDevices(QAudio::AudioOutput);
 }
 
-QList<QCameraInfo> QAndroidMediaDevices::videoInputs() const
+QList<QCameraDevice> QAndroidMediaDevices::videoInputs() const
 {
     return QAndroidCameraSession::availableCameras();
 }
 
-QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QAndroidMediaDevices::createAudioSource(const QAudioDevice &deviceInfo)
 {
     return new QAndroidAudioSource(deviceInfo.id());
 }
 
-QPlatformAudioSink *QAndroidMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink *QAndroidMediaDevices::createAudioSink(const QAudioDevice &deviceInfo)
 {
     return new QAndroidAudioSink(deviceInfo.id());
 }
diff --git a/src/multimedia/platform/android/qandroidmediadevices_p.h b/src/multimedia/platform/android/qandroidmediadevices_p.h
index 316af3767..d262308dd 100644
--- a/src/multimedia/platform/android/qandroidmediadevices_p.h
+++ b/src/multimedia/platform/android/qandroidmediadevices_p.h
@@ -63,11 +63,11 @@ class QAndroidMediaDevices : public QPlatformMediaDevices
 public:
     QAndroidMediaDevices();
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 
     void forwardAudioOutputsChanged();
     void forwardAudioInputsChanged();
diff --git a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
index 7800f732b..b26371af6 100644
--- a/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
+++ b/src/multimedia/platform/android/wrappers/jni/androidcamera.cpp
@@ -760,7 +760,7 @@ int AndroidCamera::getNumberOfCameras()
                                                      "getNumberOfCameras");
 }
 
-void AndroidCamera::getCameraInfo(int id, QCameraInfoPrivate *info)
+void AndroidCamera::getCameraInfo(int id, QCameraDevicePrivate *info)
 {
     Q_ASSERT(info);
 
@@ -778,13 +778,13 @@ void AndroidCamera::getCameraInfo(int id, QCameraInfoPrivate *info)
     case AndroidCamera::CameraFacingBack:
         info->id = QByteArray("back");
         info->description = QStringLiteral("Rear-facing camera");
-        info->position = QCameraInfo::BackFace;
+        info->position = QCameraDevice::BackFace;
         info->isDefault = true;
         break;
     case AndroidCamera::CameraFacingFront:
         info->id = QByteArray("front");
         info->description = QStringLiteral("Front-facing camera");
-        info->position = QCameraInfo::FrontFace;
+        info->position = QCameraDevice::FrontFace;
         break;
     default:
         break;
diff --git a/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h b/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h
index 889aab2fd..b390f3aba 100644
--- a/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h
+++ b/src/multimedia/platform/android/wrappers/jni/androidcamera_p.h
@@ -57,7 +57,7 @@
 #include <qrect.h>
 #include <QtMultimedia/qcamera.h>
 #include <QtCore/qjniobject.h>
-#include <private/qcamerainfo_p.h>
+#include <private/qcameradevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -203,7 +203,7 @@ public:
     QJniObject getCameraObject();
 
     static int getNumberOfCameras();
-    static void getCameraInfo(int id, QCameraInfoPrivate *info);
+    static void getCameraInfo(int id, QCameraDevicePrivate *info);
     static bool requestCameraPermission();
 
     static bool registerNativeMethods();
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
index cbfa72c0c..d24a7c59e 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qcoreaudiodeviceinfo_p.h"
+#include "qdarwinaudiodevice_p.h"
 #include "qcoreaudioutils_p.h"
 #include <private/qcore_mac_p.h>
 
@@ -54,11 +54,11 @@ QT_BEGIN_NAMESPACE
 
 #if defined(Q_OS_MACOS)
     QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(AudioDeviceID id, const QByteArray &device, QAudio::Mode mode)
-        : QAudioDeviceInfoPrivate(device, mode),
+        : QAudioDevicePrivate(device, mode),
         m_deviceId(id)
 #else
     QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode)
-        : QAudioDeviceInfoPrivate(device, mode)
+        : QAudioDevicePrivate(device, mode)
 #endif
     {
         preferredFormat = determinePreferredFormat();
@@ -103,10 +103,10 @@ QAudioFormat QCoreAudioDeviceInfo::determinePreferredFormat() const
                             format = CoreAudioUtils::toQAudioFormat(sf);
                             break;
                         } else {
-                            qWarning() << "QAudioDeviceInfo: Unable to find perferedFormat for stream";
+                            qWarning() << "QAudioDevice: Unable to find perferedFormat for stream";
                         }
                     } else {
-                        qWarning() << "QAudioDeviceInfo: Unable to find size of perferedFormat for stream";
+                        qWarning() << "QAudioDevice: Unable to find size of perferedFormat for stream";
                     }
                 }
             }
@@ -138,7 +138,7 @@ QString QCoreAudioDeviceInfo::getDescription() const
                                                                   kAudioObjectPropertyElementMaster };
 
     if (AudioObjectGetPropertyData(m_deviceId, &audioDeviceNamePropertyAddress, 0, NULL, &size, &name) != noErr) {
-        qWarning() << "QAudioDeviceInfo: Unable to find device description";
+        qWarning() << "QAudioDevice: Unable to find device description";
         return QString();
     }
 
diff --git a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
index 6bf5c2242..30aead354 100644
--- a/src/multimedia/platform/darwin/audio/qcoreaudiodeviceinfo_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
@@ -51,7 +51,7 @@
 //
 
 #include <qaudiosystem_p.h>
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 
 #if defined(Q_OS_MACOS)
 # include <CoreAudio/CoreAudio.h>
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QCoreAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QCoreAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
 #if defined(Q_OS_MACOS)
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
index 39cb39e99..f84bdeaa0 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 #include "qdarwinaudiosink_p.h"
 #include "qcoreaudiosessionmanager_p.h"
-#include "qcoreaudiodeviceinfo_p.h"
+#include "qdarwinaudiodevice_p.h"
 #include "qcoreaudioutils_p.h"
 #include <private/qdarwinmediadevices_p.h>
 #include <qmediadevices.h>
@@ -221,7 +221,7 @@ qint64 QDarwinAudioSinkDevice::writeData(const char *data, qint64 len)
     return m_audioBuffer->writeBytes(data, len);
 }
 
-QDarwinAudioSink::QDarwinAudioSink(const QAudioDeviceInfo &device)
+QDarwinAudioSink::QDarwinAudioSink(const QAudioDevice &device)
     : m_audioDeviceInfo(device)
     , m_isOpen(false)
     , m_internalBufferSize(DEFAULT_BUFFER_SIZE)
@@ -235,7 +235,7 @@ QDarwinAudioSink::QDarwinAudioSink(const QAudioDeviceInfo &device)
     , m_errorCode(QAudio::NoError)
     , m_stateCode(QAudio::StoppedState)
 {
-    QAudioDeviceInfo di = device;
+    QAudioDevice di = device;
     if (di.isNull())
         di = QMediaDevices::defaultAudioOutput();
 #if defined(Q_OS_MACOS)
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
index e30e04116..6bc0ff272 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
@@ -61,7 +61,7 @@
 #include <QtCore/QIODevice>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
-#include <private/qcoreaudiodeviceinfo_p.h>
+#include <private/qdarwinaudiodevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -125,7 +125,7 @@ class QDarwinAudioSink : public QPlatformAudioSink
     Q_OBJECT
 
 public:
-    QDarwinAudioSink(const QAudioDeviceInfo &device);
+    QDarwinAudioSink(const QAudioDevice &device);
     ~QDarwinAudioSink();
 
     void start(QIODevice *device);
@@ -176,7 +176,7 @@ private:
     void startTimers();
     void stopTimers();
 
-    QAudioDeviceInfo m_audioDeviceInfo;
+    QAudioDevice m_audioDeviceInfo;
     QByteArray m_device;
 
     bool m_isOpen;
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
index 95d22d01a..17754518b 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource.mm
@@ -38,7 +38,7 @@
 ****************************************************************************/
 #include "qdarwinaudiosource_p.h"
 #include "qcoreaudiosessionmanager_p.h"
-#include "qcoreaudiodeviceinfo_p.h"
+#include "qdarwinaudiodevice_p.h"
 #include "qcoreaudioutils_p.h"
 #include "private/qdarwinmediadevices_p.h"
 #include <qmediadevices.h>
@@ -448,7 +448,7 @@ qint64 QDarwinAudioSourceDevice::writeData(const char *data, qint64 len)
     return 0;
 }
 
-QDarwinAudioSource::QDarwinAudioSource(const QAudioDeviceInfo &device)
+QDarwinAudioSource::QDarwinAudioSource(const QAudioDevice &device)
     : m_audioDeviceInfo(device)
     , m_isOpen(false)
     , m_internalBufferSize(DEFAULT_BUFFER_SIZE)
@@ -460,7 +460,7 @@ QDarwinAudioSource::QDarwinAudioSource(const QAudioDeviceInfo &device)
     , m_audioBuffer(nullptr)
     , m_volume(1.0)
 {
-    QAudioDeviceInfo di = device;
+    QAudioDevice di = device;
     if (di.isNull())
         di = QMediaDevices::defaultAudioInput();
 #if defined(Q_OS_MACOS)
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
index 02c8f5ea5..6a14b6a55 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosource_p.h
@@ -51,7 +51,7 @@
 //
 
 #include <qaudiosystem_p.h>
-#include <private/qcoreaudiodeviceinfo_p.h>
+#include <private/qdarwinaudiodevice_p.h>
 
 #include <AudioUnit/AudioUnit.h>
 #include <CoreAudio/CoreAudioTypes.h>
@@ -201,7 +201,7 @@ class QDarwinAudioSource : public QPlatformAudioSource
     Q_OBJECT
 
 public:
-    QDarwinAudioSource(const QAudioDeviceInfo &device);
+    QDarwinAudioSource(const QAudioDevice &device);
     ~QDarwinAudioSource();
 
     void start(QIODevice *device);
@@ -253,7 +253,7 @@ private:
                                     UInt32 inNumberFrames,
                                     AudioBufferList *ioData);
 
-    QAudioDeviceInfo m_audioDeviceInfo;
+    QAudioDevice m_audioDeviceInfo;
     QByteArray m_device;
     bool m_isOpen;
     int m_periodSizeBytes;
diff --git a/src/multimedia/platform/darwin/camera/avfcamera.mm b/src/multimedia/platform/darwin/camera/avfcamera.mm
index 4d7cc5d45..89c8aa0de 100644
--- a/src/multimedia/platform/darwin/camera/avfcamera.mm
+++ b/src/multimedia/platform/darwin/camera/avfcamera.mm
@@ -202,7 +202,7 @@ QCamera::Status AVFCamera::status() const
     return statusTable[m_active ? 1 : 0][m_session->isActive() ? 1 : 0];
 }
 
-void AVFCamera::setCamera(const QCameraInfo &camera)
+void AVFCamera::setCamera(const QCameraDevice &camera)
 {
     if (m_cameraInfo == camera)
         return;
@@ -227,7 +227,7 @@ void AVFCamera::setCaptureSession(QPlatformMediaCaptureSession *session)
     Q_ASSERT(m_session);
     connect(m_session, SIGNAL(activeChanged(bool)), SLOT(updateStatus()));
 
-    m_session->setActiveCamera(QCameraInfo());
+    m_session->setActiveCamera(QCameraDevice());
     m_session->setActive(m_active);
     m_session->setActiveCamera(m_cameraInfo);
 }
diff --git a/src/multimedia/platform/darwin/camera/avfcamera_p.h b/src/multimedia/platform/darwin/camera/avfcamera_p.h
index 029c35b86..42999b917 100644
--- a/src/multimedia/platform/darwin/camera/avfcamera_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcamera_p.h
@@ -77,7 +77,7 @@ public:
 
     QCamera::Status status() const override;
 
-    void setCamera(const QCameraInfo &camera) override;
+    void setCamera(const QCameraDevice &camera) override;
 
     void setCaptureSession(QPlatformMediaCaptureSession *) override;
 
@@ -127,7 +127,7 @@ private:
     AVFCameraService *m_service = nullptr;
     AVFCameraSession *m_session = nullptr;
 
-    QCameraInfo m_cameraInfo;
+    QCameraDevice m_cameraInfo;
 
     bool m_active;
     QCamera::Status m_lastStatus;
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice.mm b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
index c75d7665e..899dd4602 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice.mm
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice.mm
@@ -148,17 +148,17 @@ void AVFCameraService::setVolume(qreal volume)
     }
 }
 
-QAudioDeviceInfo AVFCameraService::audioInput() const
+QAudioDevice AVFCameraService::audioInput() const
 {
     QByteArray id = [[m_audioCaptureDevice uniqueID] UTF8String];
-    const QList<QAudioDeviceInfo> devices = QMediaDevices::audioInputs();
+    const QList<QAudioDevice> devices = QMediaDevices::audioInputs();
     for (auto d : devices)
         if (d.id() == id)
             return d;
     return QMediaDevices::defaultAudioInput();
 }
 
-bool AVFCameraService::setAudioInput(const QAudioDeviceInfo &id)
+bool AVFCameraService::setAudioInput(const QAudioDevice &id)
 {
     AVCaptureDevice *device = nullptr;
 
diff --git a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
index 29a145494..5698cda7a 100644
--- a/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcameraservice_p.h
@@ -85,8 +85,8 @@ public:
     void setMuted(bool muted) override;
     qreal volume() const override;
     void setVolume(qreal volume) override;
-    QAudioDeviceInfo audioInput() const override;
-    bool setAudioInput(const QAudioDeviceInfo &) override;
+    QAudioDevice audioInput() const override;
+    bool setAudioInput(const QAudioDevice &) override;
 
     void setVideoPreview(QVideoSink *sink) override;
 
diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession.mm b/src/multimedia/platform/darwin/camera/avfcamerasession.mm
index 8256bd727..745db0ae9 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerasession.mm
+++ b/src/multimedia/platform/darwin/camera/avfcamerasession.mm
@@ -175,7 +175,7 @@ AVFCameraSession::~AVFCameraSession()
     [m_captureSession release];
 }
 
-void AVFCameraSession::setActiveCamera(const QCameraInfo &info)
+void AVFCameraSession::setActiveCamera(const QCameraDevice &info)
 {
     if (m_activeCameraInfo != info) {
         m_activeCameraInfo = info;
@@ -330,7 +330,7 @@ void AVFCameraSession::attachVideoInputDevice()
 
     AVCaptureDevice *videoDevice = createVideoCaptureDevice();
     if (!videoDevice) {
-        m_activeCameraInfo = QCameraInfo();
+        m_activeCameraInfo = QCameraDevice();
         return;
     }
 
@@ -347,7 +347,7 @@ void AVFCameraSession::attachVideoInputDevice()
             [m_captureSession addInput:m_videoInput];
         } else {
             qWarning() << "Failed to connect video device input";
-            m_activeCameraInfo = QCameraInfo();
+            m_activeCameraInfo = QCameraDevice();
         }
     }
 }
diff --git a/src/multimedia/platform/darwin/camera/avfcamerasession_p.h b/src/multimedia/platform/darwin/camera/avfcamerasession_p.h
index f440c3d3f..530bdc96a 100644
--- a/src/multimedia/platform/darwin/camera/avfcamerasession_p.h
+++ b/src/multimedia/platform/darwin/camera/avfcamerasession_p.h
@@ -54,7 +54,7 @@
 #include <QtCore/qmutex.h>
 #include <QtMultimedia/qcamera.h>
 #include <QVideoFrame>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 
 #import <AVFoundation/AVFoundation.h>
 
@@ -75,8 +75,8 @@ public:
     AVFCameraSession(AVFCameraService *service, QObject *parent = nullptr);
     ~AVFCameraSession();
 
-    QCameraInfo activeCameraInfo() const { return m_activeCameraInfo; }
-    void setActiveCamera(const QCameraInfo &info);
+    QCameraDevice activeCameraInfo() const { return m_activeCameraInfo; }
+    void setActiveCamera(const QCameraDevice &info);
 
     AVFCameraRenderer *videoOutput() const { return m_videoOutput; }
     AVCaptureAudioDataOutput *audioOutput() const { return m_audioOutput; }
@@ -115,7 +115,7 @@ private:
     bool applyImageEncoderSettings();
     bool applyEncoderSettings();
 
-    QCameraInfo m_activeCameraInfo;
+    QCameraDevice m_activeCameraInfo;
 
     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 b2a76eb0a..7d1725913 100644
--- a/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
+++ b/src/multimedia/platform/darwin/camera/avfmediaencoder.mm
@@ -46,7 +46,7 @@
 #include "avfcameradebug_p.h"
 #include "avfcamerautility_p.h"
 
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include "qmediadevices.h"
 #include "private/qdarwinformatsinfo_p.h"
 
@@ -483,11 +483,11 @@ 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).
-        // QCameraInfo cameraInfo = m_service->session()->activeCameraInfo();
+        // QCameraDevice cameraInfo = m_service->session()->activeCameraInfo();
         // int screenOrientation = 360 - m_orientationHandler.currentOrientation();
 
             // ###
-    //        if (cameraInfo.position() == QCameraInfo::FrontFace)
+    //        if (cameraInfo.position() == QCameraDevice::FrontFace)
     //            rotation = (screenOrientation + cameraInfo.orientation()) % 360;
     //        else
     //            rotation = (screenOrientation + (360 - cameraInfo.orientation())) % 360;
diff --git a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h
index 8e6893a65..149adafa7 100644
--- a/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h
+++ b/src/multimedia/platform/darwin/camera/avfmediaencoder_p.h
@@ -54,7 +54,7 @@
 #include "avfmediaassetwriter_p.h"
 #include "avfstoragelocation_p.h"
 #include "avfcamerautility_p.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 
 #include <private/qplatformmediaencoder_p.h>
 #include <private/qvideooutputorientationhandler_p.h>
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
index 57d1d7890..cfd310cd3 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer.mm
@@ -727,7 +727,7 @@ qreal AVFMediaPlayer::playbackRate() const
     return m_rate;
 }
 
-bool AVFMediaPlayer::setAudioOutput(const QAudioDeviceInfo &info)
+bool AVFMediaPlayer::setAudioOutput(const QAudioDevice &info)
 {
     m_audioOutput = info;
 
@@ -743,7 +743,7 @@ bool AVFMediaPlayer::setAudioOutput(const QAudioDeviceInfo &info)
     return true;
 }
 
-QAudioDeviceInfo AVFMediaPlayer::audioOutput() const
+QAudioDevice AVFMediaPlayer::audioOutput() const
 {
     return m_audioOutput;
 }
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
index 6c6f5e40a..367b3d81e 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayer_p.h
@@ -105,9 +105,9 @@ public:
 
     qreal playbackRate() const override;
 
-    bool setAudioOutput(const QAudioDeviceInfo &) override;
-    QAudioDeviceInfo audioOutput() const override;
-    QAudioDeviceInfo m_audioOutput;
+    bool setAudioOutput(const QAudioDevice &) override;
+    QAudioDevice audioOutput() const override;
+    QAudioDevice m_audioOutput;
 
     QMediaMetaData metaData() const override;
 
diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices.mm b/src/multimedia/platform/darwin/qdarwinmediadevices.mm
index 576ae486a..271b3a9d1 100644
--- a/src/multimedia/platform/darwin/qdarwinmediadevices.mm
+++ b/src/multimedia/platform/darwin/qdarwinmediadevices.mm
@@ -39,9 +39,9 @@
 
 #include "qdarwinmediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
-#include "qaudiodeviceinfo_p.h"
-#include "private/qcoreaudiodeviceinfo_p.h"
+#include "qcameradevice_p.h"
+#include "qaudiodevice_p.h"
+#include "private/qdarwinaudiodevice_p.h"
 #include "private/qdarwinaudiosource_p.h"
 #include "private/qdarwinaudiosink_p.h"
 #include "private/avfcamera_p.h"
@@ -71,7 +71,7 @@ AudioDeviceID defaultAudioDevice(QAudio::Mode mode)
     if (AudioObjectGetPropertyData(kAudioObjectSystemObject,
                                    &defaultDevicePropertyAddress,
                                    0, NULL, &size, &audioDevice) != noErr) {
-        qWarning("QAudioDeviceInfo: Unable to find default %s device",  (mode == QAudio::AudioOutput) ? "output" : "input");
+        qWarning("QAudioDevice: Unable to find default %s device",  (mode == QAudio::AudioOutput) ? "output" : "input");
         return 0;
     }
 
@@ -90,7 +90,7 @@ static QByteArray uniqueId(AudioDeviceID device, QAudio::Mode mode)
                                                                   kAudioObjectPropertyElementMaster };
 
     if (AudioObjectGetPropertyData(device, &audioDeviceNamePropertyAddress, 0, NULL, &size, &name) != noErr) {
-        qWarning() << "QAudioDeviceInfo: Unable to get device UID";
+        qWarning() << "QAudioDevice: Unable to get device UID";
         return QByteArray();
     }
 
@@ -99,10 +99,10 @@ static QByteArray uniqueId(AudioDeviceID device, QAudio::Mode mode)
     return s.toUtf8();
 }
 
-QList<QAudioDeviceInfo> availableAudioDevices(QAudio::Mode mode)
+QList<QAudioDevice> availableAudioDevices(QAudio::Mode mode)
 {
 
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
 
     AudioDeviceID defaultDevice = defaultAudioDevice(mode);
     if (defaultDevice != 0)
@@ -201,10 +201,10 @@ QDarwinMediaDevices::~QDarwinMediaDevices()
 #endif
 }
 
-QList<QAudioDeviceInfo> QDarwinMediaDevices::audioInputs() const
+QList<QAudioDevice> QDarwinMediaDevices::audioInputs() const
 {
 #ifdef Q_OS_IOS
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
     devices.append((new QCoreAudioDeviceInfo("default", QAudio::AudioInput))->create());
     return devices;
 #else
@@ -212,10 +212,10 @@ QList<QAudioDeviceInfo> QDarwinMediaDevices::audioInputs() const
 #endif
 }
 
-QList<QAudioDeviceInfo> QDarwinMediaDevices::audioOutputs() const
+QList<QAudioDevice> QDarwinMediaDevices::audioOutputs() const
 {
 #ifdef Q_OS_IOS
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
     devices.append((new QCoreAudioDeviceInfo("default", QAudio::AudioOutput))->create());
     return devices;
 #else
@@ -223,7 +223,7 @@ QList<QAudioDeviceInfo> QDarwinMediaDevices::audioOutputs() const
 #endif
 }
 
-QList<QCameraInfo> QDarwinMediaDevices::videoInputs() const
+QList<QCameraDevice> QDarwinMediaDevices::videoInputs() const
 {
     return m_cameraDevices;
 }
@@ -236,14 +236,14 @@ void QDarwinMediaDevices::updateCameraDevices()
         return;
 #endif
 
-    QList<QCameraInfo> cameras;
+    QList<QCameraDevice> cameras;
 
     AVCaptureDevice *defaultDevice = [AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
     NSArray *videoDevices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
 
     for (AVCaptureDevice *device in videoDevices) {
 
-        QCameraInfoPrivate *info = new QCameraInfoPrivate;
+        QCameraDevicePrivate *info = new QCameraDevicePrivate;
         if (defaultDevice && [defaultDevice.uniqueID isEqualToString:device.uniqueID])
             info->isDefault = true;
         info->id = QByteArray([[device uniqueID] UTF8String]);
@@ -315,13 +315,13 @@ void QDarwinMediaDevices::updateCameraDevices()
 void QDarwinMediaDevices::updateAudioDevices()
 {
 #ifdef Q_OS_MACOS
-    QList<QAudioDeviceInfo> inputs = availableAudioDevices(QAudio::AudioInput);
+    QList<QAudioDevice> inputs = availableAudioDevices(QAudio::AudioInput);
     if (m_audioInputs != inputs) {
         m_audioInputs = inputs;
         audioInputsChanged();
     }
 
-    QList<QAudioDeviceInfo> outputs = availableAudioDevices(QAudio::AudioOutput);
+    QList<QAudioDevice> outputs = availableAudioDevices(QAudio::AudioOutput);
     if (m_audioOutputs!= outputs) {
         m_audioOutputs = outputs;
         audioOutputsChanged();
@@ -329,12 +329,12 @@ void QDarwinMediaDevices::updateAudioDevices()
 #endif
 }
 
-QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDeviceInfo &info)
+QPlatformAudioSource *QDarwinMediaDevices::createAudioSource(const QAudioDevice &info)
 {
     return new QDarwinAudioSource(info);
 }
 
-QPlatformAudioSink *QDarwinMediaDevices::createAudioSink(const QAudioDeviceInfo &info)
+QPlatformAudioSink *QDarwinMediaDevices::createAudioSink(const QAudioDevice &info)
 {
     return new QDarwinAudioSink(info);
 }
diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices_p.h b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h
index 87e20353e..da68643ed 100644
--- a/src/multimedia/platform/darwin/qdarwinmediadevices_p.h
+++ b/src/multimedia/platform/darwin/qdarwinmediadevices_p.h
@@ -53,14 +53,14 @@
 
 #include <private/qplatformmediadevices_p.h>
 #include <qelapsedtimer.h>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 
 Q_FORWARD_DECLARE_OBJC_CLASS(NSObject);
 Q_FORWARD_DECLARE_OBJC_CLASS(AVCaptureDeviceDiscoverySession);
 
 QT_BEGIN_NAMESPACE
 
-class QCameraInfo;
+class QCameraDevice;
 
 class QDarwinMediaDevices : public QPlatformMediaDevices
 {
@@ -68,19 +68,19 @@ public:
     QDarwinMediaDevices();
     ~QDarwinMediaDevices();
 
-    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;
 
     void updateCameraDevices();
     void updateAudioDevices();
 
 private:
-    QList<QCameraInfo> m_cameraDevices;
-    QList<QAudioDeviceInfo> m_audioInputs;
-    QList<QAudioDeviceInfo> m_audioOutputs;
+    QList<QCameraDevice> m_cameraDevices;
+    QList<QAudioDevice> m_audioInputs;
+    QList<QAudioDevice> m_audioOutputs;
 
     NSObject *m_deviceConnectedObserver;
     NSObject *m_deviceDisconnectedObserver;
diff --git a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice.cpp
index d0727498d..f68edf369 100644
--- a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qaudiodeviceinfo_gstreamer_p.h"
+#include "qgstreameraudiodevice_p.h"
 
 #include <private/qgstutils_p.h>
 #include <private/qplatformmediaintegration_p.h>
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 QGStreamerAudioDeviceInfo::QGStreamerAudioDeviceInfo(GstDevice *d, const QByteArray &device, QAudio::Mode mode)
-    : QAudioDeviceInfoPrivate(device, mode),
+    : QAudioDevicePrivate(device, mode),
       gstDevice(d)
 {
     Q_ASSERT(gstDevice);
diff --git a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice_p.h
index 1869e729f..c9e5442b7 100644
--- a/src/multimedia/platform/gstreamer/audio/qaudiodeviceinfo_gstreamer_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice_p.h
@@ -56,14 +56,14 @@
 #include <QtCore/qlist.h>
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
-#include <private/qaudiodeviceinfo_p.h>
+#include "qaudiodevice.h"
+#include <private/qaudiodevice_p.h>
 
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
 
-class QGStreamerAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QGStreamerAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
     QGStreamerAudioDeviceInfo(GstDevice *gstDevice, const QByteArray &device, QAudio::Mode mode);
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp
index 34f9bde8e..3bf5b597b 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp
@@ -43,7 +43,7 @@
 #include <private/qaudiohelpers_p.h>
 
 #include "qgstreameraudiosink_p.h"
-#include "qaudiodeviceinfo_gstreamer_p.h"
+#include "qgstreameraudiodevice_p.h"
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -55,7 +55,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QGStreamerAudioSink::QGStreamerAudioSink(const QAudioDeviceInfo &device)
+QGStreamerAudioSink::QGStreamerAudioSink(const QAudioDevice &device)
     : m_device(device.id()),
     gstPipeline("pipeline")
 {
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink_p.h
index fea8e19e6..872f0f241 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink_p.h
@@ -60,7 +60,7 @@
 #include <QtCore/private/qringbuffer_p.h>
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include <private/qaudiosystem_p.h>
 
 #include <private/qgst_p.h>
@@ -78,7 +78,7 @@ class QGStreamerAudioSink
     Q_OBJECT
 
 public:
-    QGStreamerAudioSink(const QAudioDeviceInfo &device);
+    QGStreamerAudioSink(const QAudioDevice &device);
     ~QGStreamerAudioSink();
 
     void start(QIODevice *device) override;
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
index e2701c723..ffa402627 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
@@ -43,7 +43,7 @@
 #include <private/qaudiohelpers_p.h>
 
 #include "qgstreameraudiosource_p.h"
-#include "qaudiodeviceinfo_gstreamer_p.h"
+#include "qgstreameraudiodevice_p.h"
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -54,7 +54,7 @@ Q_DECLARE_METATYPE(GstSample *);
 QT_BEGIN_NAMESPACE
 
 
-QGStreamerAudioSource::QGStreamerAudioSource(const QAudioDeviceInfo &device)
+QGStreamerAudioSource::QGStreamerAudioSource(const QAudioDevice &device)
     : m_info(device),
       m_device(device.id())
 {
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource_p.h
index a5bcdf084..67e11c1c5 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/private/qringbuffer_p.h>
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include <private/qaudiosystem_p.h>
 
 #include <private/qgstutils_p.h>
@@ -79,7 +79,7 @@ class QGStreamerAudioSource
     Q_OBJECT
     friend class GStreamerInputPrivate;
 public:
-    QGStreamerAudioSource(const QAudioDeviceInfo &device);
+    QGStreamerAudioSource(const QAudioDevice &device);
     ~QGStreamerAudioSource();
 
     void start(QIODevice *device) override;
@@ -116,7 +116,7 @@ private:
 
     static gboolean busMessage(GstBus *bus, GstMessage *msg, gpointer user_data);
 
-    QAudioDeviceInfo m_info;
+    QAudioDevice m_info;
     qint64 m_bytesWritten = 0;
     QIODevice *m_audioSink = nullptr;
     QAudioFormat m_format;
diff --git a/src/multimedia/platform/gstreamer/common/qgstreameraudioinput.cpp b/src/multimedia/platform/gstreamer/common/qgstreameraudioinput.cpp
index f0aa48476..3867038cd 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreameraudioinput.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudioinput.cpp
@@ -38,8 +38,8 @@
 ****************************************************************************/
 
 #include <private/qgstreameraudioinput_p.h>
-#include <private/qaudiodeviceinfo_gstreamer_p.h>
-#include <qaudiodeviceinfo.h>
+#include <private/qgstreameraudiodevice_p.h>
+#include <qaudiodevice.h>
 
 #include <QtCore/qloggingcategory.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
@@ -102,7 +102,7 @@ void QGstreamerAudioInput::setPipeline(const QGstPipeline &pipeline)
     gstPipeline = pipeline;
 }
 
-bool QGstreamerAudioInput::setAudioInput(const QAudioDeviceInfo &info)
+bool QGstreamerAudioInput::setAudioInput(const QAudioDevice &info)
 {
     if (info == m_audioInput)
         return true;
@@ -149,7 +149,7 @@ void QGstreamerAudioInput::prepareAudioInputChange(const QGstPad &/*pad*/)
     gstPipeline.setState(GST_STATE_PLAYING);
 }
 
-QAudioDeviceInfo QGstreamerAudioInput::audioInput() const
+QAudioDevice QGstreamerAudioInput::audioInput() const
 {
     return m_audioInput;
 }
diff --git a/src/multimedia/platform/gstreamer/common/qgstreameraudioinput_p.h b/src/multimedia/platform/gstreamer/common/qgstreameraudioinput_p.h
index b62e6a275..46ab7b78e 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreameraudioinput_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudioinput_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <private/qtmultimediaglobal_p.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 
 #include <QtCore/qobject.h>
 
@@ -62,7 +62,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGstreamerMessage;
-class QAudioDeviceInfo;
+class QAudioDevice;
 
 class Q_MULTIMEDIA_EXPORT QGstreamerAudioInput : public QObject
 {
@@ -75,8 +75,8 @@ public:
     int volume() const;
     bool isMuted() const;
 
-    bool setAudioInput(const QAudioDeviceInfo &);
-    QAudioDeviceInfo audioInput() const;
+    bool setAudioInput(const QAudioDevice &);
+    QAudioDevice audioInput() const;
 
     void setVolume(int volume);
     void setMuted(bool muted);
@@ -96,7 +96,7 @@ private:
     int m_volume = 100.;
     bool m_muted = false;
 
-    QAudioDeviceInfo m_audioInput;
+    QAudioDevice m_audioInput;
 
     // Gst elements
     QGstPipeline gstPipeline;
diff --git a/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput.cpp b/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput.cpp
index d88eade55..4227a04d5 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput.cpp
@@ -38,8 +38,8 @@
 ****************************************************************************/
 
 #include <private/qgstreameraudiooutput_p.h>
-#include <private/qaudiodeviceinfo_gstreamer_p.h>
-#include <qaudiodeviceinfo.h>
+#include <private/qgstreameraudiodevice_p.h>
+#include <qaudiodevice.h>
 
 #include <QtCore/qloggingcategory.h>
 #include <QtNetwork/qnetworkaccessmanager.h>
@@ -105,7 +105,7 @@ void QGstreamerAudioOutput::setPipeline(const QGstPipeline &pipeline)
     gstPipeline = pipeline;
 }
 
-bool QGstreamerAudioOutput::setAudioOutput(const QAudioDeviceInfo &info)
+bool QGstreamerAudioOutput::setAudioOutput(const QAudioDevice &info)
 {
     if (info == m_audioOutput)
         return true;
@@ -157,7 +157,7 @@ void QGstreamerAudioOutput::prepareAudioOutputChange(const QGstPad &/*pad*/)
         gstPipeline.setStateSync(state);
 }
 
-QAudioDeviceInfo QGstreamerAudioOutput::audioOutput() const
+QAudioDevice QGstreamerAudioOutput::audioOutput() const
 {
     return m_audioOutput;
 }
diff --git a/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput_p.h b/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput_p.h
index 59b7ed373..940d82330 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreameraudiooutput_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <private/qtmultimediaglobal_p.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 
 #include <QtCore/qobject.h>
 
@@ -62,7 +62,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGstreamerMessage;
-class QAudioDeviceInfo;
+class QAudioDevice;
 
 class Q_MULTIMEDIA_EXPORT QGstreamerAudioOutput : public QObject
 {
@@ -75,8 +75,8 @@ public:
     int volume() const;
     bool isMuted() const;
 
-    bool setAudioOutput(const QAudioDeviceInfo &);
-    QAudioDeviceInfo audioOutput() const;
+    bool setAudioOutput(const QAudioDevice &);
+    QAudioDevice audioOutput() const;
 
     void setVolume(int volume);
     void setMuted(bool muted);
@@ -96,7 +96,7 @@ private:
     int m_volume = 100.;
     bool m_muted = false;
 
-    QAudioDeviceInfo m_audioOutput;
+    QAudioDevice m_audioOutput;
 
     // Gst elements
     QGstPipeline gstPipeline;
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp
index cde1dc148..63061961d 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer.cpp
@@ -45,9 +45,9 @@
 #include <private/qgstreameraudiooutput_p.h>
 #include <private/qgstreamervideooutput_p.h>
 #include "private/qgstreamermessage_p.h"
-#include <private/qaudiodeviceinfo_gstreamer_p.h>
+#include <private/qgstreameraudiodevice_p.h>
 #include <private/qgstappsrc_p.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qsocketnotifier.h>
@@ -601,12 +601,12 @@ void QGstreamerMediaPlayer::setMedia(const QUrl &content, QIODevice *stream)
     positionChanged(0);
 }
 
-bool QGstreamerMediaPlayer::setAudioOutput(const QAudioDeviceInfo &info)
+bool QGstreamerMediaPlayer::setAudioOutput(const QAudioDevice &info)
 {
     return gstAudioOutput->setAudioOutput(info);
 }
 
-QAudioDeviceInfo QGstreamerMediaPlayer::audioOutput() const
+QAudioDevice QGstreamerMediaPlayer::audioOutput() const
 {
     return gstAudioOutput->audioOutput();
 }
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h
index a8ad55f08..23062e4d0 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h
+++ b/src/multimedia/platform/gstreamer/common/qgstreamermediaplayer_p.h
@@ -102,8 +102,8 @@ public:
 
     bool streamPlaybackSupported() const override { return true; }
 
-    bool setAudioOutput(const QAudioDeviceInfo &) override;
-    QAudioDeviceInfo audioOutput() const override;
+    bool setAudioOutput(const QAudioDevice &) override;
+    QAudioDevice audioOutput() const override;
 
     QMediaMetaData metaData() const override;
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
index ce5ee3767..521a1338f 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 
 #include "qgstreamercamera_p.h"
 #include "qgstreamercameraimagecapture_p.h"
@@ -94,7 +94,7 @@ void QGstreamerCamera::setActive(bool active)
     emit activeChanged(active);
 }
 
-void QGstreamerCamera::setCamera(const QCameraInfo &camera)
+void QGstreamerCamera::setCamera(const QCameraDevice &camera)
 {
     if (m_cameraInfo == camera)
         return;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h
index f3ccb5ca6..a87855049 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamercamera_p.h
@@ -69,7 +69,7 @@ public:
     bool isActive() const override;
     void setActive(bool active) override;
 
-    void setCamera(const QCameraInfo &camera) override;
+    void setCamera(const QCameraDevice &camera) override;
     bool setCameraFormat(const QCameraFormat &format) override;
     void setCameraFormatInternal(const QCameraFormat &format);
 
@@ -125,7 +125,7 @@ private:
 
     QGstreamerMediaCapture *m_session = nullptr;
 
-    QCameraInfo m_cameraInfo;
+    QCameraDevice m_cameraInfo;
 
     QGstPipeline gstPipeline;
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
index a7e2c27f3..84f3f67b5 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture.cpp
@@ -179,12 +179,12 @@ QPlatformMediaEncoder *QGstreamerMediaCapture::mediaEncoder()
     return m_mediaEncoder;
 }
 
-QAudioDeviceInfo QGstreamerMediaCapture::audioInput() const
+QAudioDevice QGstreamerMediaCapture::audioInput() const
 {
     return gstAudioInput->audioInput();
 }
 
-bool QGstreamerMediaCapture::setAudioInput(const QAudioDeviceInfo &info)
+bool QGstreamerMediaCapture::setAudioInput(const QAudioDevice &info)
 {
     return gstAudioInput->setAudioInput(info);
 }
@@ -214,12 +214,12 @@ void QGstreamerMediaCapture::setVideoPreview(QVideoSink *sink)
     gstVideoOutput->setVideoSink(sink);
 }
 
-QAudioDeviceInfo QGstreamerMediaCapture::audioPreview() const
+QAudioDevice QGstreamerMediaCapture::audioPreview() const
 {
     return gstAudioOutput->audioOutput();
 }
 
-bool QGstreamerMediaCapture::setAudioPreview(const QAudioDeviceInfo &info)
+bool QGstreamerMediaCapture::setAudioPreview(const QAudioDevice &info)
 {
     gstAudioOutput->setAudioOutput(info);
     return true;
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
index eddcd9181..1a02c34cb 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediacapture_p.h
@@ -88,12 +88,12 @@ public:
     qreal volume() const override;
     void setVolume(qreal volume) override;
 
-    QAudioDeviceInfo audioInput() const override;
-    bool setAudioInput(const QAudioDeviceInfo &id) override;
+    QAudioDevice audioInput() const override;
+    bool setAudioInput(const QAudioDevice &id) override;
 
     void setVideoPreview(QVideoSink *sink) override;
-    QAudioDeviceInfo audioPreview() const override;
-    bool setAudioPreview(const QAudioDeviceInfo &info) override;
+    QAudioDevice audioPreview() const override;
+    bool setAudioPreview(const QAudioDevice &info) override;
 
     // void cameraChanged();
 
diff --git a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp
index baffaea43..c50f91a6a 100644
--- a/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp
+++ b/src/multimedia/platform/gstreamer/mediacapture/qgstreamermediaencoder.cpp
@@ -42,7 +42,7 @@
 #include "private/qgstreamerformatinfo_p.h"
 #include "private/qgstpipeline_p.h"
 #include "private/qgstreamermessage_p.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 
 #include <qdebug.h>
 #include <qstandardpaths.h>
diff --git a/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp b/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
index 01b69b333..6be1a3cb9 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
@@ -39,11 +39,11 @@
 
 #include "qgstreamermediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 
 #include "private/qgstreameraudiosource_p.h"
 #include "private/qgstreameraudiosink_p.h"
-#include "private/qaudiodeviceinfo_gstreamer_p.h"
+#include "private/qgstreameraudiodevice_p.h"
 #include "private/qgstutils_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -99,9 +99,9 @@ QGstreamerMediaDevices::QGstreamerMediaDevices()
     }
 }
 
-static QList<QAudioDeviceInfo> devicesFromSet(const QSet<GstDevice *> &deviceSet, QAudio::Mode mode)
+static QList<QAudioDevice> devicesFromSet(const QSet<GstDevice *> &deviceSet, QAudio::Mode mode)
 {
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
     for (auto *d : deviceSet) {
         auto *properties = gst_device_get_properties(d);
         if (properties) {
@@ -122,24 +122,24 @@ static QList<QAudioDeviceInfo> devicesFromSet(const QSet<GstDevice *> &deviceSet
     return devices;
 };
 
-QList<QAudioDeviceInfo> QGstreamerMediaDevices::audioInputs() const
+QList<QAudioDevice> QGstreamerMediaDevices::audioInputs() const
 {
     return devicesFromSet(m_audioSources, QAudio::AudioInput);
 }
 
-QList<QAudioDeviceInfo> QGstreamerMediaDevices::audioOutputs() const
+QList<QAudioDevice> QGstreamerMediaDevices::audioOutputs() const
 {
     return devicesFromSet(m_audioSinks, QAudio::AudioOutput);
 }
 
-QList<QCameraInfo> QGstreamerMediaDevices::videoInputs() const
+QList<QCameraDevice> QGstreamerMediaDevices::videoInputs() const
 {
-    QList<QCameraInfo> devices;
+    QList<QCameraDevice> devices;
 
     for (auto *d : qAsConst(m_videoSources)) {
         QGstStructure properties = gst_device_get_properties(d);
         if (!properties.isNull()) {
-            QCameraInfoPrivate *info = new QCameraInfoPrivate;
+            QCameraDevicePrivate *info = new QCameraDevicePrivate;
             auto *desc = gst_device_get_display_name(d);
             info->description = QString::fromUtf8(desc);
             g_free(desc);
@@ -187,12 +187,12 @@ QList<QCameraInfo> QGstreamerMediaDevices::videoInputs() const
     return devices;
 }
 
-QPlatformAudioSource *QGstreamerMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QGstreamerMediaDevices::createAudioSource(const QAudioDevice &deviceInfo)
 {
     return new QGStreamerAudioSource(deviceInfo);
 }
 
-QPlatformAudioSink *QGstreamerMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink *QGstreamerMediaDevices::createAudioSink(const QAudioDevice &deviceInfo)
 {
     return new QGStreamerAudioSink(deviceInfo);
 }
diff --git a/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h b/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
index 41e909e95..c00d66209 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
@@ -63,11 +63,11 @@ class QGstreamerMediaDevices : public QPlatformMediaDevices
 public:
     QGstreamerMediaDevices();
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 
     void addDevice(GstDevice *);
     void removeDevice(GstDevice *);
diff --git a/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp b/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp
index 2516d28c0..9b1cecbcf 100644
--- a/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp
+++ b/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp
@@ -39,9 +39,9 @@
 
 #include <QtCore/qdebug.h>
 
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include "qaudioengine_pulse_p.h"
-#include "qaudiodeviceinfo_pulse_p.h"
+#include "qpulseaudiodevice_p.h"
 #include "qpulsehelpers_p.h"
 #include <sys/types.h>
 #include <unistd.h>
@@ -83,7 +83,7 @@ static void serverInfoCallback(pa_context *context, const pa_server_info *info,
     pulseEngine->m_serverLock.lockForWrite();
     pulseEngine->m_defaultSink = info->default_sink_name;
     pulseEngine->m_defaultSource = info->default_source_name;
-    // ### ensure the QAudioDeviceInfos are updated if default changes and emit changed signal in the device manager
+    // ### ensure the QAudioDevices are updated if default changes and emit changed signal in the device manager
     pulseEngine->m_serverLock.unlock();
 
     pa_threaded_mainloop_signal(pulseEngine->mainloop(), 0);
@@ -448,9 +448,9 @@ QPulseAudioEngine *QPulseAudioEngine::instance()
     return pulseEngine();
 }
 
-QList<QAudioDeviceInfo> QPulseAudioEngine::availableDevices(QAudio::Mode mode) const
+QList<QAudioDevice> QPulseAudioEngine::availableDevices(QAudio::Mode mode) const
 {
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
     QByteArray defaultDevice;
 
     m_serverLock.lockForRead();
diff --git a/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h b/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h
index 8d48b3b68..9f11e8ca3 100644
--- a/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h
+++ b/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h
@@ -90,7 +90,7 @@ public:
             pa_threaded_mainloop_wait(m_mainLoop);
     }
 
-    QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode) const;
+    QList<QAudioDevice> availableDevices(QAudio::Mode mode) const;
     QByteArray defaultDevice(QAudio::Mode mode) const;
 
 Q_SIGNALS:
@@ -105,8 +105,8 @@ private:
     void release();
 
 public:
-    QMap<int, QAudioDeviceInfo> m_sinks;
-    QMap<int, QAudioDeviceInfo> m_sources;
+    QMap<int, QAudioDevice> m_sinks;
+    QMap<int, QAudioDevice> m_sources;
 
     QByteArray m_defaultSink;
     QByteArray m_defaultSource;
diff --git a/src/multimedia/platform/pulseaudio/qaudiodeviceinfo_pulse.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiodevice.cpp
index 2f234575c..d624de847 100644
--- a/src/multimedia/platform/pulseaudio/qaudiodeviceinfo_pulse.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiodevice.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include "qaudiodeviceinfo_pulse_p.h"
+#include "qpulseaudiodevice_p.h"
 #include "qaudioengine_pulse_p.h"
 #include "qpulsehelpers_p.h"
 
 QT_BEGIN_NAMESPACE
 
 QPulseAudioDeviceInfo::QPulseAudioDeviceInfo(const char *device, const char *desc, bool isDef, QAudio::Mode mode)
-    : QAudioDeviceInfoPrivate(device, mode)
+    : QAudioDevicePrivate(device, mode)
 {
     description = QString::fromUtf8(desc);
     isDefault = isDef;
diff --git a/src/multimedia/platform/pulseaudio/qaudiodeviceinfo_pulse_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiodevice_p.h
index 2178f4c6c..59e013167 100644
--- a/src/multimedia/platform/pulseaudio/qaudiodeviceinfo_pulse_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiodevice_p.h
@@ -56,13 +56,13 @@
 #include <QtCore/qlist.h>
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include <private/qaudiosystem_p.h>
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QPulseAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QPulseAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
     QPulseAudioDeviceInfo(const char *device, const char *description, bool isDefault, QAudio::Mode mode);
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
index 04db66f24..c847592ec 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
@@ -39,11 +39,11 @@
 
 #include "qpulseaudiomediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 
 #include "private/qpulseaudiosource_p.h"
 #include "private/qpulseaudiosink_p.h"
-#include "private/qaudiodeviceinfo_pulse_p.h"
+#include "private/qpulseaudiodevice_p.h"
 #include "private/qaudioengine_pulse_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -54,27 +54,27 @@ QPulseAudioMediaDevices::QPulseAudioMediaDevices(QPulseAudioEngine *engine)
 {
 }
 
-QList<QAudioDeviceInfo> QPulseAudioMediaDevices::audioInputs() const
+QList<QAudioDevice> QPulseAudioMediaDevices::audioInputs() const
 {
     return pulseEngine->availableDevices(QAudio::AudioInput);
 }
 
-QList<QAudioDeviceInfo> QPulseAudioMediaDevices::audioOutputs() const
+QList<QAudioDevice> QPulseAudioMediaDevices::audioOutputs() const
 {
     return pulseEngine->availableDevices(QAudio::AudioOutput);
 }
 
-QList<QCameraInfo> QPulseAudioMediaDevices::videoInputs() const
+QList<QCameraDevice> QPulseAudioMediaDevices::videoInputs() const
 {
     return {};
 }
 
-QPlatformAudioSource *QPulseAudioMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QPulseAudioMediaDevices::createAudioSource(const QAudioDevice &deviceInfo)
 {
     return new QPulseAudioSource(deviceInfo.id());
 }
 
-QPlatformAudioSink *QPulseAudioMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink *QPulseAudioMediaDevices::createAudioSink(const QAudioDevice &deviceInfo)
 {
     return new QPulseAudioSink(deviceInfo.id());
 }
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h
index 8730f5141..4cb28056f 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices_p.h
@@ -64,11 +64,11 @@ class QPulseAudioMediaDevices : public QPlatformMediaDevices
 public:
     QPulseAudioMediaDevices(QPulseAudioEngine *engine);
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 
 private:
     QPulseAudioEngine *pulseEngine;
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp
index bedc4cb8d..59543874b 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiosink.cpp
@@ -43,7 +43,7 @@
 #include <private/qaudiohelpers_p.h>
 
 #include "qpulseaudiosink_p.h"
-#include "qaudiodeviceinfo_pulse_p.h"
+#include "qpulseaudiodevice_p.h"
 #include "qaudioengine_pulse_p.h"
 #include "qpulsehelpers_p.h"
 #include <sys/types.h>
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiosink_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiosink_p.h
index fc4c69b40..9397c507a 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiosink_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiosink_p.h
@@ -59,7 +59,7 @@
 #include <QtCore/qiodevice.h>
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include <private/qaudiosystem_p.h>
 
 #include <pulse/pulseaudio.h>
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp
index f2154306f..a7a0d4702 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiosource.cpp
@@ -44,7 +44,7 @@
 
 #include "qpulseaudiosource_p.h"
 #include "qaudioengine_pulse_p.h"
-#include "qaudiodeviceinfo_pulse_p.h"
+#include "qpulseaudiodevice_p.h"
 #include "qpulsehelpers_p.h"
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiosource_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiosource_p.h
index e5fee582e..7a9f047dd 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiosource_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiosource_p.h
@@ -59,7 +59,7 @@
 #include <QtCore/qiodevice.h>
 
 #include "qaudio.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include <private/qaudiosystem_p.h>
 
 #include <pulse/pulseaudio.h>
diff --git a/src/multimedia/platform/pulseaudio/qpulsehelpers_p.h b/src/multimedia/platform/pulseaudio/qpulsehelpers_p.h
index 30192e4d1..5663e73ed 100644
--- a/src/multimedia/platform/pulseaudio/qpulsehelpers_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulsehelpers_p.h
@@ -51,7 +51,7 @@
 // We mean it.
 //
 
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include <qaudioformat.h>
 #include <pulse/pulseaudio.h>
 
diff --git a/src/multimedia/platform/qnx/audio/qnxaudiodeviceinfo.cpp b/src/multimedia/platform/qnx/audio/qqnxaudiodevice.cpp
index f7dac6b19..4d1d0f76f 100644
--- a/src/multimedia/platform/qnx/audio/qnxaudiodeviceinfo.cpp
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiodevice.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "qnxaudiodeviceinfo_p.h"
+#include "qqnxaudiodevice_p.h"
 
 #include "qnxaudioutils_p.h"
 
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 QnxAudioDeviceInfo::QnxAudioDeviceInfo(const QByteArray &deviceName, QAudio::Mode mode)
-    : QAudioDeviceInfoPrivate(deviceName, mode)
+    : QAudioDevicePrivate(deviceName, mode)
 {
 }
 
@@ -82,7 +82,7 @@ bool QnxAudioDeviceInfo::isFormatSupported(const QAudioFormat &format) const
     info.channel = (mode == QAudio::AudioOutput) ? SND_PCM_CHANNEL_PLAYBACK : SND_PCM_CHANNEL_CAPTURE;
 
     if (snd_pcm_plugin_info(handle, &info) < 0) {
-        qWarning("QAudioDeviceInfo: couldn't get channel info");
+        qWarning("QAudioDevice: couldn't get channel info");
         snd_pcm_close(handle);
         return false;
     }
diff --git a/src/multimedia/platform/qnx/audio/qnxaudiodeviceinfo_p.h b/src/multimedia/platform/qnx/audio/qqnxaudiodevice_p.h
index 7eb9fe76b..e3039daa5 100644
--- a/src/multimedia/platform/qnx/audio/qnxaudiodeviceinfo_p.h
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiodevice_p.h
@@ -52,11 +52,11 @@
 //
 
 #include "qaudiosystem_p.h"
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QnxAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QnxAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
     QnxAudioDeviceInfo(const QByteArray &deviceName, QAudio::Mode mode);
diff --git a/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
index 18d2bafaa..335b7c584 100644
--- a/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol.cpp
@@ -39,7 +39,7 @@
 #include "bbcameracontrol_p.h"
 
 #include "bbcamerasession_p.h"
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -80,7 +80,7 @@ QCamera::Status BbCameraControl::status() const
     return m_session->status();
 }
 
-void BbCameraControl::setCamera(const QCameraInfo &camera)
+void BbCameraControl::setCamera(const QCameraDevice &camera)
 {
     m_session->setDevice(camera.id());
 }
diff --git a/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
index 52eab1577..4990f6517 100644
--- a/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
+++ b/src/multimedia/platform/qnx/camera/bbcameracontrol_p.h
@@ -67,7 +67,7 @@ public:
 
     QCamera::Status status() const override;
 
-    void setCamera(const QCameraInfo &camera) override;
+    void setCamera(const QCameraDevice &camera) override;
 
     QCamera::CaptureModes captureMode() const override;
     void setCaptureMode(QCamera::CaptureModes) override;
diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
index 111ed2e78..5aad69868 100644
--- a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
+++ b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
@@ -39,16 +39,16 @@
 
 #include "qqnxmediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 
 #include "private/qqnxaudiosource_p.h"
 #include "private/qqnxaudiosink_p.h"
-#include "private/qnxaudiodeviceinfo_p.h"
+#include "private/qqnxaudiodevice_p.h"
 #include "bbcamerasession_p.h"
 
 QT_BEGIN_NAMESPACE
 
-static QList<QCameraInfo> enumerateCameras()
+static QList<QCameraDevice> enumerateCameras()
 {
 
     camera_unit_t cameras[10];
@@ -60,24 +60,24 @@ static QList<QCameraInfo> enumerateCameras()
         return {};
     }
 
-    QList<QCameraInfo> cameras;
+    QList<QCameraDevice> cameras;
     for (unsigned int i = 0; i < knownCameras; ++i) {
-        QCameraInfoPrivate *p = new QCameraInfoPrivate;
+        QCameraDevicePrivate *p = new QCameraDevicePrivate;
         switch (cameras[i]) {
         case CAMERA_UNIT_FRONT:
             p->id = BbCameraSession::cameraIdentifierFront();
             p->description = tr("Front Camera");
-            p->position = QCameraInfo::FrontFace;
+            p->position = QCameraDevice::FrontFace;
             break;
         case CAMERA_UNIT_REAR:
             p->id = BbCameraSession::cameraIdentifierRear();
             p->description = tr("Rear Camera");
-            p->position = QCameraInfo::BackFace;
+            p->position = QCameraDevice::BackFace;
             break;
         case CAMERA_UNIT_DESKTOP:
             p->id = devices->append(BbCameraSession::cameraIdentifierDesktop();
             p->description = tr("Desktop Camera");
-            p->position = QCameraInfo::UnspecifiedPosition;
+            p->position = QCameraDevice::UnspecifiedPosition;
             break;
         default:
             break;
@@ -94,27 +94,27 @@ QQnxMediaDevices::QQnxMediaDevices()
 {
 }
 
-QList<QAudioDeviceInfo> QQnxMediaDevices::audioInputs() const
+QList<QAudioDevice> QQnxMediaDevices::audioInputs() const
 {
-    return { QAudioDeviceInfo(new QnxAudioDeviceInfo("default", QAudio::AudioInput)) };
+    return { QAudioDevice(new QnxAudioDeviceInfo("default", QAudio::AudioInput)) };
 }
 
-QList<QAudioDeviceInfo> QQnxMediaDevices::audioOutputs() const
+QList<QAudioDevice> QQnxMediaDevices::audioOutputs() const
 {
-    return { QAudioDeviceInfo(new QnxAudioDeviceInfo("default", QAudio::AudioOutput)) };
+    return { QAudioDevice(new QnxAudioDeviceInfo("default", QAudio::AudioOutput)) };
 }
 
-QList<QCameraInfo> QQnxMediaDevices::videoInputs() const
+QList<QCameraDevice> QQnxMediaDevices::videoInputs() const
 {
     return enumerateCameras();
 }
 
-QPlatformAudioSource *QQnxMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QQnxMediaDevices::createAudioSource(const QAudioDevice &deviceInfo)
 {
     return new QQnxAudioSource();
 }
 
-QPlatformAudioSink *QQnxMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink *QQnxMediaDevices::createAudioSink(const QAudioDevice &deviceInfo)
 {
     return new QNxAudioOutput();
 }
diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h
index 1d0d2ef4c..a23d451c8 100644
--- a/src/multimedia/platform/qnx/qqnxdevicemanager_p.h
+++ b/src/multimedia/platform/qnx/qqnxdevicemanager_p.h
@@ -61,11 +61,11 @@ class QQnxMediaDevices : public QPlatformMediaDevices
 public:
     QQnxMediaDevices();
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 };
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qplatformcamera.cpp b/src/multimedia/platform/qplatformcamera.cpp
index fbb49dc54..796269cda 100644
--- a/src/multimedia/platform/qplatformcamera.cpp
+++ b/src/multimedia/platform/qplatformcamera.cpp
@@ -65,7 +65,7 @@ QPlatformCamera::QPlatformCamera(QCamera *parent)
 {
 }
 
-QCameraFormat QPlatformCamera::findBestCameraFormat(const QCameraInfo &camera)
+QCameraFormat QPlatformCamera::findBestCameraFormat(const QCameraDevice &camera)
 {
     QCameraFormat f;
     const auto formats = camera.videoFormats();
diff --git a/src/multimedia/platform/qplatformcamera_p.h b/src/multimedia/platform/qplatformcamera_p.h
index cb40625b0..6039422a1 100644
--- a/src/multimedia/platform/qplatformcamera_p.h
+++ b/src/multimedia/platform/qplatformcamera_p.h
@@ -68,7 +68,7 @@ public:
 
     virtual QCamera::Status status() const { return m_status; }
 
-    virtual void setCamera(const QCameraInfo &camera) = 0;
+    virtual void setCamera(const QCameraDevice &camera) = 0;
     virtual bool setCameraFormat(const QCameraFormat &/*format*/) { return false; }
 
     virtual void setCaptureSession(QPlatformMediaCaptureSession *) {}
@@ -159,7 +159,7 @@ Q_SIGNALS:
 protected:
     explicit QPlatformCamera(QCamera *parent);
 
-    static QCameraFormat findBestCameraFormat(const QCameraInfo &camera);
+    static QCameraFormat findBestCameraFormat(const QCameraDevice &camera);
 private:
     QCamera *m_camera = nullptr;
     QCamera::Features m_supportedFeatures = {};
diff --git a/src/multimedia/platform/qplatformmediacapture.cpp b/src/multimedia/platform/qplatformmediacapture.cpp
index cec12b8e7..56c3e0719 100644
--- a/src/multimedia/platform/qplatformmediacapture.cpp
+++ b/src/multimedia/platform/qplatformmediacapture.cpp
@@ -39,15 +39,15 @@
 
 #include <qtmultimediaglobal_p.h>
 #include "qplatformmediacapture_p.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 
 QT_BEGIN_NAMESPACE
 
 QPlatformMediaCaptureSession::~QPlatformMediaCaptureSession() = default;
 
-QAudioDeviceInfo QPlatformMediaCaptureSession::audioPreview() const
+QAudioDevice QPlatformMediaCaptureSession::audioPreview() const
 {
-    return QAudioDeviceInfo();
+    return QAudioDevice();
 }
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qplatformmediacapture_p.h b/src/multimedia/platform/qplatformmediacapture_p.h
index 346c2a4f0..d8893544d 100644
--- a/src/multimedia/platform/qplatformmediacapture_p.h
+++ b/src/multimedia/platform/qplatformmediacapture_p.h
@@ -57,8 +57,8 @@ QT_BEGIN_NAMESPACE
 class QPlatformCamera;
 class QPlatformCameraImageCapture;
 class QPlatformMediaEncoder;
-class QAudioDeviceInfo;
-class QCameraInfo;
+class QAudioDevice;
+class QCameraDevice;
 class QVideoSink;
 
 class Q_MULTIMEDIA_EXPORT QPlatformMediaCaptureSession : public QObject
@@ -82,12 +82,12 @@ public:
     virtual qreal volume() const = 0;
     virtual void setVolume(qreal volume) = 0;
 
-    virtual QAudioDeviceInfo audioInput() const = 0;
-    virtual bool setAudioInput(const QAudioDeviceInfo &id) = 0;
+    virtual QAudioDevice audioInput() const = 0;
+    virtual bool setAudioInput(const QAudioDevice &id) = 0;
 
     virtual void setVideoPreview(QVideoSink * /*sink*/) {}
-    virtual QAudioDeviceInfo audioPreview() const;
-    virtual bool setAudioPreview(const QAudioDeviceInfo &) { return true; }
+    virtual QAudioDevice audioPreview() const;
+    virtual bool setAudioPreview(const QAudioDevice &) { return true; }
 
 Q_SIGNALS:
     void mutedChanged(bool muted);
diff --git a/src/multimedia/platform/qplatformmediadevices.cpp b/src/multimedia/platform/qplatformmediadevices.cpp
index 0341d9b88..4ac1ec14c 100644
--- a/src/multimedia/platform/qplatformmediadevices.cpp
+++ b/src/multimedia/platform/qplatformmediadevices.cpp
@@ -39,8 +39,8 @@
 
 #include "qplatformmediadevices_p.h"
 #include "qmediadevices.h"
-#include "qaudiodeviceinfo.h"
-#include "qcamerainfo.h"
+#include "qaudiodevice.h"
+#include "qcameradevice.h"
 #include "qaudiosystem_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +49,7 @@ QPlatformMediaDevices::QPlatformMediaDevices() = default;
 
 QPlatformMediaDevices::~QPlatformMediaDevices() = default;
 
-QAudioDeviceInfo QPlatformMediaDevices::audioInput(const QByteArray &id) const
+QAudioDevice QPlatformMediaDevices::audioInput(const QByteArray &id) const
 {
     const auto inputs = audioInputs();
     for (auto i : inputs) {
@@ -59,7 +59,7 @@ QAudioDeviceInfo QPlatformMediaDevices::audioInput(const QByteArray &id) const
     return {};
 }
 
-QAudioDeviceInfo QPlatformMediaDevices::audioOutput(const QByteArray &id) const
+QAudioDevice QPlatformMediaDevices::audioOutput(const QByteArray &id) const
 {
     const auto outputs = audioOutputs();
     for (auto o : outputs) {
@@ -69,19 +69,19 @@ QAudioDeviceInfo QPlatformMediaDevices::audioOutput(const QByteArray &id) const
     return {};
 }
 
-QCameraInfo QPlatformMediaDevices::videoInput(const QByteArray &id) const
+QCameraDevice QPlatformMediaDevices::videoInput(const QByteArray &id) const
 {
     const auto inputs = videoInputs();
     for (auto i : inputs) {
         if (i.id() == id)
             return i;
     }
-    return QCameraInfo();
+    return QCameraDevice();
 }
 
-QPlatformAudioSource* QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource* QPlatformMediaDevices::audioInputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo)
 {
-    QAudioDeviceInfo info = deviceInfo;
+    QAudioDevice info = deviceInfo;
     if (info.isNull())
         info = audioInputs().value(0);
 
@@ -91,9 +91,9 @@ QPlatformAudioSource* QPlatformMediaDevices::audioInputDevice(const QAudioFormat
     return p;
 }
 
-QPlatformAudioSink* QPlatformMediaDevices::audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink* QPlatformMediaDevices::audioOutputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo)
 {
-    QAudioDeviceInfo info = deviceInfo;
+    QAudioDevice info = deviceInfo;
     if (info.isNull())
         info = audioOutputs().value(0);
 
diff --git a/src/multimedia/platform/qplatformmediadevices_p.h b/src/multimedia/platform/qplatformmediadevices_p.h
index 40300ce72..62b7229ab 100644
--- a/src/multimedia/platform/qplatformmediadevices_p.h
+++ b/src/multimedia/platform/qplatformmediadevices_p.h
@@ -57,8 +57,8 @@
 QT_BEGIN_NAMESPACE
 
 class QMediaDevices;
-class QAudioDeviceInfo;
-class QCameraInfo;
+class QAudioDevice;
+class QCameraDevice;
 class QPlatformAudioSource;
 class QPlatformAudioSink;
 class QAudioFormat;
@@ -69,18 +69,18 @@ public:
     QPlatformMediaDevices();
     virtual ~QPlatformMediaDevices();
 
-    virtual QList<QAudioDeviceInfo> audioInputs() const = 0;
-    virtual QList<QAudioDeviceInfo> audioOutputs() const = 0;
-    virtual QList<QCameraInfo> videoInputs() const = 0;
-    virtual QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) = 0;
-    virtual QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) = 0;
+    virtual QList<QAudioDevice> audioInputs() const = 0;
+    virtual QList<QAudioDevice> audioOutputs() const = 0;
+    virtual QList<QCameraDevice> videoInputs() const = 0;
+    virtual QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) = 0;
+    virtual QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) = 0;
 
-    QAudioDeviceInfo audioInput(const QByteArray &id) const;
-    QAudioDeviceInfo audioOutput(const QByteArray &id) const;
-    QCameraInfo videoInput(const QByteArray &id) const;
+    QAudioDevice audioInput(const QByteArray &id) const;
+    QAudioDevice audioOutput(const QByteArray &id) const;
+    QCameraDevice videoInput(const QByteArray &id) const;
 
-    QPlatformAudioSource *audioInputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo);
-    QPlatformAudioSink *audioOutputDevice(const QAudioFormat &format, const QAudioDeviceInfo &deviceInfo);
+    QPlatformAudioSource *audioInputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo);
+    QPlatformAudioSink *audioOutputDevice(const QAudioFormat &format, const QAudioDevice &deviceInfo);
 
     void addDevices(QMediaDevices *m)
     {
diff --git a/src/multimedia/platform/qplatformmediaplayer_p.h b/src/multimedia/platform/qplatformmediaplayer_p.h
index 0c5fbb0aa..d32e6ee6d 100644
--- a/src/multimedia/platform/qplatformmediaplayer_p.h
+++ b/src/multimedia/platform/qplatformmediaplayer_p.h
@@ -53,7 +53,7 @@
 
 #include <QtMultimedia/qmediaplayer.h>
 #include <QtMultimedia/qmediatimerange.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 #include <QtMultimedia/qmediametadata.h>
 
 #include <QtCore/qpair.h>
@@ -105,8 +105,8 @@ public:
 
     virtual bool streamPlaybackSupported() const { return false; }
 
-    virtual bool setAudioOutput(const QAudioDeviceInfo &) { return false; }
-    virtual QAudioDeviceInfo audioOutput() const { return QAudioDeviceInfo(); }
+    virtual bool setAudioOutput(const QAudioDevice &) { return false; }
+    virtual QAudioDevice audioOutput() const { return QAudioDevice(); }
 
     virtual QMediaMetaData metaData() const { return {}; }
 
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo.cpp b/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp
index 626da87a2..9ba7a2965 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo.cpp
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp
@@ -53,12 +53,12 @@
 #include <QtCore/QDataStream>
 #include <QtCore/QIODevice>
 #include <mmsystem.h>
-#include "qwindowsaudiodeviceinfo_p.h"
+#include "qwindowsaudiodevice_p.h"
 #include "qwindowsaudioutils_p.h"
 
 
 QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, int waveID, const QString &description, QAudio::Mode mode)
-    : QAudioDeviceInfoPrivate(dev, mode),
+    : QAudioDevicePrivate(dev, mode),
       devId(waveID)
 {
     this->description = description;
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
index 378188084..475296e12 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodeviceinfo_p.h
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
@@ -57,9 +57,9 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qdebug.h>
 
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
-#include <private/qaudiodeviceinfo_p.h>
+#include <private/qaudiodevice_p.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };
 
-class QWindowsAudioDeviceInfo : public QAudioDeviceInfoPrivate
+class QWindowsAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
     QWindowsAudioDeviceInfo(QByteArray dev, int waveID, const QString &description, QAudio::Mode mode);
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosink.cpp b/src/multimedia/platform/windows/audio/qwindowsaudiosink.cpp
index ea6ae9f9a..8cc4d33cf 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosink.cpp
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiosink.cpp
@@ -49,7 +49,7 @@
 //
 
 #include "qwindowsaudiosink_p.h"
-#include "qwindowsaudiodeviceinfo_p.h"
+#include "qwindowsaudiodevice_p.h"
 #include "qwindowsaudioutils_p.h"
 #include <QtEndian>
 #include <QtCore/QDataStream>
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosink_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiosink_p.h
index 238c7136f..d865011b5 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosink_p.h
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiosink_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/qmutex.h>
 
 #include <QtMultimedia/qaudio.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
 
 // For compat with 4.6
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h
index 42ac1cfc5..ff68daab6 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiosource_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/qmutex.h>
 
 #include <QtMultimedia/qaudio.h>
-#include <QtMultimedia/qaudiodeviceinfo.h>
+#include <QtMultimedia/qaudiodevice.h>
 #include <private/qaudiosystem_p.h>
 
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp
index 1ad90865d..1c2230f6c 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamera.cpp
@@ -41,7 +41,7 @@
 
 #include "qwindowscamerasession_p.h"
 #include "qwindowsmediacapture_p.h"
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -92,7 +92,7 @@ void QWindowsCamera::updateStatus()
     }
 }
 
-void QWindowsCamera::setCamera(const QCameraInfo &camera)
+void QWindowsCamera::setCamera(const QCameraDevice &camera)
 {
     if (m_cameraInfo == camera)
         return;
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h
index 457402617..2a408d7bd 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamera_p.h
@@ -70,7 +70,7 @@ public:
 
     QCamera::Status status() const override;
 
-    void setCamera(const QCameraInfo &camera) override;
+    void setCamera(const QCameraDevice &camera) override;
 
     void setCaptureSession(QPlatformMediaCaptureSession *) override;
 
@@ -82,7 +82,7 @@ private Q_SLOTS:
 private:
     QWindowsMediaCaptureService *m_captureService = nullptr;
     QWindowsCameraSession  *m_cameraSession = nullptr;
-    QCameraInfo m_cameraInfo;
+    QCameraDevice m_cameraInfo;
     QCameraFormat m_cameraFormat;
     QCamera::Status m_lastStatus = QCamera::InactiveStatus;
     bool m_active = false;
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp
index fd531776e..3dc969eba 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerareader.cpp
@@ -42,7 +42,7 @@
 #include "qwindowsmultimediautils_p.h"
 #include <qvideosink.h>
 #include <qmediadevices.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <private/qmemoryvideobuffer_p.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerareader_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscamerareader_p.h
index 10632528d..5390ece15 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamerareader_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerareader_p.h
@@ -61,7 +61,7 @@
 #include <QtCore/qsemaphore.h>
 #include <QtCore/qtimer.h>
 #include <qvideoframe.h>
-#include <qcamerainfo.h>
+#include <qcameradevice.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp
index 6be9b830c..2cc305c38 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession.cpp
@@ -89,7 +89,7 @@ void QWindowsCameraSession::setActive(bool active)
     }
 }
 
-void QWindowsCameraSession::setActiveCamera(const QCameraInfo &info)
+void QWindowsCameraSession::setActiveCamera(const QCameraDevice &info)
 {
     m_activeCameraInfo = info;
 }
@@ -167,12 +167,12 @@ void QWindowsCameraSession::setVolume(qreal volume)
     m_cameraReader->setVolume(volume);
 }
 
-QAudioDeviceInfo QWindowsCameraSession::audioInput() const
+QAudioDevice QWindowsCameraSession::audioInput() const
 {
     return m_audioInput;
 }
 
-bool QWindowsCameraSession::setAudioInput(const QAudioDeviceInfo &info)
+bool QWindowsCameraSession::setAudioInput(const QAudioDevice &info)
 {
     m_audioInput = info;
     return true;
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h
index c14c931d9..5d6ac5c86 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowscamerasession_p.h
@@ -54,7 +54,7 @@
 #include <private/qtmultimediaglobal_p.h>
 #include <qcamera.h>
 #include <qmediaencodersettings.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qwindowsmultimediautils_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -74,7 +74,7 @@ public:
 
     bool isReadyForCapture() const;
 
-    void setActiveCamera(const QCameraInfo &info);
+    void setActiveCamera(const QCameraDevice &info);
 
     void setCameraFormat(const QCameraFormat &cameraFormat);
 
@@ -87,8 +87,8 @@ public:
     void setMuted(bool muted);
     qreal volume() const;
     void setVolume(qreal volume);
-    QAudioDeviceInfo audioInput() const;
-    bool setAudioInput(const QAudioDeviceInfo &info);
+    QAudioDevice audioInput() const;
+    bool setAudioInput(const QAudioDevice &info);
 
     bool startRecording(const QString &fileName);
     void stopRecording();
@@ -115,11 +115,11 @@ private:
                                 qreal frameRate, QMediaEncoderSettings::Quality quality);
     quint32 estimateAudioBitRate(const GUID &audioFormat, QMediaEncoderSettings::Quality quality);
     bool m_active = false;
-    QCameraInfo m_activeCameraInfo;
+    QCameraDevice m_activeCameraInfo;
     QCameraFormat m_cameraFormat;
     QWindowsCameraReader *m_cameraReader = nullptr;
     QMediaEncoderSettings m_mediaEncoderSettings;
-    QAudioDeviceInfo m_audioInput;
+    QAudioDevice m_audioInput;
     QVideoSink  *m_surface = nullptr;
 };
 
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
index c8f093546..86cd1eb56 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture.cpp
@@ -44,7 +44,7 @@
 #include "qwindowscamerasession_p.h"
 #include "qwindowscameraimagecapture_p.h"
 #include "qmediadevices.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -138,12 +138,12 @@ void QWindowsMediaCaptureService::setVolume(qreal volume)
     m_cameraSession->setVolume(volume);
 }
 
-QAudioDeviceInfo QWindowsMediaCaptureService::audioInput() const
+QAudioDevice QWindowsMediaCaptureService::audioInput() const
 {
     return m_cameraSession->audioInput();
 }
 
-bool QWindowsMediaCaptureService::setAudioInput(const QAudioDeviceInfo &info)
+bool QWindowsMediaCaptureService::setAudioInput(const QAudioDevice &info)
 {
     return m_cameraSession->setAudioInput(info);
 }
diff --git a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
index 4b8eb42a5..d7ecbfe5a 100644
--- a/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
+++ b/src/multimedia/platform/windows/mediacapture/qwindowsmediacapture_p.h
@@ -81,8 +81,8 @@ public:
     void setMuted(bool muted) override;
     qreal volume() const override;
     void setVolume(qreal volume) override;
-    QAudioDeviceInfo audioInput() const override;
-    bool setAudioInput(const QAudioDeviceInfo &) override;
+    QAudioDevice audioInput() const override;
+    bool setAudioInput(const QAudioDevice &) override;
 
     void setVideoPreview(QVideoSink *sink) override;
 
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
index c91d7b023..117cd402c 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp
+++ b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
@@ -126,12 +126,12 @@ QMediaMetaData MFPlayerControl::metaData() const
     return m_session->metaData();
 }
 
-bool MFPlayerControl::setAudioOutput(const QAudioDeviceInfo &info)
+bool MFPlayerControl::setAudioOutput(const QAudioDevice &info)
 {
     return m_session->setAudioOutput(info);
 }
 
-QAudioDeviceInfo MFPlayerControl::audioOutput() const
+QAudioDevice MFPlayerControl::audioOutput() const
 {
     return m_session->audioOutput();
 }
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol_p.h b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
index a3a0f318e..8433ae58a 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol_p.h
+++ b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
@@ -105,8 +105,8 @@ public:
 
     QMediaMetaData metaData() const override;
 
-    bool setAudioOutput(const QAudioDeviceInfo &) override;
-    QAudioDeviceInfo audioOutput() const override;
+    bool setAudioOutput(const QAudioDevice &) override;
+    QAudioDevice audioOutput() const override;
 
     void setVideoSink(QVideoSink *sink) override;
 
diff --git a/src/multimedia/platform/windows/player/mfplayersession.cpp b/src/multimedia/platform/windows/player/mfplayersession.cpp
index cfda2a712..b2afca6bf 100644
--- a/src/multimedia/platform/windows/player/mfplayersession.cpp
+++ b/src/multimedia/platform/windows/player/mfplayersession.cpp
@@ -1811,7 +1811,7 @@ void MFPlayerSession::clear()
     }
 }
 
-bool MFPlayerSession::setAudioOutput(const QAudioDeviceInfo &device)
+bool MFPlayerSession::setAudioOutput(const QAudioDevice &device)
 {
     // ### This doesn't yet update the output routing during playback
     // ie. it currently only works before the first play().
diff --git a/src/multimedia/platform/windows/player/mfplayersession_p.h b/src/multimedia/platform/windows/player/mfplayersession_p.h
index 78ba00879..9f035e4c2 100644
--- a/src/multimedia/platform/windows/player/mfplayersession_p.h
+++ b/src/multimedia/platform/windows/player/mfplayersession_p.h
@@ -63,7 +63,7 @@
 #include <QtCore/qwaitcondition.h>
 #include <QtMultimedia/qaudioformat.h>
 #include <QtMultimedia/qvideoframeformat.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include "mfplayercontrol_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -124,8 +124,8 @@ public:
     void close();
     void clearPlayer() { m_playerControl = nullptr; }
 
-    bool setAudioOutput(const QAudioDeviceInfo &device);
-    QAudioDeviceInfo audioOutput() const { return m_audioOutput; }
+    bool setAudioOutput(const QAudioDevice &device);
+    QAudioDevice audioOutput() const { return m_audioOutput; }
 
     QMediaMetaData metaData() const { return m_metaData; }
 
@@ -227,7 +227,7 @@ private:
     int m_volume;
     bool m_muted;
 
-    QAudioDeviceInfo m_audioOutput;
+    QAudioDevice m_audioOutput;
     QMediaMetaData m_metaData;
 
     void setVolumeInternal(int volume);
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
index 14ffc4db3..d8af3da9e 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp
+++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
@@ -39,12 +39,12 @@
 
 #include "qwindowsmediadevices_p.h"
 #include "qmediadevices.h"
-#include "qcamerainfo_p.h"
+#include "qcameradevice_p.h"
 #include "qvarlengtharray.h"
 
 #include "private/qwindowsaudiosource_p.h"
 #include "private/qwindowsaudiosink_p.h"
-#include "private/qwindowsaudiodeviceinfo_p.h"
+#include "private/qwindowsaudiodevice_p.h"
 #include "private/qwindowsmultimediautils_p.h"
 
 #include <private/mftvideo_p.h>
@@ -320,7 +320,7 @@ QWindowsMediaDevices::~QWindowsMediaDevices()
     CoUninitialize();
 }
 
-QList<QAudioDeviceInfo> QWindowsMediaDevices::availableDevices(QAudio::Mode mode) const
+QList<QAudioDevice> QWindowsMediaDevices::availableDevices(QAudio::Mode mode) const
 {
     const auto audioOut = mode == QAudio::AudioOutput;
 
@@ -338,7 +338,7 @@ QList<QAudioDeviceInfo> QWindowsMediaDevices::availableDevices(QAudio::Mode mode
         return sid.toUtf8();
     }();
 
-    QList<QAudioDeviceInfo> devices;
+    QList<QAudioDevice> devices;
 
     auto waveDevices = audioOut ? waveOutGetNumDevs() : waveInGetNumDevs();
 
@@ -382,19 +382,19 @@ QList<QAudioDeviceInfo> QWindowsMediaDevices::availableDevices(QAudio::Mode mode
     return devices;
 }
 
-QList<QAudioDeviceInfo> QWindowsMediaDevices::audioInputs() const
+QList<QAudioDevice> QWindowsMediaDevices::audioInputs() const
 {
     return availableDevices(QAudio::AudioInput);
 }
 
-QList<QAudioDeviceInfo> QWindowsMediaDevices::audioOutputs() const
+QList<QAudioDevice> QWindowsMediaDevices::audioOutputs() const
 {
     return availableDevices(QAudio::AudioOutput);
 }
 
-QList<QCameraInfo> QWindowsMediaDevices::videoInputs() const
+QList<QCameraDevice> QWindowsMediaDevices::videoInputs() const
 {
-    QList<QCameraInfo> cameras;
+    QList<QCameraDevice> cameras;
 
     IMFAttributes *pAttributes = NULL;
     IMFActivate **ppDevices = NULL;
@@ -413,7 +413,7 @@ QList<QCameraInfo> QWindowsMediaDevices::videoInputs() const
             if (SUCCEEDED(hr)) {
                 // Iterate through devices.
                 for (int index = 0; index < int(count); index++) {
-                    QCameraInfoPrivate *info = new QCameraInfoPrivate;
+                    QCameraDevicePrivate *info = new QCameraDevicePrivate;
 
                     IMFMediaSource *pSource = NULL;
                     IMFSourceReader *reader = NULL;
@@ -517,13 +517,13 @@ QList<QCameraInfo> QWindowsMediaDevices::videoInputs() const
     return cameras;
 }
 
-QPlatformAudioSource *QWindowsMediaDevices::createAudioSource(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSource *QWindowsMediaDevices::createAudioSource(const QAudioDevice &deviceInfo)
 {
     const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle());
     return new QWindowsAudioSource(devInfo->waveId());
 }
 
-QPlatformAudioSink *QWindowsMediaDevices::createAudioSink(const QAudioDeviceInfo &deviceInfo)
+QPlatformAudioSink *QWindowsMediaDevices::createAudioSink(const QAudioDevice &deviceInfo)
 {
     const auto *devInfo = static_cast<const QWindowsAudioDeviceInfo *>(deviceInfo.handle());
     return new QWindowsAudioSink(devInfo->waveId());
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
index 6582b932a..30f91d2c1 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
@@ -71,14 +71,14 @@ public:
     QWindowsMediaDevices();
     virtual ~QWindowsMediaDevices();
 
-    QList<QAudioDeviceInfo> audioInputs() const override;
-    QList<QAudioDeviceInfo> audioOutputs() const override;
-    QList<QCameraInfo> videoInputs() const override;
-    QPlatformAudioSource *createAudioSource(const QAudioDeviceInfo &deviceInfo) override;
-    QPlatformAudioSink *createAudioSink(const QAudioDeviceInfo &deviceInfo) override;
+    QList<QAudioDevice> audioInputs() const override;
+    QList<QAudioDevice> audioOutputs() const override;
+    QList<QCameraDevice> videoInputs() const override;
+    QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override;
+    QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 
 private:
-    QList<QAudioDeviceInfo> availableDevices(QAudio::Mode mode) const;
+    QList<QAudioDevice> availableDevices(QAudio::Mode mode) const;
 
     QWindowsIUPointer<IMMDeviceEnumerator> m_deviceEnumerator;
     QWindowsIUPointer<CMMNotificationClient> m_notificationClient;
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 60d15f9e6..38e8aff0e 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -554,17 +554,17 @@ void QMediaPlayer::setSource(const QUrl &source, QIODevice *stream)
 /*!
     Sets the audio output to \a device.
 
-    Setting a null QAudioDeviceInfo, sets the output to the system default.
+    Setting a null QAudioDevice, sets the output to the system default.
 
     Returns true if the output could be changed, false otherwise.
  */
-bool QMediaPlayer::setAudioOutput(const QAudioDeviceInfo &device)
+bool QMediaPlayer::setAudioOutput(const QAudioDevice &device)
 {
     Q_D(QMediaPlayer);
     return d->control->setAudioOutput(device);
 }
 
-QAudioDeviceInfo QMediaPlayer::audioOutput() const
+QAudioDevice QMediaPlayer::audioOutput() const
 {
     Q_D(const QMediaPlayer);
     return d->control->audioOutput();
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 4ee762fed..1b1ab6e75 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -48,7 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 class QVideoSink;
-class QAudioDeviceInfo;
+class QAudioDevice;
 class QMediaMetaData;
 class QMediaTimeRange;
 
@@ -114,8 +114,8 @@ public:
 //    bool enableLowLatencyPlayback(bool tryEnable);
 //    bool isLowLatencyPlaybackEnabled() const;
 
-    bool setAudioOutput(const QAudioDeviceInfo &device);
-    QAudioDeviceInfo audioOutput() const;
+    bool setAudioOutput(const QAudioDevice &device);
+    QAudioDevice audioOutput() const;
 
     QList<QMediaMetaData> audioTracks() const;
     QList<QMediaMetaData> videoTracks() const;
diff --git a/src/multimedia/qmediadevices.cpp b/src/multimedia/qmediadevices.cpp
index 8bb87cc6d..039274f57 100644
--- a/src/multimedia/qmediadevices.cpp
+++ b/src/multimedia/qmediadevices.cpp
@@ -41,8 +41,8 @@
 #include "private/qplatformmediaintegration_p.h"
 #include "private/qplatformmediadevices_p.h"
 
-#include <qaudiodeviceinfo.h>
-#include <qcamerainfo.h>
+#include <qaudiodevice.h>
+#include <qcameradevice.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE
     Those devices are usually microphones, either built-in, or connected to
     the device through e.g. USB or Bluetooth.
 */
-QList<QAudioDeviceInfo> QMediaDevices::audioInputs()
+QList<QAudioDevice> QMediaDevices::audioInputs()
 {
     return QPlatformMediaIntegration::instance()->devices()->audioInputs();
 }
@@ -88,7 +88,7 @@ QList<QAudioDeviceInfo> QMediaDevices::audioInputs()
     Those devices are usually loudspeakers or head sets, either built-in,
     or connected to the device through e.g. USB or Bluetooth.
 */
-QList<QAudioDeviceInfo> QMediaDevices::audioOutputs()
+QList<QAudioDevice> QMediaDevices::audioOutputs()
 {
     return QPlatformMediaIntegration::instance()->devices()->audioOutputs();
 }
@@ -96,7 +96,7 @@ QList<QAudioDeviceInfo> QMediaDevices::audioOutputs()
 /*!
     Returns a list of available cameras on the system.
 */
-QList<QCameraInfo> QMediaDevices::videoInputs()
+QList<QCameraDevice> QMediaDevices::videoInputs()
 {
     return QPlatformMediaIntegration::instance()->devices()->videoInputs();
 }
@@ -107,7 +107,7 @@ QList<QCameraInfo> QMediaDevices::videoInputs()
     The default device can change during the runtime of the application. The audioInputsChanged()
     signal will get emitted in that case.
 */
-QAudioDeviceInfo QMediaDevices::defaultAudioInput()
+QAudioDevice QMediaDevices::defaultAudioInput()
 {
     const auto inputs = audioInputs();
     for (const auto &info : inputs)
@@ -122,7 +122,7 @@ QAudioDeviceInfo QMediaDevices::defaultAudioInput()
     The default device can change during the runtime of the application. The audioOutputsChanged()
     signal will get emitted in that case.
 */
-QAudioDeviceInfo QMediaDevices::defaultAudioOutput()
+QAudioDevice QMediaDevices::defaultAudioOutput()
 {
     const auto outputs = audioOutputs();
     for (const auto &info : outputs)
@@ -142,7 +142,7 @@ QAudioDeviceInfo QMediaDevices::defaultAudioOutput()
 
     \sa availableCameras()
 */
-QCameraInfo QMediaDevices::defaultVideoInput()
+QCameraDevice QMediaDevices::defaultVideoInput()
 {
     const auto inputs = videoInputs();
     for (const auto &info : inputs)
diff --git a/src/multimedia/qmediadevices.h b/src/multimedia/qmediadevices.h
index 93067b33a..ee69a3da8 100644
--- a/src/multimedia/qmediadevices.h
+++ b/src/multimedia/qmediadevices.h
@@ -46,32 +46,32 @@
 
 QT_BEGIN_NAMESPACE
 
-class QAudioDeviceInfo;
-class QCameraInfo;
+class QAudioDevice;
+class QCameraDevice;
 
 class QMediaDevicesPrivate;
 
 class Q_MULTIMEDIA_EXPORT QMediaDevices : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QList<QAudioDeviceInfo> audioInputs READ audioInputs NOTIFY audioInputsChanged)
-    Q_PROPERTY(QList<QAudioDeviceInfo> audioOutputs READ audioOutputs NOTIFY audioOutputsChanged)
-    Q_PROPERTY(QList<QCameraInfo> videoInputs READ videoInputs NOTIFY videoInputsChanged)
-    Q_PROPERTY(QAudioDeviceInfo defaultAudioInput READ defaultAudioInput NOTIFY audioInputsChanged)
-    Q_PROPERTY(QAudioDeviceInfo defaultAudioOutput READ defaultAudioOutput NOTIFY audioOutputsChanged)
-    Q_PROPERTY(QCameraInfo defaultVideoInput READ defaultVideoInput NOTIFY videoInputsChanged)
+    Q_PROPERTY(QList<QAudioDevice> audioInputs READ audioInputs NOTIFY audioInputsChanged)
+    Q_PROPERTY(QList<QAudioDevice> audioOutputs READ audioOutputs NOTIFY audioOutputsChanged)
+    Q_PROPERTY(QList<QCameraDevice> videoInputs READ videoInputs NOTIFY videoInputsChanged)
+    Q_PROPERTY(QAudioDevice defaultAudioInput READ defaultAudioInput NOTIFY audioInputsChanged)
+    Q_PROPERTY(QAudioDevice defaultAudioOutput READ defaultAudioOutput NOTIFY audioOutputsChanged)
+    Q_PROPERTY(QCameraDevice defaultVideoInput READ defaultVideoInput NOTIFY videoInputsChanged)
 
 public:
     QMediaDevices(QObject *parent = nullptr);
     ~QMediaDevices();
 
-    static QList<QAudioDeviceInfo> audioInputs();
-    static QList<QAudioDeviceInfo> audioOutputs();
-    static QList<QCameraInfo> videoInputs();
+    static QList<QAudioDevice> audioInputs();
+    static QList<QAudioDevice> audioOutputs();
+    static QList<QCameraDevice> videoInputs();
 
-    static QAudioDeviceInfo defaultAudioInput();
-    static QAudioDeviceInfo defaultAudioOutput();
-    static QCameraInfo defaultVideoInput();
+    static QAudioDevice defaultAudioInput();
+    static QAudioDevice defaultAudioOutput();
+    static QCameraDevice defaultVideoInput();
 
 Q_SIGNALS:
     void audioInputsChanged();
diff --git a/src/multimedia/recording/qmediacapturesession.cpp b/src/multimedia/recording/qmediacapturesession.cpp
index 575d7def9..a12dc2c7e 100644
--- a/src/multimedia/recording/qmediacapturesession.cpp
+++ b/src/multimedia/recording/qmediacapturesession.cpp
@@ -38,7 +38,7 @@
 ****************************************************************************/
 
 #include "qmediacapturesession.h"
-#include "qaudiodeviceinfo.h"
+#include "qaudiodevice.h"
 #include "qcamera.h"
 #include "qmediaencoder.h"
 #include "qcameraimagecapture.h"
@@ -56,7 +56,7 @@ class QMediaCaptureSessionPrivate
 public:
     QMediaCaptureSession *q = nullptr;
     QPlatformMediaCaptureSession *captureSession;
-    QAudioDeviceInfo audioInput;
+    QAudioDevice audioInput;
     QCamera *camera = nullptr;
     QCameraImageCapture *imageCapture = nullptr;
     QMediaEncoder *encoder = nullptr;
@@ -96,7 +96,7 @@ public:
     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, QAudioDeviceInfo, QMediaEncoder, QCameraImageCapture, QMediaRecorder
+    \sa QCamera, QAudioDevice, QMediaEncoder, QCameraImageCapture, QMediaRecorder
 */
 
 /*!
@@ -140,21 +140,21 @@ bool QMediaCaptureSession::isAvailable() const
 /*!
     Returns the device that is being used to capture audio.
 */
-QAudioDeviceInfo QMediaCaptureSession::audioInput() const
+QAudioDevice QMediaCaptureSession::audioInput() const
 {
     return d_ptr->audioInput;
 }
 
 /*!
     Sets the audio input device to \a device. If setting it to an empty
-    QAudioDeviceInfo the capture session will use the default input as
+    QAudioDevice the capture session will use the default input as
     defined by the operating system.
 
     Use setMuted(), if you want to disable audio input.
 
     \sa muted(), setMuted()
 */
-void QMediaCaptureSession::setAudioInput(const QAudioDeviceInfo &device)
+void QMediaCaptureSession::setAudioInput(const QAudioDevice &device)
 {
     d_ptr->audioInput = device;
     d_ptr->captureSession->setAudioInput(device);
diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h
index 23701a938..947b964c9 100644
--- a/src/multimedia/recording/qmediacapturesession.h
+++ b/src/multimedia/recording/qmediacapturesession.h
@@ -46,8 +46,8 @@
 QT_BEGIN_NAMESPACE
 
 class QCamera;
-class QAudioDeviceInfo;
-class QCameraInfo;
+class QAudioDevice;
+class QCameraDevice;
 class QCameraImageCapture; // ### rename to QMediaImageCapture
 class QMediaEncoder;
 class QPlatformMediaCaptureSession;
@@ -57,7 +57,7 @@ class QMediaCaptureSessionPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaCaptureSession : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QAudioDeviceInfo audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
+    Q_PROPERTY(QAudioDevice audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
     Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
     Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged)
     Q_PROPERTY(QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
@@ -70,8 +70,8 @@ public:
 
     bool isAvailable() const;
 
-    QAudioDeviceInfo audioInput() const; // ### Should use a QAudioDevice *
-    void setAudioInput(const QAudioDeviceInfo &device);
+    QAudioDevice audioInput() const; // ### Should use a QAudioDevice *
+    void setAudioInput(const QAudioDevice &device);
 
     bool isMuted() const; // ### Should move to QAudioDevice
     void setMuted(bool muted);
diff --git a/src/multimedia/recording/qmediaencoder.cpp b/src/multimedia/recording/qmediaencoder.cpp
index 9bb4f6696..38bccde8e 100644
--- a/src/multimedia/recording/qmediaencoder.cpp
+++ b/src/multimedia/recording/qmediaencoder.cpp
@@ -40,7 +40,7 @@
 #include "qmediaencoder_p.h"
 
 #include <private/qplatformmediaencoder_p.h>
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qcamera.h>
 #include <qmediacapturesession.h>
 #include <private/qplatformcamera_p.h>
diff --git a/src/multimedia/recording/qmediaencoder.h b/src/multimedia/recording/qmediaencoder.h
index a66a997f3..02bc49ee2 100644
--- a/src/multimedia/recording/qmediaencoder.h
+++ b/src/multimedia/recording/qmediaencoder.h
@@ -54,11 +54,11 @@ class QUrl;
 class QSize;
 class QAudioFormat;
 class QCamera;
-class QCameraInfo;
+class QCameraDevice;
 class QMediaRecorderService;
 class QAudioEncoderSettings;
 class QVideoEncoderSettings;
-class QAudioDeviceInfo;
+class QAudioDevice;
 class QMediaCaptureSession;
 
 class Q_MULTIMEDIA_EXPORT QMediaEncoderBase : public QObject
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 72e9b199b..6986cd2b7 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -39,7 +39,7 @@
 
 #include "qmediarecorder.h"
 
-#include <qaudiodeviceinfo.h>
+#include <qaudiodevice.h>
 #include <qcamera.h>
 #include <qmediacapturesession.h>
 #include <qmediaencoder.h>
diff --git a/src/multimediaquick/qtmultimediaquicktypes_p.h b/src/multimediaquick/qtmultimediaquicktypes_p.h
index 91f54f218..8275cd29e 100644
--- a/src/multimediaquick/qtmultimediaquicktypes_p.h
+++ b/src/multimediaquick/qtmultimediaquicktypes_p.h
@@ -113,18 +113,18 @@ struct QMediaDevicesForeign
     QML_NAMED_ELEMENT(MediaDevices)
 };
 
-struct QAudioDeviceInfoForeign
+struct QAudioDeviceForeign
 {
     Q_GADGET
-    QML_FOREIGN(QAudioDeviceInfo)
-    QML_NAMED_ELEMENT(audioDeviceInfo)
+    QML_FOREIGN(QAudioDevice)
+    QML_NAMED_ELEMENT(audioDevice)
 };
 
-struct QCameraInfoForeign
+struct QCameraDeviceForeign
 {
     Q_GADGET
-    QML_FOREIGN(QCameraInfo)
-    QML_NAMED_ELEMENT(cameraInfo)
+    QML_FOREIGN(QCameraDevice)
+    QML_NAMED_ELEMENT(cameraDevice)
 };
 
 struct QMediaFormatForeign
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"