Remove QCamera::aperture() and friends

None of the backends implemented support for it, and
most cameras today don't allow you to change aperture
anyway.

Change-Id: Iad820c0a333e23e8a12d36ac2dd511b4ea5fc047
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 2 insertions, 78 deletions

diff --git a/tests/auto/unit/mockbackend/qmockcameraexposure.h b/tests/auto/unit/mockbackend/qmockcameraexposure.h
index 635c76086..61d5104b1 100644
--- a/tests/auto/unit/mockbackend/qmockcameraexposure.h
+++ b/tests/auto/unit/mockbackend/qmockcameraexposure.h
@@ -37,7 +37,6 @@ class QMockCameraExposure : public QPlatformCameraExposure
 public:
     QMockCameraExposure(QObject *parent = 0):
         QPlatformCameraExposure(parent),
-        m_aperture(2.8),
         m_shutterSpeed(0.01),
         m_isoSensitivity(100),
         m_exposureCompensation(0),
@@ -45,7 +44,6 @@ public:
         m_flashMode(QCamera::FlashAuto)
     {
         m_isoRanges << 100 << 200 << 400 << 800;
-        m_apertureRanges << 2.8 << 4.0 << 5.6 << 8.0 << 11.0 << 16.0;
         m_shutterRanges << 0.001 << 0.01 << 0.1 << 1.0;
         m_exposureRanges << -2.0 << 2.0;
 
@@ -71,7 +69,6 @@ public:
         case QPlatformCameraExposure::ExposureMode:
         case QPlatformCameraExposure::ExposureCompensation:
         case QPlatformCameraExposure::ISO:
-        case QPlatformCameraExposure::Aperture:
         case QPlatformCameraExposure::ShutterSpeed:
             return true;
         default:
@@ -93,8 +90,6 @@ public:
             return QVariant(m_exposureCompensation);
         case QPlatformCameraExposure::ISO:
             return QVariant(m_isoSensitivity);
-        case QPlatformCameraExposure::Aperture:
-            return QVariant(m_aperture);
         case QPlatformCameraExposure::ShutterSpeed:
             return QVariant(m_shutterSpeed);
         default:
@@ -113,9 +108,6 @@ public:
             return m_exposureRanges;
         case QPlatformCameraExposure::ISO:
             return m_isoRanges;
-        case QPlatformCameraExposure::Aperture:
-            *continuous = true;
-            return m_apertureRanges;
         case QPlatformCameraExposure::ShutterSpeed:
             *continuous = true;
             return m_shutterRanges;
@@ -183,24 +175,7 @@ public:
             }
         }
             break;
-        case QPlatformCameraExposure::Aperture:
-        {
-            m_res.clear();
-            m_res << 12.0 << 18.0 << 20.0;
-            qreal exposureCompensationlocal = qBound<qreal>(2.8, value.toReal(), 16.0);
-            if (actualValue(param).toReal() !=  exposureCompensationlocal) {
-                m_aperture = exposureCompensationlocal;
-                emit actualValueChanged(param);
-            }
-
-            if (m_apertureRanges.last().toReal() != m_res.last().toReal()) {
-                m_apertureRanges.clear();
-                m_apertureRanges = m_res;
-                emit parameterRangeChanged(param);
-            }
-        }
-            break;
-        case QPlatformCameraExposure::ShutterSpeed:
+       case QPlatformCameraExposure::ShutterSpeed:
         {
             m_res.clear();
             m_res << 0.12 << 1.0 << 2.0;
@@ -250,13 +225,12 @@ public:
     }
 
 private:
-    qreal m_aperture;
     qreal m_shutterSpeed;
     int m_isoSensitivity;
     qreal m_exposureCompensation;
     QCamera::ExposureMode m_exposureMode;
     QCamera::FlashMode m_flashMode;
-    QVariantList m_isoRanges,m_apertureRanges, m_shutterRanges, m_exposureRanges, m_res, m_exposureModes;
+    QVariantList m_isoRanges, m_shutterRanges, m_exposureRanges, m_res, m_exposureModes;
 
     QMap<QPlatformCameraExposure::ExposureParameter, QVariant> m_requestedParameters;
 };
diff --git a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
index 46a3f1444..41099d667 100644
--- a/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/multimedia/qcamera/tst_qcamera.cpp
@@ -101,7 +101,6 @@ private slots:
     void testEnumDebug();
 
     // Signals test cases for exposure related properties
-    void testSignalApertureChanged();
     void testSignalExposureCompensationChanged();
     void testSignalIsoSensitivityChanged();
     void testSignalShutterSpeedChanged();
@@ -178,13 +177,6 @@ void tst_QCamera::testSimpleCameraExposure()
     camera.setAutoIsoSensitivity();
     QCOMPARE(camera.isoSensitivity(), -1);
 
-    QVERIFY(camera.aperture() < 0);
-    QVERIFY(camera.supportedApertures().isEmpty());
-    camera.setAutoAperture();
-    QVERIFY(camera.aperture() < 0);
-    camera.setManualAperture(5.6);
-    QVERIFY(camera.aperture() < 0);
-
     QVERIFY(camera.shutterSpeed() < 0);
     QVERIFY(camera.supportedShutterSpeeds().isEmpty());
     camera.setAutoShutterSpeed();
@@ -398,30 +390,6 @@ void tst_QCamera::testCameraExposure()
     QCOMPARE(camera.isoSensitivity(), 100);
     QCOMPARE(camera.requestedIsoSensitivity(), -1);
 
-    QCOMPARE(camera.requestedAperture(), -1.0);
-    qreal minAperture = camera.supportedApertures().first();
-    qreal maxAperture = camera.supportedApertures().last();
-    QVERIFY(minAperture > 0);
-    QVERIFY(maxAperture > 0);
-    QVERIFY(camera.aperture() >= minAperture);
-    QVERIFY(camera.aperture() <= maxAperture);
-
-    camera.setAutoAperture();
-    QVERIFY(camera.aperture() >= minAperture);
-    QVERIFY(camera.aperture() <= maxAperture);
-    QCOMPARE(camera.requestedAperture(), -1.0);
-
-    camera.setManualAperture(0);
-    QCOMPARE(camera.aperture(), minAperture);
-    QCOMPARE(camera.requestedAperture()+1.0, 1.0);
-
-    camera.setManualAperture(10000);
-    QCOMPARE(camera.aperture(), maxAperture);
-    QCOMPARE(camera.requestedAperture(), 10000.0);
-
-    camera.setAutoAperture();
-    QCOMPARE(camera.requestedAperture(), -1.0);
-
     QCOMPARE(camera.requestedShutterSpeed(), -1.0);
     qreal minShutterSpeed = camera.supportedShutterSpeeds().first();
     qreal maxShutterSpeed = camera.supportedShutterSpeeds().last();
@@ -919,24 +887,6 @@ void tst_QCamera::testMaxZoomChangedSignal()
     QCOMPARE(camera.maximumZoomFactor(), 55);
 }
 
-void tst_QCamera::testSignalApertureChanged()
-{
-    QMediaCaptureSession session;
-    QCamera camera;
-    session.setCamera(&camera);
-
-    QSignalSpy spyApertureChanged(&camera, SIGNAL(apertureChanged(qreal)));
-    QSignalSpy spyApertureRangeChanged(&camera, SIGNAL(apertureRangeChanged()));
-
-
-    QVERIFY(spyApertureChanged.count() ==0);
-    camera.setManualAperture(10.0);//set the ManualAperture to 10.0
-
-    QTest::qWait(100);
-    QVERIFY(spyApertureChanged.count() ==1);
-    QVERIFY(spyApertureRangeChanged.count() ==1);
-}
-
 void tst_QCamera::testSignalExposureCompensationChanged()
 {
     QMediaCaptureSession session;