From d97d618a4884c2535ba787e774f0faa6bce82081 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 16 Apr 2019 10:31:40 +0200 Subject: Doc: Fix multiple documentation issues - GstTools has some (internal) documentation, but was causing a number of warnings with QDoc's clang parser - exclude it from the documentation build. - Remove direct links from example documentation to individual example files; they no longer work. - Fix navigation for QML types; The main QML types pages did not list types for QtAudioEngiine. - Use \QtMinorVersion macro to make the documented import versions follow the minor Qt version. - Fix \since usage to be consistent throughout. - Fix linking issues for QML properties/methods - Minor language fixes Change-Id: I735cd13fa6dedd6bf06d6b6ef50ce2e0d69a545b Reviewed-by: VaL Doroshchuk --- src/imports/multimedia/qdeclarativecamera.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/imports/multimedia/qdeclarativecamera.cpp') diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index c255f45d8..63896c302 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -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 QtMultimedia::Camera::supportedViewfinderResolutions(real minimumFrameRate = undefined, real maximumFrameRate = undefined) + \qmlmethod list 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 QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution = undefined) + \qmlmethod list QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution) Returns a list of supported viewfinder frame rate ranges. -- cgit v1.2.3