Remove unused exposure settings

Those enum values aren't supported by any camera API we
integrate with, get rid of them.

Change-Id: Ie2bffd060ed741230802de0b833e71beb2642e05
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

4 files changed, 26 insertions, 51 deletions

diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 08d3864d2..96534656c 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -580,24 +580,19 @@ Module {
                 "ExposureManual": 1,
                 "ExposurePortrait": 2,
                 "ExposureNight": 3,
-                "ExposureBacklight": 4,
-                "ExposureSpotlight": 5,
-                "ExposureSports": 6,
-                "ExposureSnow": 7,
-                "ExposureBeach": 8,
-                "ExposureLargeAperture": 9,
-                "ExposureSmallAperture": 10,
-                "ExposureAction": 11,
-                "ExposureLandscape": 12,
-                "ExposureNightPortrait": 13,
-                "ExposureTheatre": 14,
-                "ExposureSunset": 15,
-                "ExposureSteadyPhoto": 16,
-                "ExposureFireworks": 17,
-                "ExposureParty": 18,
-                "ExposureCandlelight": 19,
-                "ExposureBarcode": 20,
-                "ExposureModeVendor": 1000
+                "ExposureSports": 4,
+                "ExposureSnow": 5,
+                "ExposureBeach": 6,
+                "ExposureAction": 7,
+                "ExposureLandscape": 8,
+                "ExposureNightPortrait": 9,
+                "ExposureTheatre": 10,
+                "ExposureSunset": 11,
+                "ExposureSteadyPhoto": 12,
+                "ExposureFireworks": 13,
+                "ExposureParty": 14,
+                "ExposureCandlelight": 15,
+                "ExposureBarcode": 16,
             }
         }
         Enum {
@@ -838,24 +833,19 @@ Module {
                 "ExposureManual": 1,
                 "ExposurePortrait": 2,
                 "ExposureNight": 3,
-                "ExposureBacklight": 4,
-                "ExposureSpotlight": 5,
-                "ExposureSports": 6,
-                "ExposureSnow": 7,
-                "ExposureBeach": 8,
-                "ExposureLargeAperture": 9,
-                "ExposureSmallAperture": 10,
-                "ExposureAction": 11,
-                "ExposureLandscape": 12,
-                "ExposureNightPortrait": 13,
-                "ExposureTheatre": 14,
-                "ExposureSunset": 15,
-                "ExposureSteadyPhoto": 16,
-                "ExposureFireworks": 17,
-                "ExposureParty": 18,
-                "ExposureCandlelight": 19,
-                "ExposureBarcode": 20,
-                "ExposureModeVendor": 1000
+                "ExposureSports": 4,
+                "ExposureSnow": 5,
+                "ExposureBeach": 6,
+                "ExposureAction": 7,
+                "ExposureLandscape": 8,
+                "ExposureNightPortrait": 9,
+                "ExposureTheatre": 10,
+                "ExposureSunset": 11,
+                "ExposureSteadyPhoto": 12,
+                "ExposureFireworks": 13,
+                "ExposureParty": 14,
+                "ExposureCandlelight": 15,
+                "ExposureBarcode": 16,
             }
         }
         Property { name: "exposureCompensation"; type: "double" }
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index fc60b2bba..4db93f13f 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -156,13 +156,9 @@ public:
         ExposureManual = QCameraExposure::ExposureManual,
         ExposurePortrait = QCameraExposure::ExposurePortrait,
         ExposureNight = QCameraExposure::ExposureNight,
-        ExposureBacklight = QCameraExposure::ExposureBacklight,
-        ExposureSpotlight = QCameraExposure::ExposureSpotlight,
         ExposureSports = QCameraExposure::ExposureSports,
         ExposureSnow = QCameraExposure::ExposureSnow,
         ExposureBeach = QCameraExposure::ExposureBeach,
-        ExposureLargeAperture = QCameraExposure::ExposureLargeAperture,
-        ExposureSmallAperture = QCameraExposure::ExposureSmallAperture,
         ExposureAction = QCameraExposure::ExposureAction,
         ExposureLandscape = QCameraExposure::ExposureLandscape,
         ExposureNightPortrait = QCameraExposure::ExposureNightPortrait,
@@ -173,7 +169,6 @@ public:
         ExposureParty = QCameraExposure::ExposureParty,
         ExposureCandlelight = QCameraExposure::ExposureCandlelight,
         ExposureBarcode = QCameraExposure::ExposureBarcode,
-        ExposureModeVendor = QCameraExposure::ExposureModeVendor
     };
 
     enum FocusMode {
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index c9a2df57e..ec7122666 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -341,13 +341,9 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity()
     \row \li Camera.ExposureManual        \li Manual mode.
     \row \li Camera.ExposureAuto          \li Automatic mode.
     \row \li Camera.ExposureNight         \li Night mode.
-    \row \li Camera.ExposureBacklight     \li Backlight exposure mode.
-    \row \li Camera.ExposureSpotlight     \li Spotlight exposure mode.
     \row \li Camera.ExposureSports        \li Spots exposure mode.
     \row \li Camera.ExposureSnow          \li Snow exposure mode.
     \row \li Camera.ExposureBeach         \li Beach exposure mode.
-    \row \li Camera.ExposureLargeAperture \li Use larger aperture with small depth of field.
-    \row \li Camera.ExposureSmallAperture \li Use smaller aperture.
     \row \li Camera.ExposurePortrait      \li Portrait exposure mode.
     \row \li Camera.ExposureAction        \li Action exposure mode.  Since 5.5
     \row \li Camera.ExposureLandscape     \li Landscape exposure mode.  Since 5.5
@@ -359,7 +355,6 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity()
     \row \li Camera.ExposureParty         \li Party exposure mode.  Since 5.5
     \row \li Camera.ExposureCandlelight   \li Candlelight exposure mode.  Since 5.5
     \row \li Camera.ExposureBarcode       \li Barcode exposure mode.  Since 5.5
-    \row \li Camera.ExposureModeVendor    \li The base value for device specific exposure modes.
     \endtable
 */
 
diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h
index 006fcc80c..5471eefa7 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure_p.h
+++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h
@@ -82,13 +82,9 @@ public:
         ExposureManual = QCameraExposure::ExposureManual,
         ExposurePortrait = QCameraExposure::ExposurePortrait,
         ExposureNight = QCameraExposure::ExposureNight,
-        ExposureBacklight = QCameraExposure::ExposureBacklight,
-        ExposureSpotlight = QCameraExposure::ExposureSpotlight,
         ExposureSports = QCameraExposure::ExposureSports,
         ExposureSnow = QCameraExposure::ExposureSnow,
         ExposureBeach = QCameraExposure::ExposureBeach,
-        ExposureLargeAperture = QCameraExposure::ExposureLargeAperture,
-        ExposureSmallAperture = QCameraExposure::ExposureSmallAperture,
         ExposureAction = QCameraExposure::ExposureAction,
         ExposureLandscape = QCameraExposure::ExposureLandscape,
         ExposureNightPortrait = QCameraExposure::ExposureNightPortrait,
@@ -99,7 +95,6 @@ public:
         ExposureParty = QCameraExposure::ExposureParty,
         ExposureCandlelight = QCameraExposure::ExposureCandlelight,
         ExposureBarcode = QCameraExposure::ExposureBarcode,
-        ExposureModeVendor = QCameraExposure::ExposureModeVendor
     };
 
     ~QDeclarativeCameraExposure();