Remove enum values that do not make sense

Vendor specific extensions where anyway never used.

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

3 files changed, 2 insertions, 8 deletions

diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 09c1d39a7..3a14b5ec5 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -1009,7 +1009,6 @@ Module {
                 "WhiteBalanceFluorescent": 6,
                 "WhiteBalanceFlash": 7,
                 "WhiteBalanceSunset": 8,
-                "WhiteBalanceVendor": 1000
             }
         }
         Enum {
@@ -1024,7 +1023,6 @@ Module {
                 "ColorFilterWhiteboard": 6,
                 "ColorFilterBlackboard": 7,
                 "ColorFilterAqua": 8,
-                "ColorFilterVendor": 1000
             }
         }
         Property { name: "whiteBalanceMode"; type: "WhiteBalanceMode" }
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
index a3d8ed5f2..78c1ee25b 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
@@ -112,7 +112,6 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing() = defaul
     \row \li WhiteBalanceFluorescent  \li Fluorescent white balance mode.
     \row \li WhiteBalanceFlash        \li Flash white balance mode.
     \row \li WhiteBalanceSunset       \li Sunset white balance mode.
-    \row \li WhiteBalanceVendor       \li Vendor defined white balance mode.
     \endtable
 
     \sa manualWhiteBalance
@@ -227,7 +226,6 @@ void QDeclarativeCameraImageProcessing::setSaturation(qreal value)
     \row \li CameraImageProcessing.ColorFilterWhiteboard \li A whiteboard filter.
     \row \li CameraImageProcessing.ColorFilterBlackboard \li A blackboard filter.
     \row \li CameraImageProcessing.ColorFilterAqua       \li An aqua filter.
-    \row \li CameraImageProcessing.ColorFilterVendor     \li The base value for vendor defined filters.
     \endtable
 
     \since 5.5
@@ -261,7 +259,7 @@ QVariantList QDeclarativeCameraImageProcessing::supportedColorFilters() const
 {
     QVariantList supportedFilters;
 
-    for (int i = int(ColorFilterNone); i <= int(ColorFilterVendor); ++i) {
+    for (int i = int(ColorFilterNone); i <= int(ColorFilterAqua); ++i) {
         if (m_imageProcessing->isColorFilterSupported((QCameraImageProcessing::ColorFilter) i))
             supportedFilters.append(i);
     }
@@ -280,7 +278,7 @@ QVariantList QDeclarativeCameraImageProcessing::supportedWhiteBalanceModes() con
 {
     QVariantList supportedModes;
 
-    for (int i = int(WhiteBalanceAuto); i <= int(WhiteBalanceVendor); i++) {
+    for (int i = int(WhiteBalanceAuto); i <= int(WhiteBalanceSunset); i++) {
         if (m_imageProcessing->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceMode(i)))
             supportedModes.append(i);
     }
diff --git a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
index 00cfbdee4..1ff715526 100644
--- a/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
+++ b/src/imports/multimedia/qdeclarativecameraimageprocessing_p.h
@@ -86,7 +86,6 @@ public:
         WhiteBalanceFluorescent = QCameraImageProcessing::WhiteBalanceFluorescent,
         WhiteBalanceFlash = QCameraImageProcessing::WhiteBalanceFlash,
         WhiteBalanceSunset = QCameraImageProcessing::WhiteBalanceSunset,
-        WhiteBalanceVendor = QCameraImageProcessing::WhiteBalanceVendor
     };
 
     enum ColorFilter {
@@ -99,7 +98,6 @@ public:
         ColorFilterWhiteboard = QCameraImageProcessing::ColorFilterWhiteboard,
         ColorFilterBlackboard = QCameraImageProcessing::ColorFilterBlackboard,
         ColorFilterAqua = QCameraImageProcessing::ColorFilterAqua,
-        ColorFilterVendor = QCameraImageProcessing::ColorFilterVendor
     };
 
     ~QDeclarativeCameraImageProcessing();