diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-01-17 16:46:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 01:16:55 +0100 |
| commit | 8c74e5e7e7a5654f1af670b6d40f98e736d1f7d9 (patch) | |
| tree | cd8fb3be484adc0c8714b0b89a818559f6b4a32a /src/imports/multimedia/multimedia.cpp | |
| parent | c40d79106c056057bfd38cd74c4d9c8df90277b3 (diff) | |
Add a simple Torch class that wraps the camera flash.
Since nearly all programmable torch hardware doubles as camera flash
hardware, offer this class here that wraps the QCameraFlashControl.
Change-Id: Ib2c061c21c14221d67477d8a3fd89a76fc26ed71
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 8b8650604..b898c9c9d 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -57,6 +57,7 @@ #include "qdeclarativecameraflash_p.h" #include "qdeclarativecamerafocus_p.h" #include "qdeclarativecameraimageprocessing_p.h" +#include "qdeclarativetorch_p.h" QML_DECLARE_TYPE(QSoundEffect) @@ -103,6 +104,7 @@ public: qmlRegisterType<QDeclarativeRadioData>(uri, 5, 0, "RadioData"); qmlRegisterType<QDeclarativeBackgroundAudio>(uri, 5, 0, "BackgroundAudio"); qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera"); + qmlRegisterType<QDeclarativeTorch>(uri, 5, 0, "Torch"); qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 5, 0, "CameraCapture", trUtf8("CameraCapture is only provided by Camera element")); qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 5, 0, "CameraRecorder", |