diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2022-09-24 01:17:40 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2022-09-28 10:58:51 +0000 |
| commit | 48434a337831f618deab01f86d36710afe5dcf5b (patch) | |
| tree | ccefd5f84a5ec8e7838a684dbeaf2d38ea6013d8 /src/multimedia/camera | |
| parent | 1c08d53e4b18b5a253fbcc8ead8db52e8c7b4ea6 (diff) | |
Doc: Fix various issues in Qt Multimedia documentation
* Avoid unnecessary repetition in .qdocconf
* Fix incorrect link targets
* Fix mistakes in QML property documentation
* Add documentation for enumeration values in Camera::flashMode
Pick-to: 6.4
Change-Id: If0f67ded1c014bc75e21ccff832ef197b93e5b24
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcamera.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 370a10dad..9ff50013e 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -452,7 +452,7 @@ void QCamera::setCameraDevice(const QCameraDevice &cameraDevice) Gets or sets the currently active camera format. - \sa CameraDevice::videoFormats + \sa cameraDevice::videoFormats */ /*! @@ -620,14 +620,14 @@ void QCamera::setCustomFocusPoint(const QPointF &point) } /*! - \qmlproperty float QCamera::focusDistance + \qmlproperty float QtMultimedia::Camera::focusDistance This property return an approximate focus distance of the camera. The value reported is between 0 and 1, 0 being the closest possible focus distance, 1 being as far away as possible. Note that 1 is often, but not always infinity. Setting the focus distance will be ignored unless the focus mode is set to - \l FocusModeManual. + \l {focusMode}{FocusModeManual}. */ /*! @@ -770,11 +770,15 @@ void QCamera::zoomTo(float factor, float rate) */ /*! - \qmlproperty Camera::FlashMode QtMultimedia::Camera::flashMode + \qmlproperty enumeration QtMultimedia::Camera::flashMode Gets or sets a certain flash mode if the camera has a flash. - \sa QCamera::FlashMode, Camera::isFlashModeSupported, Camera::isFlashReady + \value Camera.FlashOff Flash is Off. + \value Camera.FlashOn Flash is On. + \value Camera.FlashAuto Automatic flash. + + \sa isFlashModeSupported, isFlashReady */ /*! @@ -920,7 +924,7 @@ bool QCamera::isExposureModeSupported(QCamera::ExposureMode mode) const } /*! - \qmlproperty real QCamera::exposureCompensation + \qmlproperty real QtMultimedia::Camera::exposureCompensation Gets or sets the exposure compensation in EV units. |