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 /tests/auto/unit | |
| parent | 6a88794db4b35128eeef1f3514203d375dbba280 (diff) | |
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 'tests/auto/unit')
| -rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h index b86083472..0538a5f13 100644 --- a/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockcamerafocuscontrol.h @@ -60,18 +60,18 @@ public: ~MockCameraFocusControl() {} - QCameraFocus::FocusMode focusMode() const + QCameraFocus::FocusModes focusMode() const { return m_focusMode; } - void setFocusMode(QCameraFocus::FocusMode mode) + void setFocusMode(QCameraFocus::FocusModes mode) { if (isFocusModeSupported(mode)) m_focusMode = mode; } - bool isFocusModeSupported(QCameraFocus::FocusMode mode) const + bool isFocusModeSupported(QCameraFocus::FocusModes mode) const { return mode == QCameraFocus::AutoFocus || mode == QCameraFocus::ContinuousFocus; } @@ -127,7 +127,7 @@ public: } private: - QCameraFocus::FocusMode m_focusMode; + QCameraFocus::FocusModes m_focusMode; QCameraFocus::FocusPointMode m_focusPointMode; QPointF m_focusPoint; // to emit focus zone changed signal |