diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-13 13:52:05 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-15 08:49:29 +0200 |
| commit | 6931cbb35a909b192960205929d4a0efde280ee2 (patch) | |
| tree | 84ca34a55756f929d255a887c12c01e69d101259 /src/imports/multimedia/qdeclarativecamera.cpp | |
| parent | e975897ad7ebbad12f023e83eae8c4b7840ad6ed (diff) | |
Fix a number of other qdoc issues.
* Several places needed the forward class declaration hack
* Missing/wrong minor version numbers on imports
* A few typos
* Any number of attempts to work around qdoc
* A few missing docs
* Tweaked soundeffect docs
Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index bbdccd42b..6308edc4e 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -78,7 +78,7 @@ void QDeclarativeCamera::_q_availabilityChanged(QtMultimedia::AvailabilityError \brief Access viewfinder frames, and take photos and movies. \ingroup multimedia_qml \ingroup camera_qml - \inqmlmodule QtMultimedia 5 + \inqmlmodule QtMultimedia 5.0 \inherits Item @@ -227,6 +227,8 @@ QDeclarativeCamera::Error QDeclarativeCamera::errorCode() const \qmlproperty string QtMultimedia5::Camera::errorString A description of the current error, if any. + + \sa QtMultimedia5::Camera::onError */ QString QDeclarativeCamera::errorString() const { @@ -579,15 +581,6 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \qmlproperty string QtMultimedia5::Camera::errorString - - A string describing a camera's error state. - - \sa QtMultimedia5::Camera::onError -*/ - - -/*! \qmlsignal QtMultimedia5::Camera::onError(errorCode, errorString) This handler is called when an error occurs. The enumeration value \a errorCode is one of the @@ -619,21 +612,21 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \fn void QDeclarativeCamera:opticalZoomChanged(qreal zoom) + \fn void QDeclarativeCamera::opticalZoomChanged(qreal zoom) \qmlsignal Camera::opticalZoomChanged(zoom) The optical zoom setting has changed to \a zoom. */ /*! - \fn void QDeclarativeCamera::digitalZoomChanged(qreal) + \fn void QDeclarativeCamera::digitalZoomChanged(qreal zoom) \qmlsignal Camera::digitalZoomChanged(zoom) The digital zoom setting has changed to \a zoom. */ /*! - \fn void QDeclarativeCamera::maximumOpticalZoomChanged(zoom) + \fn void QDeclarativeCamera::maximumOpticalZoomChanged(qreal zoom) \qmlsignal Camera::maximumOpticalZoomChanged(zoom) The maximum optical zoom setting has changed to \a zoom. This @@ -642,7 +635,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) */ /*! - \fn void QDeclarativeCamera::maximumDigitalZoomChanged(qreal) + \fn void QDeclarativeCamera::maximumDigitalZoomChanged(qreal zoom) \qmlsignal Camera::maximumDigitalZoomChanged(zoom) The maximum digital zoom setting has changed to \a zoom. This |