4 files changed, 9 insertions, 9 deletions
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;