slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.5' into dev

Browse Source 
Change-Id: I7ac7db69c37cc9e5c5241a25b9a874986a23a886
This commit is contained in:
Liang Qi
2015-06-03 10:58:51 +02:00
parent a08bcb3279 7fd0fec5e5
commit 2cf8ac3398
63 changed files with 1848 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/imports/multimedia/qdeclarativecameraflash.cpp
View File

@@ -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.