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

Docs: fix qml links and standalone build for Multimedia

Browse Source 
Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Peter Yard
2012-02-21 15:58:01 +10:00
committed by Qt by Nokia
parent e791e4f0e9
commit cd5a8fc69d
35 changed files with 828 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/imports/multimedia/qdeclarativecameraflash.cpp
View File

@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass CameraFlash QDeclarativeCameraFlash
\inqmlmodule QtMultimedia 5
\brief The CameraFlash element provides interface for flash related camera settings.
\ingroup multimedia_qml
\ingroup camera_qml
@@ -95,7 +96,7 @@ QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
}
/*!
\qmlproperty bool QDeclarativeCameraFlash::ready
\qmlproperty bool QtMultimedia5::QDeclarativeCameraFlash::ready
\property bool QDeclarativeCameraFlash::ready
Indicates flash is charged.
@@ -106,7 +107,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const
}
/*!
\qmlproperty enumeration CameraExposure::flashMode
\qmlproperty enumeration QtMultimedia5::CameraExposure::flashMode
\property QDeclarativeCameraFlash::flashMode
\table
@@ -140,12 +141,12 @@ void QDeclarativeCameraFlash::setFlashMode(int mode)
}
/*!
\qmlsignal CameraExposure::flashModeChanged(int)
\qmlsignal QtMultimedia5::CameraExposure::flashModeChanged(int)
\fn void QDeclarativeCameraFlash::flashModeChanged(int)
*/
/*!
\qmlsignal CameraExposure::flashReady(bool)
\qmlsignal QtMultimedia5::CameraExposure::flashReady(bool)
\fn void QDeclarativeCameraFlash::flashReady(bool)
*/