Move the QAudio::Mode enum inside QAudioDevice

QAudioDevice is the only class using that enum, so it makes
more sense for the enum to live there.

Change-Id: I11e6768d1114d63e68d1956f7d6e62786524c291
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

46 files changed, 148 insertions, 156 deletions

diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index ecd097a50..c4a57f29f 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -124,7 +124,7 @@ void AudioTest::test()
 void AudioTest::updateAudioDevices()
 {
     deviceBox->clear();
-    const auto devices = m_mode == QAudio::AudioInput ? m_devices->audioInputs() : m_devices->audioOutputs();
+    const auto devices = m_mode == QAudioDevice::Input ? m_devices->audioInputs() : m_devices->audioOutputs();
     for (auto &deviceInfo: devices)
         deviceBox->addItem(deviceInfo.description(), QVariant::fromValue(deviceInfo));
 }
@@ -133,7 +133,7 @@ void AudioTest::updateAudioDevices()
 void AudioTest::modeChanged(int idx)
 {
     testResult->clear();
-    m_mode = idx == 0 ? QAudio::AudioInput : QAudio::AudioOutput;
+    m_mode = idx == 0 ? QAudioDevice::Input : QAudioDevice::Output;
     updateAudioDevices();
     deviceBox->setCurrentIndex(0);
     deviceChanged(0);
diff --git a/examples/multimedia/audiodevices/audiodevices.h b/examples/multimedia/audiodevices/audiodevices.h
index 18c968ca1..a2c5325bc 100644
--- a/examples/multimedia/audiodevices/audiodevices.h
+++ b/examples/multimedia/audiodevices/audiodevices.h
@@ -75,7 +75,7 @@ public:
 private:
     QAudioDevice m_deviceInfo;
     QAudioFormat m_settings;
-    QAudio::Mode m_mode = QAudio::AudioInput;
+    QAudioDevice::Mode m_mode = QAudioDevice::Input;
     QMediaDevices *m_devices = nullptr;
 
 private slots:
diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 78aef1412..6d07a9817 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -78,7 +78,7 @@ const int    LevelWindowUs          = 0.1 * 1000000;
 
 Engine::Engine(QObject *parent)
     :   QObject(parent)
-    ,   m_mode(QAudio::AudioInput)
+    ,   m_mode(QAudioDevice::Input)
     ,   m_state(QAudio::StoppedState)
     ,   m_devices(new QMediaDevices(this))
     ,   m_generateTone(false)
@@ -225,7 +225,7 @@ void Engine::setWindowFunction(WindowFunction type)
 void Engine::startRecording()
 {
     if (m_audioInput) {
-        if (QAudio::AudioInput == m_mode &&
+        if (QAudioDevice::Input == m_mode &&
             QAudio::SuspendedState == m_state) {
             m_audioInput->resume();
         } else {
@@ -235,7 +235,7 @@ void Engine::startRecording()
             m_buffer.fill(0);
             setRecordPosition(0, true);
             stopPlayback();
-            m_mode = QAudio::AudioInput;
+            m_mode = QAudioDevice::Input;
             connect(m_audioInput, &QAudioSource::stateChanged,
                     this, &Engine::audioStateChanged);
 
@@ -253,7 +253,7 @@ void Engine::startRecording()
 void Engine::startPlayback()
 {
     if (m_audioOutput) {
-        if (QAudio::AudioOutput == m_mode &&
+        if (QAudioDevice::Output == m_mode &&
             QAudio::SuspendedState == m_state) {
 #ifdef Q_OS_WIN
             // The Windows backend seems to internally go back into ActiveState
@@ -267,7 +267,7 @@ void Engine::startPlayback()
             spectrumChanged(0, 0, FrequencySpectrum());
             setPlayPosition(0, true);
             stopRecording();
-            m_mode = QAudio::AudioOutput;
+            m_mode = QAudioDevice::Output;
             connect(m_audioOutput, &QAudioSink::stateChanged,
                     this, &Engine::audioStateChanged);
 
@@ -293,10 +293,10 @@ void Engine::suspend()
     if (QAudio::ActiveState == m_state ||
         QAudio::IdleState == m_state) {
         switch (m_mode) {
-        case QAudio::AudioInput:
+        case QAudioDevice::Input:
             m_audioInput->suspend();
             break;
-        case QAudio::AudioOutput:
+        case QAudioDevice::Output:
             m_audioOutput->suspend();
             break;
         }
@@ -328,7 +328,7 @@ void Engine::setAudioOutputDevice(const QAudioDevice &device)
 void Engine::audioNotify()
 {
     switch (m_mode) {
-    case QAudio::AudioInput: {
+    case QAudioDevice::Input: {
             const qint64 recordPosition = qMin(m_bufferLength, m_format.bytesForDuration(m_audioInput->processedUSecs()));
             setRecordPosition(recordPosition);
             const qint64 levelPosition = m_dataLength - m_levelBufferLength;
@@ -341,7 +341,7 @@ void Engine::audioNotify()
             emit bufferChanged(0, m_dataLength, m_buffer);
         }
         break;
-    case QAudio::AudioOutput: {
+    case QAudioDevice::Output: {
             const qint64 playPosition = m_format.bytesForDuration(m_audioOutput->processedUSecs());
             setPlayPosition(qMin(bufferLength(), playPosition));
             const qint64 levelPosition = playPosition - m_levelBufferLength;
@@ -395,10 +395,10 @@ void Engine::audioStateChanged(QAudio::State state)
             // Check error
             QAudio::Error error = QAudio::NoError;
             switch (m_mode) {
-            case QAudio::AudioInput:
+            case QAudioDevice::Input:
                 error = m_audioInput->error();
                 break;
-            case QAudio::AudioOutput:
+            case QAudioDevice::Output:
                 error = m_audioOutput->error();
                 break;
             }
@@ -459,7 +459,7 @@ void Engine::reset()
 {
     stopRecording();
     stopPlayback();
-    setState(QAudio::AudioInput, QAudio::StoppedState);
+    setState(QAudioDevice::Input, QAudio::StoppedState);
     setFormat(QAudioFormat());
     m_generateTone = false;
     delete m_file;
@@ -604,7 +604,7 @@ void Engine::setState(QAudio::State state)
         emit stateChanged(m_mode, m_state);
 }
 
-void Engine::setState(QAudio::Mode mode, QAudio::State state)
+void Engine::setState(QAudioDevice::Mode mode, QAudio::State state)
 {
     const bool changed = (m_mode != mode || m_state != state);
     m_mode = mode;
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index 1ee87a2a5..449884251 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -99,7 +99,7 @@ public:
     const QList<QAudioDevice> &availableAudioOutputDevices() const
                                     { return m_availableAudioOutputDevices; }
 
-    QAudio::Mode mode() const { return m_mode; }
+    QAudioDevice::Mode mode() const { return m_mode; }
     QAudio::State state() const { return m_state; }
 
     /**
@@ -182,7 +182,7 @@ public slots:
     void setAudioOutputDevice(const QAudioDevice &device);
 
 signals:
-    void stateChanged(QAudio::Mode mode, QAudio::State state);
+    void stateChanged(QAudioDevice::Mode mode, QAudio::State state);
 
     /**
      * Informational message for non-modal display
@@ -259,7 +259,7 @@ private:
     void stopRecording();
     void stopPlayback();
     void setState(QAudio::State state);
-    void setState(QAudio::Mode mode, QAudio::State state);
+    void setState(QAudioDevice::Mode mode, QAudio::State state);
     void setFormat(const QAudioFormat &format);
     void setRecordPosition(qint64 position, bool forceEmit = false);
     void setPlayPosition(qint64 position, bool forceEmit = false);
@@ -277,7 +277,7 @@ private:
 #endif
 
 private:
-    QAudio::Mode        m_mode;
+    QAudioDevice::Mode        m_mode;
     QAudio::State       m_state;
     QMediaDevices      *m_devices;
 
diff --git a/examples/multimedia/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
index 9a6fa0ac5..2dbfda9ab 100644
--- a/examples/multimedia/spectrum/app/mainwidget.cpp
+++ b/examples/multimedia/spectrum/app/mainwidget.cpp
@@ -110,7 +110,7 @@ MainWidget::~MainWidget() = default;
 // Public slots
 //-----------------------------------------------------------------------------
 
-void MainWidget::stateChanged(QAudio::Mode mode, QAudio::State state)
+void MainWidget::stateChanged(QAudioDevice::Mode mode, QAudio::State state)
 {
     Q_UNUSED(mode);
 
@@ -409,7 +409,7 @@ void MainWidget::createMenus()
 
 void MainWidget::updateButtonStates()
 {
-    const bool recordEnabled = ((QAudio::AudioOutput == m_engine->mode() ||
+    const bool recordEnabled = ((QAudioDevice::Output == m_engine->mode() ||
                                 (QAudio::ActiveState != m_engine->state() &&
                                  QAudio::IdleState != m_engine->state())) &&
                                 RecordMode == m_mode);
@@ -420,7 +420,7 @@ void MainWidget::updateButtonStates()
     m_pauseButton->setEnabled(pauseEnabled);
 
     const bool playEnabled = (/*m_engine->dataLength() &&*/
-                              (QAudio::AudioOutput != m_engine->mode() ||
+                              (QAudioDevice::Output != m_engine->mode() ||
                                (QAudio::ActiveState != m_engine->state() &&
                                 QAudio::IdleState != m_engine->state())));
     m_playButton->setEnabled(playEnabled);
diff --git a/examples/multimedia/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h
index 2ff863a13..d2340daae 100644
--- a/examples/multimedia/spectrum/app/mainwidget.h
+++ b/examples/multimedia/spectrum/app/mainwidget.h
@@ -51,7 +51,7 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
-#include <QAudio>
+#include <QAudioDevice>
 #include <QIcon>
 #include <QWidget>
 
@@ -88,7 +88,7 @@ public:
     void timerEvent(QTimerEvent *event) override;
 
 public slots:
-    void stateChanged(QAudio::Mode mode, QAudio::State state);
+    void stateChanged(QAudioDevice::Mode mode, QAudio::State state);
     void formatChanged(const QAudioFormat &format);
     void spectrumChanged(qint64 position, qint64 length,
                          const FrequencySpectrum &spectrum);
diff --git a/src/multimedia/audio/qaudio.cpp b/src/multimedia/audio/qaudio.cpp
index 1ded74e99..e45a67868 100644
--- a/src/multimedia/audio/qaudio.cpp
+++ b/src/multimedia/audio/qaudio.cpp
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \enum QAudio::Mode
+    \enum QAudioDevice::Mode
 
     \value AudioOutput   audio output device
     \value AudioInput    audio input device
@@ -280,21 +280,6 @@ QDebug operator<<(QDebug dbg, QAudio::State state)
     return dbg;
 }
 
-QDebug operator<<(QDebug dbg, QAudio::Mode mode)
-{
-    QDebugStateSaver saver(dbg);
-    dbg.nospace();
-    switch (mode) {
-        case QAudio::AudioInput:
-            dbg << "AudioInput";
-            break;
-        case QAudio::AudioOutput:
-            dbg << "AudioOutput";
-            break;
-    }
-    return dbg;
-}
-
 QDebug operator<<(QDebug dbg, QAudio::Role role)
 {
     QDebugStateSaver saver(dbg);
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index a3c844318..c7852ecfc 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -55,7 +55,6 @@ namespace QAudio
 {
     enum Error { NoError, OpenError, IOError, UnderrunError, FatalError };
     enum State { ActiveState, SuspendedState, StoppedState, IdleState };
-    enum Mode { AudioInput, AudioOutput };
 
     enum Role {
         UnknownRole,
@@ -83,7 +82,6 @@ namespace QAudio
 #ifndef QT_NO_DEBUG_STREAM
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Error error);
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::State state);
-Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Mode mode);
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Role role);
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::VolumeScale role);
 #endif
diff --git a/src/multimedia/audio/qaudiodevice.cpp b/src/multimedia/audio/qaudiodevice.cpp
index dc4615c79..bfba09e32 100644
--- a/src/multimedia/audio/qaudiodevice.cpp
+++ b/src/multimedia/audio/qaudiodevice.cpp
@@ -274,9 +274,26 @@ QAudioDevice::QAudioDevice(QAudioDevicePrivate *p)
 /*!
     returns whether this device is an input or output device.
 */
-QAudio::Mode QAudioDevice::mode() const
+QAudioDevice::Mode QAudioDevice::mode() const
 {
     return d->mode;
 }
 
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug dbg, QAudioDevice::Mode mode)
+{
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    switch (mode) {
+    case QAudioDevice::Input:
+        dbg << "QAudioDevice::Input";
+        break;
+    case QAudioDevice::Output:
+        dbg << "QAudioDevice::Output";
+        break;
+    }
+    return dbg;
+}
+#endif
+
 QT_END_NAMESPACE
diff --git a/src/multimedia/audio/qaudiodevice.h b/src/multimedia/audio/qaudiodevice.h
index 5afd1ebfa..4541f60bc 100644
--- a/src/multimedia/audio/qaudiodevice.h
+++ b/src/multimedia/audio/qaudiodevice.h
@@ -64,6 +64,12 @@ class Q_MULTIMEDIA_EXPORT QAudioDevice
     Q_PROPERTY(QString description READ description CONSTANT)
     Q_PROPERTY(bool isDefault READ isDefault CONSTANT)
 public:
+    enum Mode {
+        Input,
+        Output
+    };
+    Q_ENUM(Mode)
+
     QAudioDevice();
     QAudioDevice(const QAudioDevice& other);
     ~QAudioDevice();
@@ -84,7 +90,7 @@ public:
     QString description() const;
 
     bool isDefault() const;
-    QAudio::Mode mode() const;
+    QAudioDevice::Mode mode() const;
 
     bool isFormatSupported(const QAudioFormat &format) const;
     QAudioFormat preferredFormat() const;
@@ -102,6 +108,10 @@ private:
     QExplicitlySharedDataPointer<QAudioDevicePrivate> d;
 };
 
+#ifndef QT_NO_DEBUG_STREAM
+Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudioDevice::Mode mode);
+#endif
+
 QT_END_NAMESPACE
 
 #endif // QAUDIODEVICEINFO_H
diff --git a/src/multimedia/audio/qaudiodevice_p.h b/src/multimedia/audio/qaudiodevice_p.h
index dbebac034..9ab75800c 100644
--- a/src/multimedia/audio/qaudiodevice_p.h
+++ b/src/multimedia/audio/qaudiodevice_p.h
@@ -59,13 +59,13 @@ QT_BEGIN_NAMESPACE
 class QAudioDevicePrivate : public QSharedData
 {
 public:
-    QAudioDevicePrivate(const QByteArray &i, QAudio::Mode m)
+    QAudioDevicePrivate(const QByteArray &i, QAudioDevice::Mode m)
         : id(i),
           mode(m)
     {}
     virtual ~QAudioDevicePrivate();
     QByteArray  id;
-    QAudio::Mode mode = QAudio::AudioOutput;
+    QAudioDevice::Mode mode = QAudioDevice::Output;
     bool isDefault = false;
 
     QAudioFormat preferredFormat;
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp
index c8e4a1bfc..4d65aee3a 100644
--- a/src/multimedia/audio/qaudioinput.cpp
+++ b/src/multimedia/audio/qaudioinput.cpp
@@ -95,7 +95,7 @@ QAudioInput::QAudioInput(const QAudioDevice &device, QObject *parent)
     d(QPlatformMediaIntegration::instance()->createAudioInput(this))
 {
     d->device = device;
-    if (!d->device.isNull() && d->device.mode() != QAudio::AudioInput)
+    if (!d->device.isNull() && d->device.mode() != QAudioDevice::Input)
         d->device = QMediaDevices::defaultAudioInput();
     d->setAudioDevice(d->device);
 }
@@ -112,7 +112,7 @@ QAudioDevice QAudioInput::device() const
 
 void QAudioInput::setDevice(const QAudioDevice &device)
 {
-    if (device.mode() != QAudio::AudioInput)
+    if (device.mode() != QAudioDevice::Input)
         return;
     d->device = device;
     d->setAudioDevice(device);
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp
index c29251533..2f03f78b2 100644
--- a/src/multimedia/audio/qaudiooutput.cpp
+++ b/src/multimedia/audio/qaudiooutput.cpp
@@ -106,7 +106,7 @@ QAudioOutput::QAudioOutput(const QAudioDevice &device, QObject *parent)
     d(QPlatformMediaIntegration::instance()->createAudioOutput(this))
 {
     d->device = device;
-    if (!d->device.isNull() && d->device.mode() != QAudio::AudioOutput)
+    if (!d->device.isNull() && d->device.mode() != QAudioDevice::Output)
         d->device = QMediaDevices::defaultAudioOutput();
     d->setAudioDevice(d->device);
 }
@@ -123,7 +123,7 @@ QAudioDevice QAudioOutput::device() const
 
 void QAudioOutput::setDevice(const QAudioDevice &device)
 {
-    if (!device.isNull() && device.mode() != QAudio::AudioOutput)
+    if (!device.isNull() && device.mode() != QAudioDevice::Output)
         return;
     if (d->device == device)
         return;
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
index 6cc3d3151..24045adab 100644
--- a/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
+++ b/src/multimedia/doc/snippets/multimedia-snippets/audio.cpp
@@ -203,7 +203,7 @@ void AudioDeviceInfo()
     //! [Setting audio format]
 
     //! [Dumping audio formats]
-    const auto deviceInfos = QMediaDevices::availableDevices(QAudio::AudioOutput);
+    const auto deviceInfos = QMediaDevices::availableDevices(QAudioDevice::Output);
     for (const QAudioDevice &deviceInfo : deviceInfos)
         qDebug() << "Device: " << deviceInfo.description();
     //! [Dumping audio formats]
diff --git a/src/multimedia/platform/alsa/qalsaaudiodevice.cpp b/src/multimedia/platform/alsa/qalsaaudiodevice.cpp
index 1b0ed0941..ed0aa0030 100644
--- a/src/multimedia/platform/alsa/qalsaaudiodevice.cpp
+++ b/src/multimedia/platform/alsa/qalsaaudiodevice.cpp
@@ -54,7 +54,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QAlsaAudioDeviceInfo::QAlsaAudioDeviceInfo(const QByteArray &dev, const QString &desc, QAudio::Mode mode)
+QAlsaAudioDeviceInfo::QAlsaAudioDeviceInfo(const QByteArray &dev, const QString &desc, QAudioDevice::Mode mode)
     : QAudioDevicePrivate(dev, mode)
 {
     description = desc;
@@ -100,7 +100,7 @@ void QAlsaAudioDeviceInfo::checkSurround()
         io = snd_device_name_get_hint(*n, "IOID");
         if((name != NULL) && (descr != NULL)) {
             QString deviceName = QLatin1String(name);
-            if (mode == QAudio::AudioOutput) {
+            if (mode == QAudioDevice::Output) {
                 if(deviceName.contains(QLatin1String("surround40")))
                     surround40 = true;
                 if(deviceName.contains(QLatin1String("surround51")))
diff --git a/src/multimedia/platform/alsa/qalsaaudiodevice_p.h b/src/multimedia/platform/alsa/qalsaaudiodevice_p.h
index 9c946dc34..4f7bc5757 100644
--- a/src/multimedia/platform/alsa/qalsaaudiodevice_p.h
+++ b/src/multimedia/platform/alsa/qalsaaudiodevice_p.h
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
 class QAlsaAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
-    QAlsaAudioDeviceInfo(const QByteArray &dev, const QString &description, QAudio::Mode mode);
+    QAlsaAudioDeviceInfo(const QByteArray &dev, const QString &description, QAudioDevice::Mode mode);
     ~QAlsaAudioDeviceInfo();
 
 private:
diff --git a/src/multimedia/platform/alsa/qalsamediadevices.cpp b/src/multimedia/platform/alsa/qalsamediadevices.cpp
index 6871cad16..e2561e66a 100644
--- a/src/multimedia/platform/alsa/qalsamediadevices.cpp
+++ b/src/multimedia/platform/alsa/qalsamediadevices.cpp
@@ -54,7 +54,7 @@ QAlsaMediaDevices::QAlsaMediaDevices()
 {
 }
 
-static QList<QAudioDevice> availableDevices(QAudio::Mode mode)
+static QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode)
 {
     QList<QAudioDevice> devices;
 
@@ -70,7 +70,7 @@ static QList<QAudioDevice> availableDevices(QAudio::Mode mode)
     }
     n = hints;
 
-    if(mode == QAudio::AudioInput) {
+    if(mode == QAudioDevice::Input) {
         filter = "Input";
     } else {
         filter = "Output";
@@ -102,12 +102,12 @@ static QList<QAudioDevice> availableDevices(QAudio::Mode mode)
 
 QList<QAudioDevice> QAlsaMediaDevices::audioInputs() const
 {
-    return availableDevices(QAudio::AudioInput);
+    return availableDevices(QAudioDevice::Input);
 }
 
 QList<QAudioDevice> QAlsaMediaDevices::audioOutputs() const
 {
-    return availableDevices(QAudio::AudioOutput);
+    return availableDevices(QAudioDevice::Output);
 }
 
 QList<QCameraDevice> QAlsaMediaDevices::videoInputs() const
diff --git a/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp b/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp
index 07cf9c12e..6768362f5 100644
--- a/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp
+++ b/src/multimedia/platform/android/audio/qandroidaudiodevice.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QOpenSLESDeviceInfo::QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudio::Mode mode)
+QOpenSLESDeviceInfo::QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudioDevice::Mode mode)
     : QAudioDevicePrivate(device, mode),
       m_engine(QOpenSLESEngine::instance())
 {
@@ -60,7 +60,7 @@ QOpenSLESDeviceInfo::QOpenSLESDeviceInfo(const QByteArray &device, const QString
         minimumSampleRate = sampleRates.first();
         maximumSampleRate = sampleRates.last();
     }
-    if (mode == QAudio::AudioInput)
+    if (mode == QAudioDevice::Input)
         supportedSampleFormats.append(QAudioFormat::UInt8);
     supportedSampleFormats.append(QAudioFormat::Int16);
 
diff --git a/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h b/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h
index 626037f73..81b85c9fd 100644
--- a/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h
+++ b/src/multimedia/platform/android/audio/qandroidaudiodevice_p.h
@@ -61,7 +61,7 @@ class QOpenSLESEngine;
 class QOpenSLESDeviceInfo : public QAudioDevicePrivate
 {
 public:
-    QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudio::Mode mode);
+    QOpenSLESDeviceInfo(const QByteArray &device, const QString &desc, QAudioDevice::Mode mode);
     ~QOpenSLESDeviceInfo() {}
 
 private:
diff --git a/src/multimedia/platform/android/audio/qopenslesengine.cpp b/src/multimedia/platform/android/audio/qopenslesengine.cpp
index 3bddea920..1ec3306dd 100644
--- a/src/multimedia/platform/android/audio/qopenslesengine.cpp
+++ b/src/multimedia/platform/android/audio/qopenslesengine.cpp
@@ -103,16 +103,16 @@ SLDataFormat_PCM QOpenSLESEngine::audioFormatToSLFormatPCM(const QAudioFormat &f
 
 }
 
-QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudio::Mode mode)
+QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudioDevice::Mode mode)
 {
     QList<QAudioDevice> devices;
     QJniObject devs;
-    if (mode == QAudio::AudioInput) {
+    if (mode == QAudioDevice::Input) {
         devs = QJniObject::callStaticObjectMethod(
                     "org/qtproject/qt/android/multimedia/QtAudioDeviceManager",
                     "getAudioInputDevices",
                     "()[Ljava/lang/String;");
-    } else if (mode == QAudio::AudioOutput) {
+    } else if (mode == QAudioDevice::Output) {
         devs = QJniObject::callStaticObjectMethod(
                     "org/qtproject/qt/android/multimedia/QtAudioDeviceManager",
                     "getAudioOutputDevices",
@@ -132,9 +132,9 @@ QList<QAudioDevice> QOpenSLESEngine::availableDevices(QAudio::Mode mode)
     return devices;
 }
 
-QList<int> QOpenSLESEngine::supportedChannelCounts(QAudio::Mode mode) const
+QList<int> QOpenSLESEngine::supportedChannelCounts(QAudioDevice::Mode mode) const
 {
-    if (mode == QAudio::AudioInput) {
+    if (mode == QAudioDevice::Input) {
         if (!m_checkedInputFormats)
             const_cast<QOpenSLESEngine *>(this)->checkSupportedInputFormats();
         return m_supportedInputChannelCounts;
@@ -143,9 +143,9 @@ QList<int> QOpenSLESEngine::supportedChannelCounts(QAudio::Mode mode) const
     }
 }
 
-QList<int> QOpenSLESEngine::supportedSampleRates(QAudio::Mode mode) const
+QList<int> QOpenSLESEngine::supportedSampleRates(QAudioDevice::Mode mode) const
 {
-    if (mode == QAudio::AudioInput) {
+    if (mode == QAudioDevice::Input) {
         if (!m_checkedInputFormats)
             const_cast<QOpenSLESEngine *>(this)->checkSupportedInputFormats();
         return m_supportedInputSampleRates;
diff --git a/src/multimedia/platform/android/audio/qopenslesengine_p.h b/src/multimedia/platform/android/audio/qopenslesengine_p.h
index 4427235d7..922f42378 100644
--- a/src/multimedia/platform/android/audio/qopenslesengine_p.h
+++ b/src/multimedia/platform/android/audio/qopenslesengine_p.h
@@ -74,9 +74,9 @@ public:
 
     static SLDataFormat_PCM audioFormatToSLFormatPCM(const QAudioFormat &format);
 
-    static QList<QAudioDevice> availableDevices(QAudio::Mode mode);
-    QList<int> supportedChannelCounts(QAudio::Mode mode) const;
-    QList<int> supportedSampleRates(QAudio::Mode mode) const;
+    static QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode);
+    QList<int> supportedChannelCounts(QAudioDevice::Mode mode) const;
+    QList<int> supportedSampleRates(QAudioDevice::Mode mode) const;
 
     static int getOutputValue(OutputValue type, int defaultValue = 0);
     static int getDefaultBufferSize(const QAudioFormat &format);
diff --git a/src/multimedia/platform/android/qandroidmediadevices.cpp b/src/multimedia/platform/android/qandroidmediadevices.cpp
index a0cfee354..9b888f700 100644
--- a/src/multimedia/platform/android/qandroidmediadevices.cpp
+++ b/src/multimedia/platform/android/qandroidmediadevices.cpp
@@ -57,12 +57,12 @@ QAndroidMediaDevices::QAndroidMediaDevices()
 
 QList<QAudioDevice> QAndroidMediaDevices::audioInputs() const
 {
-    return QOpenSLESEngine::availableDevices(QAudio::AudioInput);
+    return QOpenSLESEngine::availableDevices(QAudioDevice::Input);
 }
 
 QList<QAudioDevice> QAndroidMediaDevices::audioOutputs() const
 {
-    return QOpenSLESEngine::availableDevices(QAudio::AudioOutput);
+    return QOpenSLESEngine::availableDevices(QAudioDevice::Output);
 }
 
 QList<QCameraDevice> QAndroidMediaDevices::videoInputs() const
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
index d24a7c59e..8fe6f1a2c 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice.mm
@@ -53,11 +53,11 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_OS_MACOS)
-    QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(AudioDeviceID id, const QByteArray &device, QAudio::Mode mode)
+    QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(AudioDeviceID id, const QByteArray &device, QAudioDevice::Mode mode)
         : QAudioDevicePrivate(device, mode),
         m_deviceId(id)
 #else
-    QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode)
+    QCoreAudioDeviceInfo::QCoreAudioDeviceInfo(const QByteArray &device, QAudioDevice::Mode mode)
         : QAudioDevicePrivate(device, mode)
 #endif
     {
@@ -77,7 +77,7 @@ QAudioFormat QCoreAudioDeviceInfo::determinePreferredFormat() const
 
 #if defined(Q_OS_MACOS)
     UInt32  propSize = 0;
-    AudioObjectPropertyScope audioDevicePropertyScope = mode == QAudio::AudioInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
+    AudioObjectPropertyScope audioDevicePropertyScope = mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
     AudioObjectPropertyAddress audioDevicePropertyStreamsAddress = { kAudioDevicePropertyStreams,
                                                                      audioDevicePropertyScope,
                                                                      kAudioObjectPropertyElementMaster };
@@ -119,7 +119,7 @@ QAudioFormat QCoreAudioDeviceInfo::determinePreferredFormat() const
     {
         format.setSampleRate(44100);
         format.setSampleFormat(QAudioFormat::Int16);
-        format.setChannelCount(mode == QAudio::AudioInput ? 1 : 2);
+        format.setChannelCount(mode == QAudioDevice::Input ? 1 : 2);
     }
 
     return format;
@@ -131,7 +131,7 @@ QString QCoreAudioDeviceInfo::getDescription() const
 #ifdef Q_OS_MACOS
     CFStringRef name;
     UInt32 size = sizeof(CFStringRef);
-    AudioObjectPropertyScope audioPropertyScope = mode == QAudio::AudioInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
+    AudioObjectPropertyScope audioPropertyScope = mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
 
     AudioObjectPropertyAddress audioDeviceNamePropertyAddress = { kAudioObjectPropertyName,
                                                                   audioPropertyScope,
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
index 30aead354..8a1ad502d 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiodevice_p.h
@@ -63,9 +63,9 @@ class QCoreAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
 #if defined(Q_OS_MACOS)
-    QCoreAudioDeviceInfo(AudioDeviceID id, const QByteArray &device, QAudio::Mode mode);
+    QCoreAudioDeviceInfo(AudioDeviceID id, const QByteArray &device, QAudioDevice::Mode mode);
 #else
-    QCoreAudioDeviceInfo(const QByteArray &device, QAudio::Mode mode);
+    QCoreAudioDeviceInfo(const QByteArray &device, QAudioDevice::Mode mode);
 #endif
     ~QCoreAudioDeviceInfo() {}
 
diff --git a/src/multimedia/platform/darwin/qdarwinmediadevices.mm b/src/multimedia/platform/darwin/qdarwinmediadevices.mm
index 271b3a9d1..2a71fc863 100644
--- a/src/multimedia/platform/darwin/qdarwinmediadevices.mm
+++ b/src/multimedia/platform/darwin/qdarwinmediadevices.mm
@@ -58,11 +58,11 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_OS_MACOS)
-AudioDeviceID defaultAudioDevice(QAudio::Mode mode)
+AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode)
 {
     AudioDeviceID audioDevice;
     UInt32 size = sizeof(audioDevice);
-    const AudioObjectPropertySelector selector = (mode == QAudio::AudioOutput) ? kAudioHardwarePropertyDefaultOutputDevice
+    const AudioObjectPropertySelector selector = (mode == QAudioDevice::Output) ? kAudioHardwarePropertyDefaultOutputDevice
                                                                                : kAudioHardwarePropertyDefaultInputDevice;
     AudioObjectPropertyAddress defaultDevicePropertyAddress = { selector,
                                                                 kAudioObjectPropertyScopeGlobal,
@@ -71,19 +71,19 @@ AudioDeviceID defaultAudioDevice(QAudio::Mode mode)
     if (AudioObjectGetPropertyData(kAudioObjectSystemObject,
                                    &defaultDevicePropertyAddress,
                                    0, NULL, &size, &audioDevice) != noErr) {
-        qWarning("QAudioDevice: Unable to find default %s device",  (mode == QAudio::AudioOutput) ? "output" : "input");
+        qWarning("QAudioDevice: Unable to find default %s device",  (mode == QAudioDevice::Output) ? "output" : "input");
         return 0;
     }
 
     return audioDevice;
 }
 
-static QByteArray uniqueId(AudioDeviceID device, QAudio::Mode mode)
+static QByteArray uniqueId(AudioDeviceID device, QAudioDevice::Mode mode)
 {
     CFStringRef name;
     UInt32 size = sizeof(CFStringRef);
 
-    AudioObjectPropertyScope audioPropertyScope = mode == QAudio::AudioInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
+    AudioObjectPropertyScope audioPropertyScope = mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
 
     AudioObjectPropertyAddress audioDeviceNamePropertyAddress = { kAudioDevicePropertyDeviceUID,
                                                                   audioPropertyScope,
@@ -99,7 +99,7 @@ static QByteArray uniqueId(AudioDeviceID device, QAudio::Mode mode)
     return s.toUtf8();
 }
 
-QList<QAudioDevice> availableAudioDevices(QAudio::Mode mode)
+QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode)
 {
 
     QList<QAudioDevice> devices;
@@ -130,7 +130,7 @@ QList<QAudioDevice> availableAudioDevices(QAudio::Mode mode)
                     AudioStreamBasicDescription sf;
                     UInt32 size = sizeof(AudioStreamBasicDescription);
                     AudioObjectPropertyAddress audioDeviceStreamFormatPropertyAddress = { kAudioDevicePropertyStreamFormat,
-                                                                                    (mode == QAudio::AudioInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput),
+                                                                                    (mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput),
                                                                                     kAudioObjectPropertyElementMaster };
 
                     if (AudioObjectGetPropertyData(audioDevices[i], &audioDeviceStreamFormatPropertyAddress, 0, NULL, &size, &sf) == noErr)
@@ -205,10 +205,10 @@ QList<QAudioDevice> QDarwinMediaDevices::audioInputs() const
 {
 #ifdef Q_OS_IOS
     QList<QAudioDevice> devices;
-    devices.append((new QCoreAudioDeviceInfo("default", QAudio::AudioInput))->create());
+    devices.append((new QCoreAudioDeviceInfo("default", QAudioDevice::Input))->create());
     return devices;
 #else
-    return availableAudioDevices(QAudio::AudioInput);
+    return availableAudioDevices(QAudioDevice::Input);
 #endif
 }
 
@@ -216,10 +216,10 @@ QList<QAudioDevice> QDarwinMediaDevices::audioOutputs() const
 {
 #ifdef Q_OS_IOS
     QList<QAudioDevice> devices;
-    devices.append((new QCoreAudioDeviceInfo("default", QAudio::AudioOutput))->create());
+    devices.append((new QCoreAudioDeviceInfo("default", QAudioDevice::Output))->create());
     return devices;
 #else
-    return availableAudioDevices(QAudio::AudioOutput);
+    return availableAudioDevices(QAudioDevice::Output);
 #endif
 }
 
@@ -315,13 +315,13 @@ void QDarwinMediaDevices::updateCameraDevices()
 void QDarwinMediaDevices::updateAudioDevices()
 {
 #ifdef Q_OS_MACOS
-    QList<QAudioDevice> inputs = availableAudioDevices(QAudio::AudioInput);
+    QList<QAudioDevice> inputs = availableAudioDevices(QAudioDevice::Input);
     if (m_audioInputs != inputs) {
         m_audioInputs = inputs;
         audioInputsChanged();
     }
 
-    QList<QAudioDevice> outputs = availableAudioDevices(QAudio::AudioOutput);
+    QList<QAudioDevice> outputs = availableAudioDevices(QAudioDevice::Output);
     if (m_audioOutputs!= outputs) {
         m_audioOutputs = outputs;
         audioOutputsChanged();
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice.cpp
index f68edf369..301283013 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QGStreamerAudioDeviceInfo::QGStreamerAudioDeviceInfo(GstDevice *d, const QByteArray &device, QAudio::Mode mode)
+QGStreamerAudioDeviceInfo::QGStreamerAudioDeviceInfo(GstDevice *d, const QByteArray &device, QAudioDevice::Mode mode)
     : QAudioDevicePrivate(device, mode),
       gstDevice(d)
 {
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice_p.h b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice_p.h
index c9e5442b7..9da109e38 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice_p.h
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiodevice_p.h
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 class QGStreamerAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
-    QGStreamerAudioDeviceInfo(GstDevice *gstDevice, const QByteArray &device, QAudio::Mode mode);
+    QGStreamerAudioDeviceInfo(GstDevice *gstDevice, const QByteArray &device, QAudioDevice::Mode mode);
     ~QGStreamerAudioDeviceInfo();
 
     GstDevice *gstDevice = nullptr;
diff --git a/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp b/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
index 6be1a3cb9..f66329f5e 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
+++ b/src/multimedia/platform/gstreamer/qgstreamermediadevices.cpp
@@ -99,7 +99,7 @@ QGstreamerMediaDevices::QGstreamerMediaDevices()
     }
 }
 
-static QList<QAudioDevice> devicesFromSet(const QSet<GstDevice *> &deviceSet, QAudio::Mode mode)
+static QList<QAudioDevice> devicesFromSet(const QSet<GstDevice *> &deviceSet, QAudioDevice::Mode mode)
 {
     QList<QAudioDevice> devices;
     for (auto *d : deviceSet) {
@@ -124,12 +124,12 @@ static QList<QAudioDevice> devicesFromSet(const QSet<GstDevice *> &deviceSet, QA
 
 QList<QAudioDevice> QGstreamerMediaDevices::audioInputs() const
 {
-    return devicesFromSet(m_audioSources, QAudio::AudioInput);
+    return devicesFromSet(m_audioSources, QAudioDevice::Input);
 }
 
 QList<QAudioDevice> QGstreamerMediaDevices::audioOutputs() const
 {
-    return devicesFromSet(m_audioSinks, QAudio::AudioOutput);
+    return devicesFromSet(m_audioSinks, QAudioDevice::Output);
 }
 
 QList<QCameraDevice> QGstreamerMediaDevices::videoInputs() const
@@ -250,9 +250,9 @@ static GstDevice *getDevice(const QSet<GstDevice *> &devices, const char *key, c
 
 }
 
-GstDevice *QGstreamerMediaDevices::audioDevice(const QByteArray &id, QAudio::Mode mode) const
+GstDevice *QGstreamerMediaDevices::audioDevice(const QByteArray &id, QAudioDevice::Mode mode) const
 {
-    const auto devices = (mode == QAudio::AudioOutput) ? m_audioSinks : m_audioSources;
+    const auto devices = (mode == QAudioDevice::Output) ? m_audioSinks : m_audioSources;
 
     return getDevice(devices, "sysfs.path", id);
 }
diff --git a/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h b/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
index c00d66209..e3f34433f 100644
--- a/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
+++ b/src/multimedia/platform/gstreamer/qgstreamermediadevices_p.h
@@ -54,7 +54,7 @@
 #include <private/qplatformmediadevices_p.h>
 #include <gst/gst.h>
 #include <qset.h>
-#include <qaudio.h>
+#include <qaudiodevice.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -72,7 +72,7 @@ public:
     void addDevice(GstDevice *);
     void removeDevice(GstDevice *);
 
-    GstDevice *audioDevice(const QByteArray &id, QAudio::Mode mode) const;
+    GstDevice *audioDevice(const QByteArray &id, QAudioDevice::Mode mode) const;
     GstDevice *videoDevice(const QByteArray &id) const;
 
 private:
diff --git a/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp b/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp
index 9b1cecbcf..cc7fdb1d4 100644
--- a/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp
+++ b/src/multimedia/platform/pulseaudio/qaudioengine_pulse.cpp
@@ -124,7 +124,7 @@ static void sinkInfoCallback(pa_context *context, const pa_sink_info *info, int
 
     QWriteLocker locker(&pulseEngine->m_sinkLock);
     bool isDefault = pulseEngine->m_defaultSink == info->name;
-    auto *dinfo = new QPulseAudioDeviceInfo(info->name, info->description, isDefault, QAudio::AudioOutput);
+    auto *dinfo = new QPulseAudioDeviceInfo(info->name, info->description, isDefault, QAudioDevice::Output);
     pulseEngine->m_sinks.insert(info->index, dinfo->create());
 }
 
@@ -162,7 +162,7 @@ static void sourceInfoCallback(pa_context *context, const pa_source_info *info,
     if (info->monitor_of_sink != PA_INVALID_INDEX)
         return;
     bool isDefault = pulseEngine->m_defaultSink == info->name;
-    auto *dinfo = new QPulseAudioDeviceInfo(info->name, info->description, isDefault, QAudio::AudioInput);
+    auto *dinfo = new QPulseAudioDeviceInfo(info->name, info->description, isDefault, QAudioDevice::Input);
     pulseEngine->m_sources.insert(info->index, dinfo->create());
 }
 
@@ -448,14 +448,14 @@ QPulseAudioEngine *QPulseAudioEngine::instance()
     return pulseEngine();
 }
 
-QList<QAudioDevice> QPulseAudioEngine::availableDevices(QAudio::Mode mode) const
+QList<QAudioDevice> QPulseAudioEngine::availableDevices(QAudioDevice::Mode mode) const
 {
     QList<QAudioDevice> devices;
     QByteArray defaultDevice;
 
     m_serverLock.lockForRead();
 
-    if (mode == QAudio::AudioOutput) {
+    if (mode == QAudioDevice::Output) {
         QReadLocker locker(&m_sinkLock);
         devices = m_sinks.values();
         defaultDevice = m_defaultSink;
@@ -470,9 +470,9 @@ QList<QAudioDevice> QPulseAudioEngine::availableDevices(QAudio::Mode mode) const
     return devices;
 }
 
-QByteArray QPulseAudioEngine::defaultDevice(QAudio::Mode mode) const
+QByteArray QPulseAudioEngine::defaultDevice(QAudioDevice::Mode mode) const
 {
-    return (mode == QAudio::AudioOutput) ? m_defaultSink : m_defaultSource;
+    return (mode == QAudioDevice::Output) ? m_defaultSink : m_defaultSource;
 }
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h b/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h
index 9f11e8ca3..c384d274b 100644
--- a/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h
+++ b/src/multimedia/platform/pulseaudio/qaudioengine_pulse_p.h
@@ -90,8 +90,8 @@ public:
             pa_threaded_mainloop_wait(m_mainLoop);
     }
 
-    QList<QAudioDevice> availableDevices(QAudio::Mode mode) const;
-    QByteArray defaultDevice(QAudio::Mode mode) const;
+    QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode) const;
+    QByteArray defaultDevice(QAudioDevice::Mode mode) const;
 
 Q_SIGNALS:
     void contextFailed();
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiodevice.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiodevice.cpp
index d624de847..df161ab18 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiodevice.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiodevice.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QPulseAudioDeviceInfo::QPulseAudioDeviceInfo(const char *device, const char *desc, bool isDef, QAudio::Mode mode)
+QPulseAudioDeviceInfo::QPulseAudioDeviceInfo(const char *device, const char *desc, bool isDef, QAudioDevice::Mode mode)
     : QAudioDevicePrivate(device, mode)
 {
     description = QString::fromUtf8(desc);
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiodevice_p.h b/src/multimedia/platform/pulseaudio/qpulseaudiodevice_p.h
index 59e013167..111134614 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiodevice_p.h
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiodevice_p.h
@@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE
 class QPulseAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
-    QPulseAudioDeviceInfo(const char *device, const char *description, bool isDefault, QAudio::Mode mode);
+    QPulseAudioDeviceInfo(const char *device, const char *description, bool isDefault, QAudioDevice::Mode mode);
     ~QPulseAudioDeviceInfo() {}
 };
 
diff --git a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
index c847592ec..4c3c561b4 100644
--- a/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
+++ b/src/multimedia/platform/pulseaudio/qpulseaudiomediadevices.cpp
@@ -56,12 +56,12 @@ QPulseAudioMediaDevices::QPulseAudioMediaDevices(QPulseAudioEngine *engine)
 
 QList<QAudioDevice> QPulseAudioMediaDevices::audioInputs() const
 {
-    return pulseEngine->availableDevices(QAudio::AudioInput);
+    return pulseEngine->availableDevices(QAudioDevice::Input);
 }
 
 QList<QAudioDevice> QPulseAudioMediaDevices::audioOutputs() const
 {
-    return pulseEngine->availableDevices(QAudio::AudioOutput);
+    return pulseEngine->availableDevices(QAudioDevice::Output);
 }
 
 QList<QCameraDevice> QPulseAudioMediaDevices::videoInputs() const
diff --git a/src/multimedia/platform/qnx/audio/qnxaudioutils.cpp b/src/multimedia/platform/qnx/audio/qnxaudioutils.cpp
index aef4492d8..7aa31e408 100644
--- a/src/multimedia/platform/qnx/audio/qnxaudioutils.cpp
+++ b/src/multimedia/platform/qnx/audio/qnxaudioutils.cpp
@@ -41,11 +41,11 @@
 
 QT_BEGIN_NAMESPACE
 
-snd_pcm_channel_params_t QnxAudioUtils::formatToChannelParams(const QAudioFormat &format, QAudio::Mode mode, int fragmentSize)
+snd_pcm_channel_params_t QnxAudioUtils::formatToChannelParams(const QAudioFormat &format, QAudioDevice::Mode mode, int fragmentSize)
 {
     snd_pcm_channel_params_t params;
     memset(&params, 0, sizeof(params));
-    params.channel = (mode == QAudio::AudioOutput) ? SND_PCM_CHANNEL_PLAYBACK : SND_PCM_CHANNEL_CAPTURE;
+    params.channel = (mode == QAudioDevice::Output) ? SND_PCM_CHANNEL_PLAYBACK : SND_PCM_CHANNEL_CAPTURE;
     params.mode = SND_PCM_MODE_BLOCK;
     params.start_mode = SND_PCM_START_DATA;
     params.stop_mode = SND_PCM_STOP_ROLLOVER;
diff --git a/src/multimedia/platform/qnx/audio/qnxaudioutils_p.h b/src/multimedia/platform/qnx/audio/qnxaudioutils_p.h
index 0696d986e..d8e454de2 100644
--- a/src/multimedia/platform/qnx/audio/qnxaudioutils_p.h
+++ b/src/multimedia/platform/qnx/audio/qnxaudioutils_p.h
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QnxAudioUtils
 {
-    snd_pcm_channel_params_t formatToChannelParams(const QAudioFormat &format, QAudio::Mode mode, int fragmentSize);
+    snd_pcm_channel_params_t formatToChannelParams(const QAudioFormat &format, QAudioDevice::Mode mode, int fragmentSize);
 }
 
 QT_END_NAMESPACE
diff --git a/src/multimedia/platform/qnx/audio/qqnxaudiodevice.cpp b/src/multimedia/platform/qnx/audio/qqnxaudiodevice.cpp
index 4d1d0f76f..ff7d23192 100644
--- a/src/multimedia/platform/qnx/audio/qqnxaudiodevice.cpp
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiodevice.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QnxAudioDeviceInfo::QnxAudioDeviceInfo(const QByteArray &deviceName, QAudio::Mode mode)
+QnxAudioDeviceInfo::QnxAudioDeviceInfo(const QByteArray &deviceName, QAudioDevice::Mode mode)
     : QAudioDevicePrivate(deviceName, mode)
 {
 }
@@ -62,14 +62,14 @@ QAudioFormat QnxAudioDeviceInfo::preferredFormat() const
     format.setSampleType(QAudioFormat::SignedInt);
     format.setSampleSize(16);
     format.setChannelCount(2);
-    if(mode == QAudio::AudioInput && !isFormatSupported(format))
+    if(mode == QAudioDevice::Input && !isFormatSupported(format))
         format.setChannelCount(1);
     return format;
 }
 
 bool QnxAudioDeviceInfo::isFormatSupported(const QAudioFormat &format) const
 {
-    const int pcmMode = (mode == QAudio::AudioOutput) ? SND_PCM_OPEN_PLAYBACK : SND_PCM_OPEN_CAPTURE;
+    const int pcmMode = (mode == QAudioDevice::Output) ? SND_PCM_OPEN_PLAYBACK : SND_PCM_OPEN_CAPTURE;
     snd_pcm_t *handle;
 
     int card = 0;
@@ -79,7 +79,7 @@ bool QnxAudioDeviceInfo::isFormatSupported(const QAudioFormat &format) const
 
     snd_pcm_channel_info_t info;
     memset (&info, 0, sizeof(info));
-    info.channel = (mode == QAudio::AudioOutput) ? SND_PCM_CHANNEL_PLAYBACK : SND_PCM_CHANNEL_CAPTURE;
+    info.channel = (mode == QAudioDevice::Output) ? SND_PCM_CHANNEL_PLAYBACK : SND_PCM_CHANNEL_CAPTURE;
 
     if (snd_pcm_plugin_info(handle, &info) < 0) {
         qWarning("QAudioDevice: couldn't get channel info");
diff --git a/src/multimedia/platform/qnx/audio/qqnxaudiodevice_p.h b/src/multimedia/platform/qnx/audio/qqnxaudiodevice_p.h
index e3039daa5..96e65759a 100644
--- a/src/multimedia/platform/qnx/audio/qqnxaudiodevice_p.h
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiodevice_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QnxAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
-    QnxAudioDeviceInfo(const QByteArray &deviceName, QAudio::Mode mode);
+    QnxAudioDeviceInfo(const QByteArray &deviceName, QAudioDevice::Mode mode);
     ~QnxAudioDeviceInfo();
 
     QAudioFormat preferredFormat() const override;
diff --git a/src/multimedia/platform/qnx/audio/qqnxaudiosink.cpp b/src/multimedia/platform/qnx/audio/qqnxaudiosink.cpp
index 7fe70ee9d..d2c1f98c7 100644
--- a/src/multimedia/platform/qnx/audio/qqnxaudiosink.cpp
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiosink.cpp
@@ -278,7 +278,7 @@ bool QQnxAudioSink::open()
         return false;
     }
 
-    snd_pcm_channel_params_t params = QnxAudioUtils::formatToChannelParams(m_format, QAudio::AudioOutput, info.max_fragment_size);
+    snd_pcm_channel_params_t params = QnxAudioUtils::formatToChannelParams(m_format, QAudioDevice::Output, info.max_fragment_size);
     setTypeName(&params);
 
     if ((errorCode = snd_pcm_plugin_params(m_pcmHandle, &params)) < 0) {
diff --git a/src/multimedia/platform/qnx/audio/qqnxaudiosource.cpp b/src/multimedia/platform/qnx/audio/qqnxaudiosource.cpp
index 803c22ff4..b90681a83 100644
--- a/src/multimedia/platform/qnx/audio/qqnxaudiosource.cpp
+++ b/src/multimedia/platform/qnx/audio/qqnxaudiosource.cpp
@@ -267,7 +267,7 @@ bool QQnxAudioSource::open()
         return false;
     }
 
-    snd_pcm_channel_params_t params = QnxAudioUtils::formatToChannelParams(m_format, QAudio::AudioInput, info.max_fragment_size);
+    snd_pcm_channel_params_t params = QnxAudioUtils::formatToChannelParams(m_format, QAudioDevice::Input, info.max_fragment_size);
 
     if ((errorCode = snd_pcm_plugin_params(m_pcmHandle, &params)) < 0) {
         qWarning("QQnxAudioSource: open error, couldn't set channel params (0x%x)", -errorCode);
diff --git a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
index 5aad69868..23bc0bcf0 100644
--- a/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
+++ b/src/multimedia/platform/qnx/qqnxdevicemanager.cpp
@@ -96,12 +96,12 @@ QQnxMediaDevices::QQnxMediaDevices()
 
 QList<QAudioDevice> QQnxMediaDevices::audioInputs() const
 {
-    return { QAudioDevice(new QnxAudioDeviceInfo("default", QAudio::AudioInput)) };
+    return { QAudioDevice(new QnxAudioDeviceInfo("default", QAudioDevice::Input)) };
 }
 
 QList<QAudioDevice> QQnxMediaDevices::audioOutputs() const
 {
-    return { QAudioDevice(new QnxAudioDeviceInfo("default", QAudio::AudioOutput)) };
+    return { QAudioDevice(new QnxAudioDeviceInfo("default", QAudioDevice::Output)) };
 }
 
 QList<QCameraDevice> QQnxMediaDevices::videoInputs() const
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp b/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp
index 9ba7a2965..4c8f3814b 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiodevice.cpp
@@ -57,7 +57,7 @@
 #include "qwindowsaudioutils_p.h"
 
 
-QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, int waveID, const QString &description, QAudio::Mode mode)
+QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, int waveID, const QString &description, QAudioDevice::Mode mode)
     : QAudioDevicePrivate(dev, mode),
       devId(waveID)
 {
@@ -68,7 +68,7 @@ QWindowsAudioDeviceInfo::QWindowsAudioDeviceInfo(QByteArray dev, int waveID, con
 
     DWORD fmt = 0;
 
-    if(mode == QAudio::AudioOutput) {
+    if(mode == QAudioDevice::Output) {
         WAVEOUTCAPS woc;
         if (waveOutGetDevCaps(devId, &woc, sizeof(WAVEOUTCAPS)) == MMSYSERR_NOERROR)
             fmt = woc.dwFormats;
@@ -214,7 +214,7 @@ bool QWindowsAudioDeviceInfo::testSettings(const QAudioFormat& format) const
     WAVEFORMATEXTENSIBLE wfx;
     if (qt_convertFormat(format, &wfx)) {
         // query only, do not open device
-        if (mode == QAudio::AudioOutput) {
+        if (mode == QAudioDevice::Output) {
             return (waveOutOpen(NULL, UINT_PTR(devId), &wfx.Format, 0, 0,
                                 WAVE_FORMAT_QUERY) == MMSYSERR_NOERROR);
         } else { // AudioInput
diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
index 475296e12..7d55a5820 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
@@ -70,7 +70,7 @@ const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };
 class QWindowsAudioDeviceInfo : public QAudioDevicePrivate
 {
 public:
-    QWindowsAudioDeviceInfo(QByteArray dev, int waveID, const QString &description, QAudio::Mode mode);
+    QWindowsAudioDeviceInfo(QByteArray dev, int waveID, const QString &description, QAudioDevice::Mode mode);
     ~QWindowsAudioDeviceInfo();
 
     bool open();
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
index d8af3da9e..2b1a74a44 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp
+++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp
@@ -320,9 +320,9 @@ QWindowsMediaDevices::~QWindowsMediaDevices()
     CoUninitialize();
 }
 
-QList<QAudioDevice> QWindowsMediaDevices::availableDevices(QAudio::Mode mode) const
+QList<QAudioDevice> QWindowsMediaDevices::availableDevices(QAudioDevice::Mode mode) const
 {
-    const auto audioOut = mode == QAudio::AudioOutput;
+    const auto audioOut = mode == QAudioDevice::Output;
 
     const auto defaultAudioDeviceID = [this, audioOut]{
         const auto dataFlow = audioOut ? EDataFlow::eRender : EDataFlow::eCapture;
@@ -384,12 +384,12 @@ QList<QAudioDevice> QWindowsMediaDevices::availableDevices(QAudio::Mode mode) co
 
 QList<QAudioDevice> QWindowsMediaDevices::audioInputs() const
 {
-    return availableDevices(QAudio::AudioInput);
+    return availableDevices(QAudioDevice::Input);
 }
 
 QList<QAudioDevice> QWindowsMediaDevices::audioOutputs() const
 {
-    return availableDevices(QAudio::AudioOutput);
+    return availableDevices(QAudioDevice::Output);
 }
 
 QList<QCameraDevice> QWindowsMediaDevices::videoInputs() const
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
index 30f91d2c1..322324607 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
@@ -55,6 +55,7 @@
 #include <private/qwindowsiupointer_p.h>
 #include <qset.h>
 #include <qaudio.h>
+#include <qaudiodevice.h>
 #include <windows.h>
 
 QT_BEGIN_NAMESPACE
@@ -78,7 +79,7 @@ public:
     QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override;
 
 private:
-    QList<QAudioDevice> availableDevices(QAudio::Mode mode) const;
+    QList<QAudioDevice> availableDevices(QAudioDevice::Mode mode) const;
 
     QWindowsIUPointer<IMMDeviceEnumerator> m_deviceEnumerator;
     QWindowsIUPointer<CMMNotificationClient> m_notificationClient;
diff --git a/tests/auto/unit/multimedia/qaudionamespace/tst_qaudionamespace.cpp b/tests/auto/unit/multimedia/qaudionamespace/tst_qaudionamespace.cpp
index 5cd89ec3e..e3e7e17bf 100644
--- a/tests/auto/unit/multimedia/qaudionamespace/tst_qaudionamespace.cpp
+++ b/tests/auto/unit/multimedia/qaudionamespace/tst_qaudionamespace.cpp
@@ -31,6 +31,7 @@
 #include <QtTest/QtTest>
 
 #include <QtMultimedia/qaudio.h>
+#include <QtMultimedia/qaudiodevice.h>
 
 // Adds an enum, and the stringized version
 #define ADD_ENUM_TEST(x) \
@@ -47,8 +48,6 @@ private slots:
     void debugError_data();
     void debugState();
     void debugState_data();
-    void debugMode();
-    void debugMode_data();
     void debugVolumeScale();
     void debugVolumeScale_data();
     void convertVolume();
@@ -96,24 +95,6 @@ void tst_QAudioNamespace::debugState()
     qDebug() << state;
 }
 
-void tst_QAudioNamespace::debugMode_data()
-{
-    QTest::addColumn<QAudio::Mode>("mode");
-    QTest::addColumn<QString>("stringized");
-
-    ADD_ENUM_TEST(AudioInput);
-    ADD_ENUM_TEST(AudioOutput);
-}
-
-void tst_QAudioNamespace::debugMode()
-{
-    QFETCH(QAudio::Mode, mode);
-    QFETCH(QString, stringized);
-
-    QTest::ignoreMessage(QtDebugMsg, stringized.toLatin1().constData());
-    qDebug() << mode;
-}
-
 void tst_QAudioNamespace::debugVolumeScale_data()
 {
     QTest::addColumn<QAudio::VolumeScale>("volumeScale");