Add the spot for spot metering mode.

Not yet fully documented in QML - needs a bit of an overhaul first.

Change-Id: Ic11684858fb872d0b4dcedf60b390571371db252
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>

src/multimedia/camera/qcameraexposure.cpp

@@ -311,6 +311,33 @@ void QCameraExposure::setMeteringMode(QCameraExposure::MeteringMode mode)
         d_func()->exposureControl->setMeteringMode(mode);
 }
 
+/*!
+  \property QCameraExposure::spotMeteringPoint
+
+  When supported, this property 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.
+  \since 1.1
+ */
+
+QPointF QCameraExposure::spotMeteringPoint() const
+{
+    return d_func()->exposureControl ? d_func()->exposureControl->exposureParameter(QCameraExposureControl::SpotMeteringPoint).toPointF() : QPointF();
+}
+
+void QCameraExposure::setSpotMeteringPoint(const QPointF &point)
+{
+    if (d_func()->exposureControl)
+        d_func()->exposureControl->setExposureParameter(QCameraExposureControl::SpotMeteringPoint, point);
+}
+
+
 /*!
     Returns true if the metering \a mode is supported.
     \since 1.1

src/multimedia/camera/qcameraexposure.h

@@ -120,6 +120,9 @@ public:
 
     bool isMeteringModeSupported(MeteringMode mode) const;
 
+    QPointF spotMeteringPoint() const;
+    void setSpotMeteringPoint(const QPointF &point);
+
     int isoSensitivity() const;
     QList<int> supportedIsoSensitivities(bool *continuous = 0) const;
 

src/multimedia/controls/qcameraexposurecontrol.cpp

@@ -133,7 +133,6 @@ QCameraExposureControl::~QCameraExposureControl()
   \since 1.1
 */
 
-
 /*!
   \fn bool QCameraExposureControl::isMeteringModeSupported(QCameraExposure::MeteringMode mode) const
     Returns true if the metering \a mode is supported.
@@ -162,6 +161,9 @@ QCameraExposureControl::~QCameraExposureControl()
          This value is only used in the \l{QCameraExposure::FlashManual}{manual 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 ExtendedExposureParameter
          The base value for platform specific extended parameters.
          For such parameters the sequential values starting from ExtendedExposureParameter shuld be used.

src/multimedia/controls/qcameraexposurecontrol.h

@@ -72,6 +72,7 @@ public:
         ExposureCompensation = 4,
         FlashPower = 5,
         FlashCompensation = 6,
+        SpotMeteringPoint = 7,
         ExtendedExposureParameter = 1000
     };