diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:01:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:01:23 +0200 |
| commit | a7a9e9aa419252e57dc421e6af5781661d7b1af8 (patch) | |
| tree | 037a707167fbb2717093d79a18fe3b59334996c9 /src/imports | |
| parent | 293566a1841151cf0a374af7016a396c943ab96e (diff) | |
| parent | 8933a59719a5f0c33d47f202d220a566765ec6d4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ib819180a25ceedfb072362d55d30f94e40a44f9b
Diffstat (limited to 'src/imports')
| -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). |