Merge branch 'jb44106' into 'mer-5.6'

Add missing camera related enums to qml and their documentation

See merge request mer-core/qtmultimedia!33

src/imports/multimedia/plugins.qmltypes

@@ -371,6 +371,10 @@ Module {
                 "ExposureParty": 18,
                 "ExposureCandlelight": 19,
                 "ExposureBarcode": 20,
+                "ExposureFlowers": 21,
+                "ExposureAR": 22,
+                "ExposureHDR": 23,
+                "ExposureCloseup": 24,
                 "ExposureModeVendor": 1000
             }
         }
@@ -641,6 +645,10 @@ Module {
                 "ExposureParty": 18,
                 "ExposureCandlelight": 19,
                 "ExposureBarcode": 20,
+                "ExposureFlowers": 21,
+                "ExposureAR": 22,
+                "ExposureHDR": 23,
+                "ExposureCloseup": 24,
                 "ExposureModeVendor": 1000
             }
         }
@@ -848,6 +856,7 @@ Module {
                 "WhiteBalanceFluorescent": 6,
                 "WhiteBalanceFlash": 7,
                 "WhiteBalanceSunset": 8,
+                "WhiteBalanceWarmFluorescent": 9,
                 "WhiteBalanceVendor": 1000
             }
         }
@@ -863,6 +872,9 @@ Module {
                 "ColorFilterWhiteboard": 6,
                 "ColorFilterBlackboard": 7,
                 "ColorFilterAqua": 8,
+                "ColorFilterEmboss": 9,
+                "ColorFilterSketch": 10,
+                "ColorFilterNeon": 11,
                 "ColorFilterVendor": 1000
             }
         }

src/imports/multimedia/qdeclarativecamera_p.h

@@ -202,6 +202,10 @@ public:
         ExposureParty = QCameraExposure::ExposureParty,
         ExposureCandlelight = QCameraExposure::ExposureCandlelight,
         ExposureBarcode = QCameraExposure::ExposureBarcode,
+        ExposureFlowers = QCameraExposure::ExposureFlowers,
+        ExposureAR = QCameraExposure::ExposureAR,
+        ExposureHDR = QCameraExposure::ExposureHDR,
+        ExposureCloseup = QCameraExposure::ExposureCloseup,
         ExposureModeVendor = QCameraExposure::ExposureModeVendor
     };
 

src/imports/multimedia/qdeclarativecameraexposure.cpp

@@ -347,6 +347,10 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity()
     \row \li Camera.ExposureParty         \li Party exposure mode.  Since 5.5
     \row \li Camera.ExposureCandlelight   \li Candlelight exposure mode.  Since 5.5
     \row \li Camera.ExposureBarcode       \li Barcode exposure mode.  Since 5.5
+    \row \li Camera.ExposureFlowers       \li Flowers exposure mode.  Since 5.x
+    \row \li Camera.ExposureAR            \li Augmented reality exposure mode.  Since 5.x
+    \row \li Camera.ExposureHDR           \li High dynamic range exposure mode.  Since 5.x
+    \row \li Camera.ExposureCloseup       \li Closeup exposure mode.  Since 5.x
     \row \li Camera.ExposureModeVendor    \li The base value for device specific exposure modes.
     \endtable
 */

src/imports/multimedia/qdeclarativecameraimageprocessing.cpp

@@ -89,16 +89,17 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing()
 
     \table
     \header \li Value \li Description
-    \row \li WhiteBalanceManual       \li Manual white balance. In this mode the manual white balance property value is used.
-    \row \li WhiteBalanceAuto         \li Auto white balance mode.
-    \row \li WhiteBalanceSunlight     \li Sunlight white balance mode.
-    \row \li WhiteBalanceCloudy       \li Cloudy white balance mode.
-    \row \li WhiteBalanceShade        \li Shade white balance mode.
-    \row \li WhiteBalanceTungsten     \li Tungsten white balance mode.
-    \row \li WhiteBalanceFluorescent  \li Fluorescent white balance mode.
-    \row \li WhiteBalanceFlash        \li Flash white balance mode.
-    \row \li WhiteBalanceSunset       \li Sunset white balance mode.
-    \row \li WhiteBalanceVendor       \li Vendor defined white balance mode.
+    \row \li WhiteBalanceManual          \li Manual white balance. In this mode the manual white balance property value is used.
+    \row \li WhiteBalanceAuto            \li Auto white balance mode.
+    \row \li WhiteBalanceSunlight        \li Sunlight white balance mode.
+    \row \li WhiteBalanceCloudy          \li Cloudy white balance mode.
+    \row \li WhiteBalanceShade           \li Shade white balance mode.
+    \row \li WhiteBalanceTungsten        \li Tungsten white balance mode.
+    \row \li WhiteBalanceFluorescent     \li Fluorescent white balance mode.
+    \row \li WhiteBalanceFlash           \li Flash white balance mode.
+    \row \li WhiteBalanceSunset          \li Sunset white balance mode.
+    \row \li WhiteBalanceWarmFluorescent \li Warm fluorescent white balance mode.
+    \row \li WhiteBalanceVendor          \li Vendor defined white balance mode.
     \endtable
 
     \sa manualWhiteBalance
@@ -234,6 +235,9 @@ void QDeclarativeCameraImageProcessing::setDenoisingLevel(qreal value)
     \row \li CameraImageProcessing.ColorFilterWhiteboard \li A whiteboard filter.
     \row \li CameraImageProcessing.ColorFilterBlackboard \li A blackboard filter.
     \row \li CameraImageProcessing.ColorFilterAqua       \li An aqua filter.
+    \row \li CameraImageProcessing.ColorFilterEmboss     \li An emboss filter.
+    \row \li CameraImageProcessing.ColorFilterSketch     \li An sketch filter.
+    \row \li CameraImageProcessing.ColorFilterNeon       \li An neon filter.
     \row \li CameraImageProcessing.ColorFilterVendor     \li The base value for vendor defined filters.
     \endtable
 

src/multimedia/camera/qcameraexposure.cpp

@@ -642,6 +642,10 @@ void QCameraExposure::setAutoShutterSpeed()
     \value ExposureParty         Party mode. Since 5.5
     \value ExposureCandlelight   Candlelight mode. Since 5.5
     \value ExposureBarcode       Barcode mode. Since 5.5
+    \value ExposureFlowers       Flowers exposure mode.  Since 5.x
+    \value ExposureAR            Augmented reality exposure mode.  Since 5.x
+    \value ExposureHDR           High dynamic range exposure mode.  Since 5.x
+    \value ExposureCloseup       Closeup exposure mode.  Since 5.x
     \value ExposureModeVendor    The base value for device specific exposure modes.
 */
 

src/multimedia/camera/qcameraimageprocessing.cpp

@@ -305,17 +305,18 @@ void QCameraImageProcessing::setDenoisingLevel(qreal level)
 /*!
     \enum QCameraImageProcessing::WhiteBalanceMode
 
-    \value WhiteBalanceAuto         Auto white balance mode.
-    \value WhiteBalanceManual       Manual white balance. In this mode the white balance should be set with
-                                    setManualWhiteBalance()
-    \value WhiteBalanceSunlight     Sunlight white balance mode.
-    \value WhiteBalanceCloudy       Cloudy white balance mode.
-    \value WhiteBalanceShade        Shade white balance mode.
-    \value WhiteBalanceTungsten     Tungsten (incandescent) white balance mode.
-    \value WhiteBalanceFluorescent  Fluorescent white balance mode.
-    \value WhiteBalanceFlash        Flash white balance mode.
-    \value WhiteBalanceSunset       Sunset white balance mode.
-    \value WhiteBalanceVendor       Base value for vendor defined white balance modes.
+    \value WhiteBalanceAuto             Auto white balance mode.
+    \value WhiteBalanceManual           Manual white balance. In this mode the white balance should be set with
+                                        setManualWhiteBalance()
+    \value WhiteBalanceSunlight         Sunlight white balance mode.
+    \value WhiteBalanceCloudy           Cloudy white balance mode.
+    \value WhiteBalanceShade            Shade white balance mode.
+    \value WhiteBalanceTungsten         Tungsten (incandescent) white balance mode.
+    \value WhiteBalanceFluorescent      Fluorescent white balance mode.
+    \value WhiteBalanceFlash            Flash white balance mode.
+    \value WhiteBalanceSunset           Sunset white balance mode.
+    \value WhiteBalanceWarmFluorescent  Warm fluorescent white balance mode.
+    \value WhiteBalanceVendor           Base value for vendor defined white balance modes.
 */
 
 /*!
@@ -330,6 +331,9 @@ void QCameraImageProcessing::setDenoisingLevel(qreal level)
     \value ColorFilterWhiteboard         A whiteboard filter.
     \value ColorFilterBlackboard         A blackboard filter.
     \value ColorFilterAqua               An aqua filter.
+    \value ColorFilterEmboss             An emboss filter.
+    \value ColorFilterSketch             A sketch filter.
+    \value ColorFilterNeon               A neon filter.
     \value ColorFilterVendor             The base value for vendor defined filters.
 
     \since 5.5