summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecameraflash.cpp
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@nokia.com>2012-08-02 11:17:05 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-29 13:17:52 +0200
commita4c23ac607034d1d8ab15bf9afb6a7d9a7b5d083 (patch)
tree262237db4ed7483e87b6b6e03d5782ef5a7f26d5 /src/imports/multimedia/qdeclarativecameraflash.cpp
parent8a3706a5a1a9d5839327ede3fa625da8f3c34979 (diff)
Doc: Added an index page and separated \qmlproperty and \property documentation
Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraflash.cpp')
-rw-r--r--src/imports/multimedia/qdeclarativecameraflash.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp
index fb1256319..faff5fc0a 100644
--- a/src/imports/multimedia/qdeclarativecameraflash.cpp
+++ b/src/imports/multimedia/qdeclarativecameraflash.cpp
@@ -89,22 +89,31 @@ QDeclarativeCameraFlash::QDeclarativeCameraFlash(QCamera *camera, QObject *paren
QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
{
}
+/*!
+ \property bool QDeclarativeCameraFlash::ready
+ This property indicates whether the flash is charged.
+*/
/*!
\qmlproperty bool QtMultimedia5::CameraFlash::ready
- \property bool QDeclarativeCameraFlash::ready
- Indicates flash is charged.
+ This property indicates whether the flash is charged.
*/
bool QDeclarativeCameraFlash::isFlashReady() const
{
return m_exposure->isFlashReady();
}
+/*!
+ \property QDeclarativeCameraFlash::mode
+ This property holds the camera flash mode. The mode can be one of the constants in \l QCameraExposure::FlashMode.
+*/
/*!
\qmlproperty enumeration QtMultimedia5::CameraFlash::mode
- \property int QDeclarativeCameraFlash::mode
+ This property holds the camera flash mode.
+
+ The mode can be one of the following:
\table
\header \li Value \li Description
\row \li Camera.FlashOff \li Flash is Off.