diff options
author | Venugopal Shivashankar <venugopal.shivashankar@digia.com> | 2013-01-03 17:50:32 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-15 10:48:20 +0100 |
commit | 51334d299520118bbbc077696ca589f972a2f2ea (patch) | |
tree | 63e046d50210982eb88dddbd1be6d8a908ec69a5 /src/imports | |
parent | 304fdbeeb14c8f9e75cda99d2e4122b4dee1d952 (diff) | |
download | qtmultimedia-51334d299520118bbbc077696ca589f972a2f2ea.tar.gz |
Doc: Fixed random QDoc warnings
- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.
Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/audioengine/qdeclarative_audiosample_p.cpp | 12 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 4 | ||||
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraexposure.cpp | 10 |
3 files changed, 5 insertions, 21 deletions
diff --git a/src/imports/audioengine/qdeclarative_audiosample_p.cpp b/src/imports/audioengine/qdeclarative_audiosample_p.cpp index 473ef4524..17361570c 100644 --- a/src/imports/audioengine/qdeclarative_audiosample_p.cpp +++ b/src/imports/audioengine/qdeclarative_audiosample_p.cpp @@ -149,7 +149,7 @@ bool QDeclarativeAudioSample::isPreloaded() const /*! \qmlproperty bool QtAudioEngine1::AudioSample::loaded - This property holds indicates whether this sample has been loaded into memory or not. + This property indicates whether this sample has been loaded into memory or not. */ bool QDeclarativeAudioSample::isLoaded() const { @@ -237,16 +237,6 @@ QSoundBuffer* QDeclarativeAudioSample::soundBuffer() const } /*! - \omit - Note: This QML property is documented twice. - \qmlproperty bool QtAudioEngine1::AudioSample::loaded - - This property holds the load status of the audio sample. - \endomit -*/ - - -/*! \qmlsignal QtAudioEngine1::AudioSample::onLoadedChanged() This handler is called when \l loaded is changed diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index f13eb11c9..226b99277 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -630,21 +630,18 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \fn void QDeclarativeCamera::opticalZoomChanged(qreal zoom) \qmlsignal Camera::opticalZoomChanged(zoom) The optical zoom setting has changed to \a zoom. */ /*! - \fn void QDeclarativeCamera::digitalZoomChanged(qreal zoom) \qmlsignal Camera::digitalZoomChanged(zoom) The digital zoom setting has changed to \a zoom. */ /*! - \fn void QDeclarativeCamera::maximumOpticalZoomChanged(qreal zoom) \qmlsignal Camera::maximumOpticalZoomChanged(zoom) The maximum optical zoom setting has changed to \a zoom. This @@ -653,7 +650,6 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \fn void QDeclarativeCamera::maximumDigitalZoomChanged(qreal zoom) \qmlsignal Camera::maximumDigitalZoomChanged(zoom) The maximum digital zoom setting has changed to \a zoom. This diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp index 8f24325c5..d4a33260e 100644 --- a/src/imports/multimedia/qdeclarativecameraexposure.cpp +++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp @@ -80,15 +80,15 @@ QT_BEGIN_NAMESPACE For example, to select automatic shutter speed selection: - \qml + \code camera.exposure.setAutoShutterSpeed() - \endqml + \endcode Or for a specific shutter speed: - \qml + \code camera.exposure.manualShutterSpeed = 0.01 // 10ms - \endqml + \endcode You can only choose one or the other mode. */ @@ -331,7 +331,6 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity() */ /*! \qmlproperty enumeration QtMultimedia5::CameraExposure::exposureMode - \property QDeclarativeCameraExposure::exposureMode This property holds the camera exposure mode. @@ -402,7 +401,6 @@ void QDeclarativeCameraExposure::setSpotMeteringPoint(const QPointF &point) */ /*! \qmlproperty enumeration QtMultimedia5::CameraExposure::meteringMode - \property QDeclarativeCameraExposure::meteringMode This property holds the camera metering mode (how exposure is balanced). |