diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-05-18 11:53:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 05:28:32 +0200 |
| commit | f965f683d09eebcf5d1d0e8403db402551ac7c50 (patch) | |
| tree | ab9439823007113be74136528da80311c1e11c7e /src/imports | |
| parent | 9fb8bdd509ab3109f4f9f0b98f8bb0fa30e7f7ce (diff) | |
| download | qtmultimedia-f965f683d09eebcf5d1d0e8403db402551ac7c50.tar.gz | |
Added missing QDeclarativeCamera::CaptureViewfinder enum value
Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 3 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 3951f6bf5..d79d90981 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -267,6 +267,9 @@ QDeclarativeCamera::Availability QDeclarativeCamera::availability() const \table \header \li Value \li Description + \row \li CaptureViewfinder + \li Camera is only configured to display viewfinder. + \row \li CaptureStillImage \li Prepares the Camera for capturing still images. diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index b2fe2cede..e36a9c971 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -118,6 +118,7 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus public: enum CaptureMode { + CaptureViewfinder = QCamera::CaptureViewfinder, CaptureStillImage = QCamera::CaptureStillImage, CaptureVideo = QCamera::CaptureVideo }; |