diff options
| -rw-r--r-- | examples/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf | 15 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodevice.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/camera/qcamera.cpp | 16 | ||||
| -rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 2 | ||||
| -rw-r--r-- | src/multimedia/doc/src/qm-external-pages.qdoc | 2 |
5 files changed, 17 insertions, 20 deletions
diff --git a/examples/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf b/examples/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf index 6106ad787..3faf2054f 100644 --- a/examples/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf +++ b/examples/multimedia/video/mediaplayer/doc/qmlmediaplayer.qdocconf @@ -1,11 +1,4 @@ -HTML.extraimages += images/OqosZsDqvzQ.jpg \ - images/sf_yv01UtIw.jpg \ - images/nHrBbW0H-pc.jpg - -DocBook.extraFiles += images/OqosZsDqvzQ.jpg \ - images/sf_yv01UtIw.jpg \ - images/nHrBbW0H-pc.jpg - -qhp.QtMultimedia.extraFiles += images/OqosZsDqvzQ.jpg \ - images/sf_yv01UtIw.jpg \ - images/nHrBbW0H-pc.jpg +{HTML.extraimages,DocBook.extraFiles,qhp.QtMultimedia.extraFiles} += \ + images/OqosZsDqvzQ.jpg \ + images/sf_yv01UtIw.jpg \ + images/nHrBbW0H-pc.jpg diff --git a/src/multimedia/audio/qaudiodevice.cpp b/src/multimedia/audio/qaudiodevice.cpp index 9eff76791..507d17a57 100644 --- a/src/multimedia/audio/qaudiodevice.cpp +++ b/src/multimedia/audio/qaudiodevice.cpp @@ -298,7 +298,7 @@ QAudioDevice::QAudioDevice(QAudioDevicePrivate *p) /*! \enum QAudioDevice::Mode - Describes the mode of a QAudioDevice + Describes the mode of this device. \value Null A null device. 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. diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index d1e59d4a7..ede949fc9 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -39,7 +39,7 @@ qhp.QtMultimedia.subprojects.widgetclasses.sortPages = true qhp.QtMultimedia.subprojects.qmltypes.title = QML Types qhp.QtMultimedia.subprojects.qmltypes.indexTitle = Qt Multimedia QML Types -qhp.QtMultimedia.subprojects.qmltypes.selectors = qmlclass +qhp.QtMultimedia.subprojects.qmltypes.selectors = qmltype qhp.QtMultimedia.subprojects.qmltypes.sortPages = true qhp.QtMultimedia.subprojects.examples.title = Examples diff --git a/src/multimedia/doc/src/qm-external-pages.qdoc b/src/multimedia/doc/src/qm-external-pages.qdoc index ea441e877..531c0d240 100644 --- a/src/multimedia/doc/src/qm-external-pages.qdoc +++ b/src/multimedia/doc/src/qm-external-pages.qdoc @@ -192,7 +192,7 @@ /*! \externalpage https://en.wikipedia.org/wiki/Motion_JPEG - \title Motion JPEG + \title MotionJPEG */ /*! |