diff options
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index c499de3b6..6d36e462d 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); @@ -251,7 +251,7 @@ void QDeclarativeCamera::componentComplete() preserved when changing the camera device. \sa displayName, position - \since QtMultimedia 5.4 + \since 5.4 */ QString QDeclarativeCamera::deviceId() const @@ -292,7 +292,7 @@ void QDeclarativeCamera::setDeviceId(const QString &name) preserved when changing the camera device. \sa deviceId - \since QtMultimedia 5.4 + \since 5.4 */ QDeclarativeCamera::Position QDeclarativeCamera::position() const @@ -329,7 +329,7 @@ void QDeclarativeCamera::setPosition(Position position) \readonly \sa deviceId - \since QtMultimedia 5.4 + \since 5.4 */ QString QDeclarativeCamera::displayName() const @@ -353,7 +353,7 @@ QString QDeclarativeCamera::displayName() const \readonly \sa VideoOutput::orientation - \since QtMultimedia 5.4 + \since 5.4 */ int QDeclarativeCamera::orientation() const @@ -967,7 +967,7 @@ QDeclarativeCameraViewfinder *QDeclarativeCamera::viewfinder() } /*! - \qmlmethod list<size> QtMultimedia::Camera::supportedViewfinderResolutions(real minimumFrameRate = undefined, real maximumFrameRate = undefined) + \qmlmethod list<size> QtMultimedia::Camera::supportedViewfinderResolutions(real minimumFrameRate, real maximumFrameRate) Returns a list of supported viewfinder resolutions. @@ -1003,7 +1003,7 @@ QJSValue QDeclarativeCamera::supportedViewfinderResolutions(qreal minimumFrameRa } /*! - \qmlmethod list<object> QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution = undefined) + \qmlmethod list<object> QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution) Returns a list of supported viewfinder frame rate ranges. |