diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-02-03 16:30:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 05:35:15 +0100 |
| commit | 0924cff7b3425e9a416c81944215532effb1fc9f (patch) | |
| tree | 92bd10aad2123c1fb3ffbda3a9f9daab17880cde /src/imports/multimedia/qdeclarativecamerafocus.cpp | |
| parent | fd3a3a72921fa1e55f265f2d30e94615e388505e (diff) | |
Removed QFlags from declarative camera properties.
It doesn't work, while even without QFlags
camera.captureMode = Camera.CaptureVideo + Camera.CaptureStillImage
works correctly.
Change-Id: I00727ad37cbf33e0c6d557a9da08160d6ea4bdc9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamerafocus.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerafocus.cpp b/src/imports/multimedia/qdeclarativecamerafocus.cpp index 5248e0ec8..53c933279 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus.cpp +++ b/src/imports/multimedia/qdeclarativecamerafocus.cpp @@ -97,7 +97,7 @@ QDeclarativeCameraFocus::~QDeclarativeCameraFocus() /*! - \qmlproperty Camera::FocusModes CameraFocus::focusMode + \qmlproperty Camera::FocusMode CameraFocus::focusMode \property QDeclarativeCameraFocus::focusMode The current camera focus mode. @@ -105,17 +105,17 @@ QDeclarativeCameraFocus::~QDeclarativeCameraFocus() It's possible to combine multiple Camera::FocusMode values, for example Camera.FocusMacro + Camera.FocusContinuous. */ -QDeclarativeCamera::FocusModes QDeclarativeCameraFocus::focusMode() const +QDeclarativeCamera::FocusMode QDeclarativeCameraFocus::focusMode() const { - return QDeclarativeCamera::FocusModes(int(m_focus->focusMode())); + return QDeclarativeCamera::FocusMode(int(m_focus->focusMode())); } -bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCamera::FocusModes mode) const +bool QDeclarativeCameraFocus::isFocusModeSupported(QDeclarativeCamera::FocusMode mode) const { return m_focus->isFocusModeSupported(QCameraFocus::FocusModes(int(mode))); } -void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusModes mode) +void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode) { m_focus->setFocusMode(QCameraFocus::FocusModes(int(mode))); } |