diff options
| author | Jochen Seemann <seemann.jochen@gmail.com> | 2017-03-27 19:50:38 +0200 |
|---|---|---|
| committer | Jochen Seemann <seemann.jochen@gmail.com> | 2018-02-01 19:37:33 +0000 |
| commit | 1e3c4234a9a505d548db4a3dbc0ebabd5bbe8ed3 (patch) | |
| tree | 059cf659116447572e857d3c2e4f70e64cb8f798 /src/imports/multimedia/qdeclarativecamerafocus_p.h | |
| parent | 009a9d4b5d32fa73aca6cabe7d45d6a9bbae0038 (diff) | |
add supportedFocusModes and supportedFocusPointModes
This patch adds two properties to QML type CameraFocus,
to gain feature parity with the C++ interface of QCameraFocus.
Additionally, it deprecates the older, comparable functions.
Task-number: QTBUG-45336
Change-Id: Iffc5c805409ed605dba5d4bc3fa2f05122b58b9e
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamerafocus_p.h')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecamerafocus_p.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecamerafocus_p.h b/src/imports/multimedia/qdeclarativecamerafocus_p.h index 16a48de53..e3a1c28b7 100644 --- a/src/imports/multimedia/qdeclarativecamerafocus_p.h +++ b/src/imports/multimedia/qdeclarativecamerafocus_p.h @@ -64,8 +64,13 @@ class QDeclarativeCamera; class QDeclarativeCameraFocus : public QObject { Q_OBJECT + Q_PROPERTY(FocusMode focusMode READ focusMode WRITE setFocusMode NOTIFY focusModeChanged) + Q_PROPERTY(QVariantList supportedFocusModes READ supportedFocusModes NOTIFY supportedFocusModesChanged REVISION 1) + Q_PROPERTY(FocusPointMode focusPointMode READ focusPointMode WRITE setFocusPointMode NOTIFY focusPointModeChanged) + Q_PROPERTY(QVariantList supportedFocusPointModes READ supportedFocusPointModes NOTIFY supportedFocusPointModesChanged REVISION 1) + Q_PROPERTY(QPointF customFocusPoint READ customFocusPoint WRITE setCustomFocusPoint NOTIFY customFocusPointChanged) Q_PROPERTY(QObject *focusZones READ focusZones CONSTANT) @@ -91,13 +96,18 @@ public: ~QDeclarativeCameraFocus(); FocusMode focusMode() const; + QVariantList supportedFocusModes() const; + FocusPointMode focusPointMode() const; - QPointF customFocusPoint() const; + QVariantList supportedFocusPointModes() const; + QPointF customFocusPoint() const; QAbstractListModel *focusZones() const; +#if QT_DEPRECATED_SINCE(5, 10) Q_INVOKABLE bool isFocusModeSupported(FocusMode mode) const; Q_INVOKABLE bool isFocusPointModeSupported(FocusPointMode mode) const; +#endif public Q_SLOTS: void setFocusMode(FocusMode); @@ -106,7 +116,9 @@ public Q_SLOTS: Q_SIGNALS: void focusModeChanged(FocusMode); + void supportedFocusModesChanged(); void focusPointModeChanged(FocusPointMode); + void supportedFocusPointModesChanged(); void customFocusPointChanged(const QPointF &); private Q_SLOTS: |