diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-03-13 18:07:12 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-24 14:03:15 +0100 |
commit | 4aeda4943e9532719c49f02a5997f74fe4e0e7c9 (patch) | |
tree | d933adeca548954bcda292ec0c94bf3ab4f15c49 /src/imports/multimedia/qdeclarativecameraflash_p.h | |
parent | 904881d4a338b6259bb18320b0d09f79abe2aa5e (diff) |
Fix enums for QML camera types.
CameraExposure, CameraFlash and CameraFocus had signals and functions
using enum-type arguments declared in QDeclarativeCamera. This doesn't
work since an enum and a function using it both need to be declared in
the same class in order to work from QML.
The relevant enums have been duplicated (not moved, in order to
preserve QML source compatibility) from QDeclarativeCamera to
QDeclarativeCameraExposure, QDeclarativeCameraFlash and
QDeclarativeCameraFocus.
Change-Id: Ib307d7c6c9dbc59b1b82782913397160be38d4cd
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/imports/multimedia/qdeclarativecameraflash_p.h')
-rw-r--r-- | src/imports/multimedia/qdeclarativecameraflash_p.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraflash_p.h b/src/imports/multimedia/qdeclarativecameraflash_p.h index e3919a41c..7ff2a637a 100644 --- a/src/imports/multimedia/qdeclarativecameraflash_p.h +++ b/src/imports/multimedia/qdeclarativecameraflash_p.h @@ -64,19 +64,34 @@ class QDeclarativeCameraFlash : public QObject { Q_OBJECT Q_PROPERTY(bool ready READ isFlashReady NOTIFY flashReady) - Q_PROPERTY(int mode READ flashMode WRITE setFlashMode NOTIFY flashModeChanged) + Q_PROPERTY(FlashMode mode READ flashMode WRITE setFlashMode NOTIFY flashModeChanged) + + Q_ENUMS(FlashMode) public: + enum FlashMode { + FlashAuto = QCameraExposure::FlashAuto, + FlashOff = QCameraExposure::FlashOff, + FlashOn = QCameraExposure::FlashOn, + FlashRedEyeReduction = QCameraExposure::FlashRedEyeReduction, + FlashFill = QCameraExposure::FlashFill, + FlashTorch = QCameraExposure::FlashTorch, + FlashVideoLight = QCameraExposure::FlashVideoLight, + FlashSlowSyncFrontCurtain = QCameraExposure::FlashSlowSyncFrontCurtain, + FlashSlowSyncRearCurtain = QCameraExposure::FlashSlowSyncRearCurtain, + FlashManual = QCameraExposure::FlashManual + }; + ~QDeclarativeCameraFlash(); - int flashMode() const; + FlashMode flashMode() const; bool isFlashReady() const; public Q_SLOTS: - void setFlashMode(int); + void setFlashMode(FlashMode); Q_SIGNALS: void flashReady(bool status); - void flashModeChanged(int); + void flashModeChanged(FlashMode); private: friend class QDeclarativeCamera; |