2 files changed, 0 insertions, 92 deletions

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