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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h index 97d3d1858..9a9472ba4 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus_p.h +++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h @@ -68,29 +68,29 @@ class QDeclarativeCamera; class QDeclarativeCameraFocus : public QObject { Q_OBJECT - Q_PROPERTY(QDeclarativeCamera::FocusModes focusMode READ focusMode WRITE setFocusMode NOTIFY focusModeChanged) + Q_PROPERTY(QDeclarativeCamera::FocusMode focusMode READ focusMode WRITE setFocusMode NOTIFY focusModeChanged) Q_PROPERTY(QDeclarativeCamera::FocusPointMode focusPointMode READ focusPointMode WRITE setFocusPointMode NOTIFY focusPointModeChanged) Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint NOTIFY customFocusPointChanged) Q_PROPERTY(QObject *focusZones READ focusZones CONSTANT) public: ~QDeclarativeCameraFocus(); - QDeclarativeCamera::FocusModes focusMode() const; + QDeclarativeCamera::FocusMode focusMode() const; QDeclarativeCamera::FocusPointMode focusPointMode() const; QPointF customFocusPoint() const; QAbstractListModel *focusZones() const; - Q_INVOKABLE bool isFocusModeSupported(QDeclarativeCamera::FocusModes mode) const; + Q_INVOKABLE bool isFocusModeSupported(QDeclarativeCamera::FocusMode mode) const; Q_INVOKABLE bool isFocusPointModeSupported(QDeclarativeCamera::FocusPointMode) const; public Q_SLOTS: - void setFocusMode(QDeclarativeCamera::FocusModes); + void setFocusMode(QDeclarativeCamera::FocusMode); void setFocusPointMode(QDeclarativeCamera::FocusPointMode mode); void setCustomFocusPoint(const QPointF &point); Q_SIGNALS: - void focusModeChanged(QDeclarativeCamera::FocusModes); + void focusModeChanged(QDeclarativeCamera::FocusMode); void focusPointModeChanged(QDeclarativeCamera::FocusPointMode); void customFocusPointChanged(const QPointF &); |