Kill QCameraExposure::MeteringMode

This was not implemented in any of our plugins.

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

15 files changed, 1 insertions, 230 deletions

diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
index 123d6acc0..864026be8 100644
--- a/src/imports/multimedia/plugins.qmltypes
+++ b/src/imports/multimedia/plugins.qmltypes
@@ -675,14 +675,6 @@ Module {
             }
         }
         Enum {
-            name: "MeteringMode"
-            values: {
-                "MeteringMatrix": 1,
-                "MeteringAverage": 2,
-                "MeteringSpot": 3
-            }
-        }
-        Enum {
             name: "FocusMode"
             values: {
                 "FocusManual": 1,
@@ -947,14 +939,6 @@ Module {
                 "ExposureModeVendor": 1000
             }
         }
-        Enum {
-            name: "MeteringMode"
-            values: {
-                "MeteringMatrix": 1,
-                "MeteringAverage": 2,
-                "MeteringSpot": 3
-            }
-        }
         Property { name: "exposureCompensation"; type: "double" }
         Property { name: "iso"; type: "int"; isReadonly: true }
         Property { name: "shutterSpeed"; type: "double"; isReadonly: true }
@@ -964,8 +948,6 @@ Module {
         Property { name: "manualIso"; type: "double" }
         Property { name: "exposureMode"; type: "ExposureMode" }
         Property { name: "supportedExposureModes"; revision: 1; type: "QVariantList"; isReadonly: true }
-        Property { name: "spotMeteringPoint"; type: "QPointF" }
-        Property { name: "meteringMode"; type: "MeteringMode" }
         Signal {
             name: "isoSensitivityChanged"
             Parameter { type: "int" }
@@ -998,14 +980,6 @@ Module {
             name: "exposureModeChanged"
             Parameter { type: "ExposureMode" }
         }
-        Signal {
-            name: "meteringModeChanged"
-            Parameter { type: "MeteringMode" }
-        }
-        Signal {
-            name: "spotMeteringPointChanged"
-            Parameter { type: "QPointF" }
-        }
         Method {
             name: "setExposureMode"
             Parameter { type: "ExposureMode" }
@@ -1532,7 +1506,6 @@ Module {
         Property { name: "dateTimeOriginal"; type: "QVariant" }
         Property { name: "dateTimeDigitized"; type: "QVariant" }
         Property { name: "subjectDistance"; type: "QVariant" }
-        Property { name: "meteringMode"; type: "QVariant" }
         Property { name: "lightSource"; type: "QVariant" }
         Property { name: "flash"; type: "QVariant" }
         Property { name: "focalLength"; type: "QVariant" }
diff --git a/src/imports/multimedia/qdeclarativecamera_p.h b/src/imports/multimedia/qdeclarativecamera_p.h
index 4a341e830..02e0a0b21 100644
--- a/src/imports/multimedia/qdeclarativecamera_p.h
+++ b/src/imports/multimedia/qdeclarativecamera_p.h
@@ -115,7 +115,6 @@ class QDeclarativeCamera : public QObject, public QQmlParserStatus
 
     Q_ENUMS(FlashMode)
     Q_ENUMS(ExposureMode)
-    Q_ENUMS(MeteringMode)
 
     Q_ENUMS(FocusMode)
     Q_ENUMS(FocusPointMode)
@@ -209,12 +208,6 @@ public:
         ExposureModeVendor = QCameraExposure::ExposureModeVendor
     };
 
-    enum MeteringMode {
-        MeteringMatrix = QCameraExposure::MeteringMatrix,
-        MeteringAverage = QCameraExposure::MeteringAverage,
-        MeteringSpot = QCameraExposure::MeteringSpot
-    };
-
     enum FocusMode {
         FocusManual = QCameraFocus::ManualFocus,
         FocusHyperfocal = QCameraFocus::HyperfocalFocus,
diff --git a/src/imports/multimedia/qdeclarativecameraexposure.cpp b/src/imports/multimedia/qdeclarativecameraexposure.cpp
index af8c6acf6..641b49774 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure.cpp
+++ b/src/imports/multimedia/qdeclarativecameraexposure.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule QtMultimedia
 
     CameraExposure allows you to adjust exposure related settings
-    like aperture and shutter speed, metering and ISO speed.
+    like aperture and shutter speed and ISO speed.
 
     It should not be constructed separately, instead the
     \c exposure property of the a \l Camera should be used.
@@ -398,67 +398,6 @@ QVariantList QDeclarativeCameraExposure::supportedExposureModes() const
     return supportedModes;
 }
 
-/*!
-    \property QDeclarativeCameraExposure::spotMeteringPoint
-
-    This property holds the relative frame coordinates of the point to use
-    for exposure metering. This point is only used in spot metering mode, and it
-    typically defaults to the center \c (0.5, 0.5).
- */
-/*!
-    \qmlproperty QPointF QtMultimedia::CameraExposure::spotMeteringPoint
-
-    The property holds the frame coordinates of the point to use for exposure metering.
-    This point is only used in spot metering mode, and it typically defaults
-    to the center \c (0.5, 0.5).
- */
-
-QPointF QDeclarativeCameraExposure::spotMeteringPoint() const
-{
-    return m_exposure->spotMeteringPoint();
-}
-
-void QDeclarativeCameraExposure::setSpotMeteringPoint(const QPointF &point)
-{
-    QPointF oldPoint(spotMeteringPoint());
-    m_exposure->setSpotMeteringPoint(point);
-
-    if (oldPoint != spotMeteringPoint())
-        emit spotMeteringPointChanged(spotMeteringPoint());
-}
-/*!
-    \property QDeclarativeCameraExposure::meteringMode
-
-    This property holds the camera metering mode (how exposure is balanced).
-    The mode can be one of the constants in \l QCameraExposure::MeteringMode.
-*/
-/*!
-    \qmlproperty enumeration QtMultimedia::CameraExposure::meteringMode
-
-    This property holds the camera metering mode (how exposure is balanced).
-
-    The mode can be one of the following:
-
-    \table
-    \header \li Value \li Description
-    \row \li Camera.MeteringMatrix       \li A matrix of sample points is used to measure exposure.
-    \row \li Camera.MeteringAverage      \li An average is used to measure exposure.
-    \row \li Camera.MeteringSpot         \li A specific location (\l spotMeteringPoint) is used to measure exposure.
-    \endtable
-*/
-QDeclarativeCameraExposure::MeteringMode QDeclarativeCameraExposure::meteringMode() const
-{
-    return QDeclarativeCameraExposure::MeteringMode(m_exposure->meteringMode());
-}
-
-void QDeclarativeCameraExposure::setMeteringMode(QDeclarativeCameraExposure::MeteringMode mode)
-{
-    QDeclarativeCameraExposure::MeteringMode oldMode = meteringMode();
-    m_exposure->setMeteringMode(QCameraExposure::MeteringMode(mode));
-    if (oldMode != meteringMode())
-        emit meteringModeChanged(meteringMode());
-}
-
 QT_END_NAMESPACE
 
 #include "moc_qdeclarativecameraexposure_p.cpp"
diff --git a/src/imports/multimedia/qdeclarativecameraexposure_p.h b/src/imports/multimedia/qdeclarativecameraexposure_p.h
index ef99b1ce9..006fcc80c 100644
--- a/src/imports/multimedia/qdeclarativecameraexposure_p.h
+++ b/src/imports/multimedia/qdeclarativecameraexposure_p.h
@@ -75,11 +75,7 @@ class QDeclarativeCameraExposure : public QObject
     Q_PROPERTY(ExposureMode exposureMode READ exposureMode WRITE setExposureMode NOTIFY exposureModeChanged)
     Q_PROPERTY(QVariantList supportedExposureModes READ supportedExposureModes NOTIFY supportedExposureModesChanged REVISION 1)
 
-    Q_PROPERTY(QPointF spotMeteringPoint READ spotMeteringPoint WRITE setSpotMeteringPoint NOTIFY spotMeteringPointChanged)
-    Q_PROPERTY(MeteringMode meteringMode READ meteringMode WRITE setMeteringMode NOTIFY meteringModeChanged)
-
     Q_ENUMS(ExposureMode)
-    Q_ENUMS(MeteringMode)
 public:
     enum ExposureMode {
         ExposureAuto = QCameraExposure::ExposureAuto,
@@ -106,12 +102,6 @@ public:
         ExposureModeVendor = QCameraExposure::ExposureModeVendor
     };
 
-    enum MeteringMode {
-        MeteringMatrix = QCameraExposure::MeteringMatrix,
-        MeteringAverage = QCameraExposure::MeteringAverage,
-        MeteringSpot = QCameraExposure::MeteringSpot
-    };
-
     ~QDeclarativeCameraExposure();
 
     ExposureMode exposureMode() const;
@@ -126,12 +116,6 @@ public:
     qreal manualShutterSpeed() const;
     qreal manualAperture() const;
 
-    QPointF spotMeteringPoint() const;
-    void setSpotMeteringPoint(const QPointF &point);
-
-    MeteringMode meteringMode() const;
-    void setMeteringMode(MeteringMode mode);
-
 public Q_SLOTS:
     void setExposureMode(ExposureMode);
     void setExposureCompensation(qreal ev);
@@ -157,9 +141,6 @@ Q_SIGNALS:
     void exposureModeChanged(ExposureMode);
     void supportedExposureModesChanged();
 
-    void meteringModeChanged(MeteringMode);
-    void spotMeteringPointChanged(QPointF);
-
 private:
     friend class QDeclarativeCamera;
     QDeclarativeCameraExposure(QCamera *camera, QObject *parent = 0);
diff --git a/src/imports/multimedia/qdeclarativemediametadata_p.h b/src/imports/multimedia/qdeclarativemediametadata_p.h
index ede7f8723..06afcffd4 100644
--- a/src/imports/multimedia/qdeclarativemediametadata_p.h
+++ b/src/imports/multimedia/qdeclarativemediametadata_p.h
@@ -122,7 +122,6 @@ class QDeclarativeMediaMetaData : public QObject
     Q_PROPERTY(QVariant dateTimeOriginal READ dateTimeOriginal WRITE setDateTimeOriginal NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant dateTimeDigitized READ dateTimeDigitized WRITE setDateTimeDigitized NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant subjectDistance READ subjectDistance WRITE setSubjectDistance NOTIFY metaDataChanged)
-    Q_PROPERTY(QVariant meteringMode READ meteringMode WRITE setMeteringMode NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant lightSource READ lightSource WRITE setLightSource NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant flash READ flash WRITE setFlash NOTIFY metaDataChanged)
     Q_PROPERTY(QVariant focalLength READ focalLength WRITE setFocalLength NOTIFY metaDataChanged)
@@ -336,8 +335,6 @@ QT_WARNING_POP
         return m_mediaObject->metaData(QMediaMetaData::SubjectDistance); }
     void setSubjectDistance(const QVariant &distance) {
         setMetaData(QMediaMetaData::SubjectDistance, distance); }
-    QVariant meteringMode() const { return m_mediaObject->metaData(QMediaMetaData::MeteringMode); }
-    void setMeteringMode(const QVariant &mode) { setMetaData(QMediaMetaData::MeteringMode, mode); }
     QVariant lightSource() const { return m_mediaObject->metaData(QMediaMetaData::LightSource); }
     void setLightSource(const QVariant &source) {
         setMetaData(QMediaMetaData::LightSource, source); }
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 022dea28c..382e58bea 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -67,7 +67,6 @@ static void qRegisterCameraExposureMetaTypes()
 {
     qRegisterMetaType<QCameraExposure::ExposureMode>("QCameraExposure::ExposureMode");
     qRegisterMetaType<QCameraExposure::FlashModes>("QCameraExposure::FlashModes");
-    qRegisterMetaType<QCameraExposure::MeteringMode>("QCameraExposure::MeteringMode");
 }
 
 Q_CONSTRUCTOR_FUNCTION(qRegisterCameraExposureMetaTypes)
@@ -309,72 +308,6 @@ void QCameraExposure::setExposureCompensation(qreal ev)
     d_func()->setExposureParameter<qreal>(QCameraExposureControl::ExposureCompensation, ev);
 }
 
-/*!
-  \property QCameraExposure::meteringMode
-  \brief The metering mode being used.
-
-  \sa QCameraExposure::isMeteringModeSupported()
-*/
-
-QCameraExposure::MeteringMode QCameraExposure::meteringMode() const
-{
-    return d_func()->actualExposureParameter<QCameraExposure::MeteringMode>(QCameraExposureControl::MeteringMode, QCameraExposure::MeteringMatrix);
-}
-
-void QCameraExposure::setMeteringMode(QCameraExposure::MeteringMode mode)
-{
-    d_func()->setExposureParameter<QCameraExposure::MeteringMode>(QCameraExposureControl::MeteringMode, mode);
-}
-
-/*!
-  \fn QCameraExposure::spotMeteringPoint() const
-
-  When supported, the spot metering point is the (normalized) position of the point of the image
-  where exposure metering will be performed.  This is typically used to indicate an
-  "interesting" area of the image that should be exposed properly.
-
-  The coordinates are relative frame coordinates:
-  QPointF(0,0) points to the left top frame point, QPointF(0.5,0.5) points to the frame center,
-  which is typically the default spot metering point.
-
-  The spot metering point is only used with spot metering mode.
-
-  \sa setSpotMeteringPoint()
-*/
-
-QPointF QCameraExposure::spotMeteringPoint() const
-{
-    return d_func()->exposureControl ? d_func()->exposureControl->actualValue(QCameraExposureControl::SpotMeteringPoint).toPointF() : QPointF();
-}
-
-/*!
-  \fn QCameraExposure::setSpotMeteringPoint(const QPointF &point)
-
-  Allows setting the spot metering point to \a point.
-
-  \sa spotMeteringPoint()
-*/
-
-void QCameraExposure::setSpotMeteringPoint(const QPointF &point)
-{
-    if (d_func()->exposureControl)
-        d_func()->exposureControl->setValue(QCameraExposureControl::SpotMeteringPoint, point);
-}
-
-
-/*!
-    Returns true if the metering \a mode is supported.
-*/
-bool QCameraExposure::isMeteringModeSupported(QCameraExposure::MeteringMode mode) const
-{
-    if (!d_func()->exposureControl)
-        return false;
-
-    bool continuous = false;
-    return d_func()->exposureControl->supportedParameterRange(QCameraExposureControl::MeteringMode, &continuous)
-            .contains(QVariant::fromValue<QCameraExposure::MeteringMode>(mode));
-}
-
 int QCameraExposure::isoSensitivity() const
 {
     return d_func()->actualExposureParameter<int>(QCameraExposureControl::ISO, -1);
@@ -652,14 +585,6 @@ void QCameraExposure::setAutoShutterSpeed()
 */
 
 /*!
-    \enum QCameraExposure::MeteringMode
-
-    \value MeteringMatrix        Matrix metering mode.
-    \value MeteringAverage       Center weighted average metering mode.
-    \value MeteringSpot          Spot metering mode.
-*/
-
-/*!
     \property QCameraExposure::flashReady
     \brief Indicates if the flash is charged and ready to use.
 */
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index a1dc96701..f4522d8c7 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -59,11 +59,9 @@ class Q_MULTIMEDIA_EXPORT QCameraExposure : public QObject
     Q_PROPERTY(bool flashReady READ isFlashReady NOTIFY flashReady)
     Q_PROPERTY(QCameraExposure::FlashModes flashMode READ flashMode WRITE setFlashMode)
     Q_PROPERTY(QCameraExposure::ExposureMode exposureMode READ exposureMode WRITE setExposureMode)
-    Q_PROPERTY(QCameraExposure::MeteringMode meteringMode READ meteringMode WRITE setMeteringMode)
 
     Q_ENUMS(FlashMode)
     Q_ENUMS(ExposureMode)
-    Q_ENUMS(MeteringMode)
 public:
     enum FlashMode {
         FlashAuto = 0x1,
@@ -104,12 +102,6 @@ public:
         ExposureModeVendor = 1000
     };
 
-    enum MeteringMode {
-        MeteringMatrix = 1,
-        MeteringAverage = 2,
-        MeteringSpot = 3
-    };
-
     bool isAvailable() const;
 
     FlashModes flashMode() const;
@@ -121,12 +113,6 @@ public:
 
     qreal exposureCompensation() const;
 
-    MeteringMode meteringMode() const;
-    bool isMeteringModeSupported(MeteringMode mode) const;
-
-    QPointF spotMeteringPoint() const;
-    void setSpotMeteringPoint(const QPointF &point);
-
     int isoSensitivity() const;
     qreal aperture() const;
     qreal shutterSpeed() const;
@@ -142,7 +128,6 @@ public:
 public Q_SLOTS:
     void setFlashMode(FlashModes mode);
     void setExposureMode(ExposureMode mode);
-    void setMeteringMode(MeteringMode mode);
 
     void setExposureCompensation(qreal ev);
 
@@ -186,10 +171,8 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QCameraExposure::ExposureMode)
 Q_DECLARE_METATYPE(QCameraExposure::FlashModes)
-Q_DECLARE_METATYPE(QCameraExposure::MeteringMode)
 
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
-Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)
 
 #endif // QCAMERAEXPOSURE_H
diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp
index 2095c9cfa..06ccb496f 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.cpp
+++ b/src/multimedia/controls/qcameraexposurecontrol.cpp
@@ -117,13 +117,8 @@ QCameraExposureControl::~QCameraExposureControl()
          This value is only used in the \l{QCameraExposure::FlashTorch}{torch flash mode}.
   \value FlashCompensation
          Flash compensation, specified as qreal EV value.
-  \value SpotMeteringPoint
-         The relative frame coordinate of the point to use for exposure metering
-         in spot metering mode, specified as a QPointF.
   \value ExposureMode
          Camera exposure mode.
-  \value MeteringMode
-         Camera metering mode.
   \value ExtendedExposureParameter
          The base value for platform specific extended parameters.
          For such parameters the sequential values starting from ExtendedExposureParameter should be used.
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index 7694380e5..563ee6f92 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -68,9 +68,7 @@ public:
         FlashPower,
         FlashCompensation,
         TorchPower,
-        SpotMeteringPoint,
         ExposureMode,
-        MeteringMode,
         ExtendedExposureParameter = 1000
     };
 
diff --git a/src/multimedia/qmediametadata.cpp b/src/multimedia/qmediametadata.cpp
index 0b2343443..5607bd5d2 100644
--- a/src/multimedia/qmediametadata.cpp
+++ b/src/multimedia/qmediametadata.cpp
@@ -133,7 +133,6 @@ Q_DEFINE_METADATA(ExposureBiasValue);
 Q_DEFINE_METADATA(DateTimeOriginal);
 Q_DEFINE_METADATA(DateTimeDigitized);
 Q_DEFINE_METADATA(SubjectDistance);
-Q_DEFINE_METADATA(MeteringMode);
 Q_DEFINE_METADATA(LightSource);
 Q_DEFINE_METADATA(Flash);
 Q_DEFINE_METADATA(FocalLength);
@@ -275,7 +274,6 @@ Q_DEFINE_METADATA(ThumbnailImage);
     \row \li DateTimeOriginal \li The date and time when the original image data was generated. \li QDateTime
     \row \li DateTimeDigitized \li The date and time when the image was stored as digital data.  \li QDateTime
     \row \li SubjectDistance \li The distance to the subject, given in meters. \li qreal
-    \row \li MeteringMode \li The metering mode.  \li QCameraExposure::MeteringMode
     \row \li LightSource
         \li The kind of light source. \li QString
     \row \li Flash
diff --git a/src/multimedia/qmediametadata.h b/src/multimedia/qmediametadata.h
index 8d8744490..bea76b8a5 100644
--- a/src/multimedia/qmediametadata.h
+++ b/src/multimedia/qmediametadata.h
@@ -131,7 +131,6 @@ namespace QMediaMetaData {
     QString DateTimeOriginal;
     QString DateTimeDigitized;
     QString SubjectDistance;
-    QString MeteringMode;
     QString LightSource;
     QString Flash;
     QString FocalLength;
@@ -243,7 +242,6 @@ namespace QMediaMetaData {
     Q_DECLARE_METADATA(DateTimeOriginal);
     Q_DECLARE_METADATA(DateTimeDigitized);
     Q_DECLARE_METADATA(SubjectDistance);
-    Q_DECLARE_METADATA(MeteringMode);
     Q_DECLARE_METADATA(LightSource);
     Q_DECLARE_METADATA(Flash);
     Q_DECLARE_METADATA(FocalLength);
diff --git a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp
index cf4587379..ca6de4827 100644
--- a/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcameraexposurecontrol.cpp
@@ -79,12 +79,8 @@ bool QAndroidCameraExposureControl::isParameterSupported(ExposureParameter param
         return false;
     case QCameraExposureControl::TorchPower:
         return false;
-    case QCameraExposureControl::SpotMeteringPoint:
-        return false;
     case QCameraExposureControl::ExposureMode:
         return !m_supportedExposureModes.isEmpty();
-    case QCameraExposureControl::MeteringMode:
-        return false;
     default:
         return false;
     }
diff --git a/src/plugins/gstreamer/camerabin/camerabinexposure.cpp b/src/plugins/gstreamer/camerabin/camerabinexposure.cpp
index 65a8539d5..bf9979701 100644
--- a/src/plugins/gstreamer/camerabin/camerabinexposure.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinexposure.cpp
@@ -168,8 +168,6 @@ QVariant CameraBinExposure::actualValue(ExposureParameter parameter) const
             return QVariant::fromValue(QCameraExposure::ExposureAuto);
         }
     }
-    case QCameraExposureControl::MeteringMode:
-        return QCameraExposure::MeteringMatrix;
     default:
         return QVariant();
     }
diff --git a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
index d0b34a61d..44034ec3b 100644
--- a/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinimagecapture.cpp
@@ -134,7 +134,6 @@ GstPadProbeReturn CameraBinImageCapture::encoderEventProbe(
         tags[QMediaMetaData::WhiteBalance] = extendedTags.value("capturing-white-balance");
         tags[QMediaMetaData::Flash] = extendedTags.value("capturing-flash-fired");
         tags[QMediaMetaData::FocalLengthIn35mmFilm] = extendedTags.value("capturing-focal-length");
-        tags[QMediaMetaData::MeteringMode] = extendedTags.value("capturing-metering-mode");
         tags[QMediaMetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode");
         tags[QMediaMetaData::FNumber] = extendedTags.value("capturing-focal-ratio");
         tags[QMediaMetaData::ExposureMode] = extendedTags.value("capturing-exposure-mode");
diff --git a/src/plugins/qnx/camera/bbcameraexposurecontrol.cpp b/src/plugins/qnx/camera/bbcameraexposurecontrol.cpp
index 795e42877..7e6749816 100644
--- a/src/plugins/qnx/camera/bbcameraexposurecontrol.cpp
+++ b/src/plugins/qnx/camera/bbcameraexposurecontrol.cpp
@@ -69,8 +69,6 @@ bool BbCameraExposureControl::isParameterSupported(ExposureParameter parameter)
         return false;
     case QCameraExposureControl::TorchPower:
         return false;
-    case QCameraExposureControl::SpotMeteringPoint:
-        return false;
     case QCameraExposureControl::ExposureMode:
         return true;
     case QCameraExposureControl::MeteringMode: