Remove contrast/brightness/hue/saturation properties from QCamera

Those methods are only supported on gstreamer (they don't exist
on macOS/iOS). They are probably better implemented as a
postprocessing effect anyway, so remove the from QCamera to keep
the API smaller and more manageable.

Change-Id: Ic203b3cac3384cdb0b6648366d47f6254f299197
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 11 insertions, 105 deletions

diff --git a/examples/multimediawidgets/camera/camera.cpp b/examples/multimediawidgets/camera/camera.cpp
index 38f4427fa..61dc16baf 100644
--- a/examples/multimediawidgets/camera/camera.cpp
+++ b/examples/multimediawidgets/camera/camera.cpp
@@ -133,19 +133,6 @@ void Camera::setCamera(const QCameraInfo &cameraInfo)
     connect(m_imageCapture, &QCameraImageCapture::errorOccurred, this, &Camera::displayCaptureError);
     readyForCapture(m_imageCapture->isReadyForCapture());
 
-    connect(ui->brightnessSlider, &QSlider::valueChanged, [this](int value) {
-        m_camera->setBrightness(value/100.);
-    });
-    connect(ui->contrastSlider, &QSlider::valueChanged, [this](int value) {
-        m_camera->setContrast(value/100.);
-    });
-    connect(ui->saturationSlider, &QSlider::valueChanged, [this](int value) {
-        m_camera->setSaturation(value/100.);
-    });
-    connect(ui->hueSlider, &QSlider::valueChanged, [this](int value) {
-        m_camera->setHue(value/100.);
-    });
-
     updateCaptureMode();
     m_camera->start();
 }
diff --git a/examples/multimediawidgets/camera/camera.ui b/examples/multimediawidgets/camera/camera.ui
index 926928719..560ee7fed 100644
--- a/examples/multimediawidgets/camera/camera.ui
+++ b/examples/multimediawidgets/camera/camera.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>668</width>
-    <height>422</height>
+    <height>429</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,23 +25,7 @@
         <string>Image</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout">
-        <item row="8" column="0">
-         <widget class="QSlider" name="saturationSlider">
-          <property name="minimum">
-           <number>-100</number>
-          </property>
-          <property name="maximum">
-           <number>100</number>
-          </property>
-          <property name="value">
-           <number>0</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="11" column="0">
+        <item row="3" column="0">
          <spacer name="verticalSpacer_2">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
@@ -54,60 +38,6 @@
           </property>
          </spacer>
         </item>
-        <item row="6" column="0">
-         <widget class="QSlider" name="contrastSlider">
-          <property name="minimum">
-           <number>-100</number>
-          </property>
-          <property name="maximum">
-           <number>100</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QSlider" name="brightnessSlider">
-          <property name="minimum">
-           <number>-100</number>
-          </property>
-          <property name="maximum">
-           <number>100</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string>Brightness</string>
-          </property>
-         </widget>
-        </item>
-        <item row="7" column="0">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Saturation</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="label_3">
-          <property name="text">
-           <string>Contrast</string>
-          </property>
-         </widget>
-        </item>
-        <item row="12" column="0">
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Exposure Compensation:</string>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="0">
          <widget class="QPushButton" name="takeImageButton">
           <property name="enabled">
@@ -117,19 +47,12 @@
            <string>Capture Photo</string>
           </property>
           <property name="icon">
-           <iconset>
+           <iconset resource="camera.qrc">
             <normaloff>:/images/shutter.svg</normaloff>:/images/shutter.svg</iconset>
           </property>
          </widget>
         </item>
-        <item row="9" column="0">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string>Hue</string>
-          </property>
-         </widget>
-        </item>
-        <item row="13" column="0">
+        <item row="5" column="0">
          <widget class="QSlider" name="exposureCompensation">
           <property name="minimum">
            <number>-4</number>
@@ -148,16 +71,10 @@
           </property>
          </widget>
         </item>
-        <item row="10" column="0">
-         <widget class="QSlider" name="hueSlider">
-          <property name="minimum">
-           <number>-100</number>
-          </property>
-          <property name="maximum">
-           <number>100</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+        <item row="4" column="0">
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>Exposure Compensation:</string>
           </property>
          </widget>
         </item>
@@ -390,7 +307,9 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="camera.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>recordButton</sender>