summaryrefslogtreecommitdiffstats
path: root/src/imports/multimedia/qdeclarativecameraflash_p.h
diff options
context:
space:
mode:
authorJochen Seemann <seemann.jochen@gmail.com>2016-08-29 21:57:57 +0200
committerYoann Lopes <yoann.lopes@qt.io>2016-09-09 13:59:25 +0000
commitfe2bbf458cefcd29e2802eb408926fd76ab16bae (patch)
tree326114f4e6db07a2b23f3f775654050db4ce95a5 /src/imports/multimedia/qdeclarativecameraflash_p.h
parent62f1899a23b456f03cfccfaefcdf670d3cbb0f35 (diff)
adding property CameraFlash::supportedModes
This property contains a list of the supported flash modes and is the QML version of QCameraExposure::isFlashModeSupported(FlashMode). Task-number: QTBUG-45323 Change-Id: I1eb6fcbb126759458c5290e71fa576053b62f05d Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraflash_p.h')
-rw-r--r--src/imports/multimedia/qdeclarativecameraflash_p.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraflash_p.h b/src/imports/multimedia/qdeclarativecameraflash_p.h
index 9247c7202..df037c4d6 100644
--- a/src/imports/multimedia/qdeclarativecameraflash_p.h
+++ b/src/imports/multimedia/qdeclarativecameraflash_p.h
@@ -63,6 +63,7 @@ class QDeclarativeCameraFlash : public QObject
Q_OBJECT
Q_PROPERTY(bool ready READ isFlashReady NOTIFY flashReady)
Q_PROPERTY(FlashMode mode READ flashMode WRITE setFlashMode NOTIFY flashModeChanged)
+ Q_PROPERTY(QVariantList supportedModes READ supportedModes NOTIFY supportedModesChanged REVISION 1)
Q_ENUMS(FlashMode)
public:
@@ -83,6 +84,7 @@ public:
FlashMode flashMode() const;
bool isFlashReady() const;
+ QVariantList supportedModes() const;
public Q_SLOTS:
void setFlashMode(FlashMode);
@@ -90,6 +92,10 @@ public Q_SLOTS:
Q_SIGNALS:
void flashReady(bool status);
void flashModeChanged(FlashMode);
+ void supportedModesChanged();
+
+private slots:
+ void _q_cameraStatusChanged(QCamera::Status status);
private:
friend class QDeclarativeCamera;