From 488224dcbf84e49cc8dca3765210a0cd31d295ba Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Wed, 16 Jan 2019 15:42:59 +0100
Subject: Return default camera with not empty name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QCameraInfo::defaultCamera() should not return empty name.
QCamera() uses first found camera service.
QCamera(QCameraInfo::defaultCamera()) uses the service which supports
provided camera's name.

Change-Id: I7a18b111997a605881eb6ec9788cb6e1d324c011
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
---
 src/multimedia/qmediaserviceprovider.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/multimedia')

diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 4166ff8eb..023c13008 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -576,8 +576,11 @@ public:
             const QMediaServiceDefaultDeviceInterface *iface =
                     qobject_cast<QMediaServiceDefaultDeviceInterface*>(obj);
 
-            if (iface)
-                return iface->defaultDevice(serviceType);
+            if (iface) {
+                QByteArray name = iface->defaultDevice(serviceType);
+                if (!name.isEmpty())
+                    return name;
+            }
         }
 
         // if QMediaServiceDefaultDeviceInterface is not implemented, return the
-- 
cgit v1.2.3