Add QML accessors for camera viewfinder properties.
[ChangeLog] Added QML accessors for camera viewfinder properties. Change-Id: I05a2a6c552aa8606e8dc31a11d1cfdedf66c554f Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
committed by
Andrew den Exter
parent
1a3ae99441
commit
6347605341
@@ -46,6 +46,7 @@
|
||||
#include "qdeclarativecameraflash_p.h"
|
||||
#include "qdeclarativecamerafocus_p.h"
|
||||
#include "qdeclarativecameraimageprocessing_p.h"
|
||||
#include "qdeclarativecameraviewfinder_p.h"
|
||||
|
||||
#include "qdeclarativemediametadata_p.h"
|
||||
|
||||
@@ -801,6 +802,33 @@ QDeclarativeMediaMetaData *QDeclarativeCamera::metaData()
|
||||
return m_metaData;
|
||||
}
|
||||
|
||||
/*!
|
||||
\qmlproperty size QtMultimedia::Camera::viewfinder.resolution
|
||||
|
||||
This property holds the resolution of the camera viewfinder. If no
|
||||
resolution is given the backend will use a default value.
|
||||
|
||||
\since 5.4
|
||||
*/
|
||||
|
||||
/*!
|
||||
\qmlproperty real QtMultimedia::Camera::viewfinder.minimumFrameRate
|
||||
\qmlproperty real QtMultimedia::Camera::viewfinder.maximumFrameRate
|
||||
|
||||
These properties hold the limits of the preferred frame rate for the
|
||||
viewfinder in frames per second.
|
||||
|
||||
\since 5.4
|
||||
*/
|
||||
|
||||
QDeclarativeCameraViewfinder *QDeclarativeCamera::viewfinder()
|
||||
{
|
||||
if (!m_viewfinder)
|
||||
m_viewfinder = new QDeclarativeCameraViewfinder(m_camera, this);
|
||||
|
||||
return m_viewfinder;
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qdeclarativecamera_p.cpp"
|
||||
|
||||
Reference in New Issue
Block a user