diff options
author | Topi Reinio <topi.reinio@qt.io> | 2019-04-16 10:31:40 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@qt.io> | 2019-04-16 09:32:56 +0000 |
commit | d97d618a4884c2535ba787e774f0faa6bce82081 (patch) | |
tree | 81a493c10a27f8a5f52cace24c9cf7330b8e3faa /src/imports/multimedia/qdeclarativecamera.cpp | |
parent | d55edfc3cf6b65949835586b4b216cfd672c8380 (diff) |
Doc: Fix multiple documentation issuesv5.13.0-beta3
- 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 <valentyn.doroshchuk@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<size> QtMultimedia::Camera::supportedViewfinderResolutions(real minimumFrameRate = undefined, real maximumFrameRate = undefined) + \qmlmethod list<size> 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<object> QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution = undefined) + \qmlmethod list<object> QtMultimedia::Camera::supportedViewfinderFrameRateRanges(size resolution) Returns a list of supported viewfinder frame rate ranges. |