summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecamera_p.h
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den.exter@jollamobile.com>2014-04-17 22:53:53 +1000
committerAndrew den Exter <andrew.den.exter@qinetic.com.au>2014-07-09 01:31:04 +0200
commit63476053415a8bacef83afb651bf7c6f98d60f5e (patch)
treef9412fbc512f2fdaf519454b7571b8966998cd7b /src/imports/multimedia/qdeclarativecamera_p.h
parent1a3ae99441c81849135b5788ff6c5fc7eaff0f18 (diff)
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>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera_p.h')
-rw-r--r--src/imports/multimedia/qdeclarativecamera_p.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 05dd55f3a..e7745abd9 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -72,6 +72,7 @@ class QDeclarativeCameraFocus;
class QDeclarativeCameraFlash;
class QDeclarativeCameraImageProcessing;
class QDeclarativeMediaMetaData;
+class QDeclarativeCameraViewfinder;
class QDeclarativeCamera : public QObject, public QQmlParserStatus
{
@@ -100,6 +101,7 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus
Q_PROPERTY(QDeclarativeCameraFocus* focus READ focus CONSTANT)
Q_PROPERTY(QDeclarativeCameraImageProcessing* imageProcessing READ imageProcessing CONSTANT)
Q_PROPERTY(QDeclarativeMediaMetaData *metaData READ metaData CONSTANT REVISION 1)
+ Q_PROPERTY(QDeclarativeCameraViewfinder *viewfinder READ viewfinder CONSTANT REVISION 1)
Q_ENUMS(CaptureMode)
Q_ENUMS(State)
@@ -233,6 +235,7 @@ public:
QDeclarativeCameraFlash *flash() { return m_flash; }
QDeclarativeCameraFocus *focus() { return m_focus; }
QDeclarativeCameraImageProcessing *imageProcessing() { return m_imageProcessing; }
+ QDeclarativeCameraViewfinder *viewfinder();
QDeclarativeMediaMetaData *metaData();
@@ -306,6 +309,7 @@ private:
QDeclarativeCameraFocus *m_focus;
QDeclarativeCameraImageProcessing *m_imageProcessing;
QDeclarativeMediaMetaData *m_metaData;
+ QDeclarativeCameraViewfinder *m_viewfinder;
State m_pendingState;
bool m_componentComplete;