slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed QFlags from declarative camera properties.

Browse Source 
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>
This commit is contained in:
Dmytro Poplavskiy
2012-02-03 16:30:59 +10:00
committed by Qt by Nokia
parent fd3a3a7292
commit 0924cff7b3
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/imports/multimedia/qdeclarativecamerafocus.cpp
View File

@@ -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)));
}