diff options
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/qmediaserviceprovider.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index e9c708a21..c255f45d8 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -181,8 +181,8 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : m_pendingState(ActiveState), m_componentComplete(false) { - m_camera = new QCamera; - m_currentCameraInfo = QCameraInfo(*m_camera); + m_currentCameraInfo = QCameraInfo::defaultCamera(); + m_camera = new QCamera(m_currentCameraInfo); m_imageCapture = new QDeclarativeCameraCapture(m_camera); m_videoRecorder = new QDeclarativeCameraRecorder(m_camera); 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 |