Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	src/multimedia/playback/playlistfileparser.cpp
	src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm b/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
index 7e0d6fb4b..80347ed93 100644
--- a/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
+++ b/src/plugins/avfoundation/camera/avfcameradevicecontrol.mm
@@ -58,25 +58,25 @@ int AVFCameraDeviceControl::deviceCount() const
 
 QString AVFCameraDeviceControl::deviceName(int index) const
 {
-    const QList<QByteArray> &devices = AVFCameraSession::availableCameraDevices();
+    const QList<AVFCameraInfo> &devices = AVFCameraSession::availableCameraDevices();
     if (index < 0 || index >= devices.count())
         return QString();
 
-    return QString::fromUtf8(devices.at(index));
+    return QString::fromUtf8(devices.at(index).deviceId);
 }
 
 QString AVFCameraDeviceControl::deviceDescription(int index) const
 {
-    const QList<QByteArray> &devices = AVFCameraSession::availableCameraDevices();
+    const QList<AVFCameraInfo> &devices = AVFCameraSession::availableCameraDevices();
     if (index < 0 || index >= devices.count())
         return QString();
 
-    return AVFCameraSession::cameraDeviceInfo(devices.at(index)).description;
+    return devices.at(index).description;
 }
 
 int AVFCameraDeviceControl::defaultDevice() const
 {
-    return AVFCameraSession::availableCameraDevices().indexOf(AVFCameraSession::defaultCameraDevice());
+    return AVFCameraSession::defaultCameraIndex();
 }
 
 int AVFCameraDeviceControl::selectedDevice() const