diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-12 16:27:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 00:58:30 +0100 |
| commit | 53d71baed324d43bf5bac1fd50fc2eb4764b3857 (patch) | |
| tree | d60dc8f9829959a555ad071e19a0d15b2d251339 /src/imports/multimedia/qdeclarativecamera.cpp | |
| parent | a6268601c907c56555ae42668e983a447c0da2eb (diff) | |
Changed QCamera::captureMode property to QFlags
This enables the expression of extra camera modes like
viewfinder only or capture during video recording.
Change-Id: Ie02fdeef5eb7fd6fc2f133c1afb0141e37c22b06
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 11872e2f7..a6d3c5f5f 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -134,7 +134,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : m_focus = new QDeclarativeCameraFocus(m_camera, this); m_imageProcessing = new QDeclarativeCameraImageProcessing(m_camera, this); - connect(m_camera, SIGNAL(captureModeChanged(QCamera::CaptureMode)), this, SIGNAL(captureModeChanged())); + connect(m_camera, SIGNAL(captureModeChanged(QCamera::CaptureModes)), this, SIGNAL(captureModeChanged())); connect(m_camera, SIGNAL(lockStatusChanged(QCamera::LockStatus,QCamera::LockChangeReason)), this, SIGNAL(lockStatusChanged())); connect(m_camera, SIGNAL(stateChanged(QCamera::State)), this, SLOT(_q_updateState(QCamera::State))); @@ -179,14 +179,14 @@ QString QDeclarativeCamera::errorString() const return m_camera->errorString(); } -QDeclarativeCamera::CaptureMode QDeclarativeCamera::captureMode() const +QDeclarativeCamera::CaptureModes QDeclarativeCamera::captureMode() const { - return QDeclarativeCamera::CaptureMode(m_camera->captureMode()); + return QDeclarativeCamera::CaptureModes(int(m_camera->captureMode())); } -void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode) +void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureModes mode) { - m_camera->setCaptureMode(QCamera::CaptureMode(mode)); + m_camera->setCaptureMode(QCamera::CaptureModes(int(mode))); } |