diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-18 03:00:15 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-18 03:00:15 +0200 |
commit | c93df1bdc734fdd1e05d1ce7a92a81cb7af7ae3a (patch) | |
tree | d76fdea6b0955c5707ca7408741bf9e2b2d1f23c /src/imports/multimedia | |
parent | 282356e3a1b1d95fd5d9433fb633a9692b84c8d7 (diff) | |
parent | 4cc6895d2f6bf6542623301c8deec1570d6dd916 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic3ac3515666576046ac1ec5342c5b06aadbc18ac
Diffstat (limited to 'src/imports/multimedia')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 63896c302..6d36e462d 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -138,7 +138,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QMultimedia::AvailabilityStatus \header \li Property \li Description \row \li \l {CameraCapture} {imageCapture} \li Methods and properties for capturing still images. - \row \li \l {CameraRecorder} {videoRecording} + \row \li \l {CameraRecorder} {videoRecorder} \li Methods and properties for capturing movies. \row \li \l {CameraExposure} {exposure} \li Methods and properties for adjusting exposure (aperture, shutter speed etc). |