diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:51 +0200 |
| commit | 2cf8ac3398ce97273103bbef0f5538e57b57f66c (patch) | |
| tree | 66143b4501d1ddb37b4cbecdec682491d6339d4a /src/imports | |
| parent | a08bcb3279670f1920c774e9861c34d8f7653625 (diff) | |
| parent | 7fd0fec5e5e2906ee7c9fdfce9181ef81c09d9f1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativecameraflash.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/imports/multimedia/qdeclarativecameraflash.cpp b/src/imports/multimedia/qdeclarativecameraflash.cpp index 0bde737e7..ae4fd9394 100644 --- a/src/imports/multimedia/qdeclarativecameraflash.cpp +++ b/src/imports/multimedia/qdeclarativecameraflash.cpp @@ -113,7 +113,10 @@ bool QDeclarativeCameraFlash::isFlashReady() const \row \li Camera.FlashAuto \li Automatic flash. \row \li Camera.FlashRedEyeReduction \li Red eye reduction flash. \row \li Camera.FlashFill \li Use flash to fillin shadows. - \row \li Camera.FlashTorch \li Constant light source, useful for focusing and video capture. + \row \li Camera.FlashTorch \li Constant light source. If supported, torch can be + enabled without loading the camera. + \row \li Camera.FlashVideoLight \li Constant light source, useful for video capture. + The light is turned on only while the camera is active. \row \li Camera.FlashSlowSyncFrontCurtain \li Use the flash in conjunction with a slow shutter speed. This mode allows better exposure of distant objects and/or motion blur effect. |