diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-01-05 12:03:12 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-22 06:59:57 +0000 |
| commit | 856c37844b831b7786e05efd7bbc1edc5c78b564 (patch) | |
| tree | 0c4b9a34c1ea0f6641c9d26159fae6fcc058e8c0 /src/imports | |
| parent | 9d1defda0d278cbec775087edc26fc72ea72b0ba (diff) | |
Clean up QCamera error enum
We only really need two error values, the others don't
make a whole lot of sense.
Change-Id: I8f798b1ed930ea876442390776528a32b3532e30
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 10 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 6 | ||||
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamera_p.h | 5 |
3 files changed, 3 insertions, 18 deletions
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index 3e3298969..2450865d5 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/src/imports/multimedia/plugins.qmltypes @@ -342,10 +342,7 @@ Module { name: "Error" values: { "NoError": 0, - "CameraError": 1, - "InvalidRequestError": 2, - "ServiceMissingError": 3, - "NotSupportedFeatureError": 4 + "CameraError": 1 } } Enum { @@ -626,10 +623,7 @@ Module { name: "Error" values: { "NoError": 0, - "CameraError": 1, - "InvalidRequestError": 2, - "ServiceMissingError": 3, - "NotSupportedFeatureError": 4 + "CameraError": 1 } } Enum { diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index f36c0c6af..769c0960f 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -738,12 +738,6 @@ void QDeclarativeCamera::setDigitalZoom(qreal value) No errors have occurred. \value Camera.CameraError An error has occurred. - \value Camera.InvalidRequestError - System resources do not support the requested functionality. - \value Camera.ServiceMissingError - No camera service available. - \value Camera.NotSupportedFeatureError - The feature is not supported. \sa errorOccurred, errorString */ diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h index 62454aeb6..f2cb38b51 100644 --- a/src/imports/multimedia/qdeclarativecamera_p.h +++ b/src/imports/multimedia/qdeclarativecamera_p.h @@ -164,10 +164,7 @@ public: enum Error { NoError = QCamera::NoError, - CameraError = QCamera::CameraError, - InvalidRequestError = QCamera::InvalidRequestError, - ServiceMissingError = QCamera::ServiceMissingError, - NotSupportedFeatureError = QCamera::NotSupportedFeatureError + CameraError = QCamera::CameraError }; enum FlashMode { |