diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-02-10 23:35:33 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-13 10:21:44 +0100 |
| commit | 048e38bd19b2a465469b5ff0c2bdc97857aded84 (patch) | |
| tree | d82c7b34775f98e0d9b3bd1468c371e13dac3939 /src/imports/multimedia/qdeclarativecamera.cpp | |
| parent | 0d74c7193a26da48a60653ecf1942f5b287fce08 (diff) | |
Documentation updates for declarative camera elements.
A number of things were missing.
Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 8dd1a8ac7..31f7d825e 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -164,7 +164,7 @@ void QDeclarativeCamera::componentComplete() /*! Returns any camera error. - \sa QDeclarativeError::Error + \sa QDeclarativeCameraError::Error */ QDeclarativeCamera::Error QDeclarativeCamera::error() const { @@ -181,6 +181,20 @@ QString QDeclarativeCamera::errorString() const return m_camera->errorString(); } +/*! + \qmlproperty enumeration Camera::captureMode + + \table + \header \o Value \o Description + \row \o CaptureStillImage + \o Prepares the camera element for capturing still images. + + \row \o CaptureVideo + \o Prepares the camera element for capturing video. + + \endtable + +*/ QDeclarativeCamera::CaptureMode QDeclarativeCamera::captureMode() const { return QDeclarativeCamera::CaptureMode(int(m_camera->captureMode())); |