slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Documentation updates for declarative camera elements.

Browse Source 
A number of things were missing.

Change-Id: Ic4eb2e88804b519478eeae733cc5f473b717270d
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2012-02-10 23:35:33 +10:00
committed by Qt by Nokia
parent 0d74c7193a
commit 048e38bd19
7 changed files with 358 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -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()));