diff options
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera_p.h')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index ff6f40b34..30604c6da 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -79,7 +79,7 @@ class QDeclarativeCamera : public QObject, public QDeclarativeParserStatus Q_OBJECT Q_INTERFACES(QDeclarativeParserStatus) - Q_PROPERTY(CaptureModes captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged) + Q_PROPERTY(CaptureMode captureMode READ captureMode WRITE setCaptureMode NOTIFY captureModeChanged) Q_PROPERTY(State cameraState READ cameraState WRITE setCameraState NOTIFY cameraStateChanged) Q_PROPERTY(LockStatus lockStatus READ lockStatus NOTIFY lockStatusChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged) @@ -114,7 +114,6 @@ public: CaptureStillImage = QCamera::CaptureStillImage, CaptureVideo = QCamera::CaptureVideo }; - Q_DECLARE_FLAGS(CaptureModes, CaptureMode) enum State { @@ -180,7 +179,6 @@ public: FocusContinuous = QCameraFocus::ContinuousFocus, FocusMacro = QCameraFocus::MacroFocus }; - Q_DECLARE_FLAGS(FocusModes, FocusMode) enum FocusPointMode { FocusPointAuto = QCameraFocus::FocusPointAuto, @@ -208,7 +206,7 @@ public: QDeclarativeCameraFocus *focus() { return m_focus; } QDeclarativeCameraImageProcessing *imageProcessing() { return m_imageProcessing; } - CaptureModes captureMode() const; + CaptureMode captureMode() const; State cameraState() const; Error error() const; @@ -223,7 +221,7 @@ public: qreal digitalZoom() const; public Q_SLOTS: - void setCaptureMode(QDeclarativeCamera::CaptureModes mode); + void setCaptureMode(CaptureMode mode); void start(); void stop(); |