diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-31 14:04:53 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 03:34:13 +0100 |
| commit | d292f4a7d3f589323f8f2869918829351789b3a3 (patch) | |
| tree | bcc8791e3a66b34a93acf9fd9a97785103138bb4 /src/multimedia/camera/qcamerafocus.h | |
| parent | 6a88794db4b35128eeef1f3514203d375dbba280 (diff) | |
| download | qtmultimedia-d292f4a7d3f589323f8f2869918829351789b3a3.tar.gz | |
Changed QCameraFocus::focusMode type to QFlags based FocusModes
It was intended to be QFlags based from the start.
Change-Id: I0919b3440eb18e84fc596fb894f18a53e5ff1da0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia/camera/qcamerafocus.h')
| -rw-r--r-- | src/multimedia/camera/qcamerafocus.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h index 7dc30380c..c14efa415 100644 --- a/src/multimedia/camera/qcamerafocus.h +++ b/src/multimedia/camera/qcamerafocus.h @@ -101,7 +101,7 @@ class Q_MULTIMEDIA_EXPORT QCameraFocus : public QObject { Q_OBJECT - Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode) + Q_PROPERTY(FocusModes focusMode READ focusMode WRITE setFocusMode) Q_PROPERTY(FocusPointMode focusPointMode READ focusPointMode WRITE setFocusPointMode) Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint) Q_PROPERTY(QCameraFocusZoneList focusZones READ focusZones NOTIFY focusZonesChanged) @@ -130,9 +130,9 @@ public: bool isAvailable() const; - FocusMode focusMode() const; - void setFocusMode(FocusMode mode); - bool isFocusModeSupported(FocusMode mode) const; + FocusModes focusMode() const; + void setFocusMode(FocusModes mode); + bool isFocusModeSupported(FocusModes mode) const; FocusPointMode focusPointMode() const; void setFocusPointMode(FocusPointMode mode); |