diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:31:24 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:36:13 +0200 |
| commit | a2244c9b7aa11e386c3331cbbc36336fb8fea3b9 (patch) | |
| tree | a77ac99aa38c40e98aa483795e3cb8061f404203 /src/imports/multimedia/qdeclarativetorch.cpp | |
| parent | 31fce88b3fcdbb4d4b2b9a889d24e25c3a5c9507 (diff) | |
| parent | 008d20e0ece4c6dac148915b998a0005657d73a1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/imports/multimedia/qdeclarativeaudio.cpp
Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
Diffstat (limited to 'src/imports/multimedia/qdeclarativetorch.cpp')
| -rw-r--r-- | src/imports/multimedia/qdeclarativetorch.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativetorch.cpp b/src/imports/multimedia/qdeclarativetorch.cpp index 5a0b12081..fdf4dcce4 100644 --- a/src/imports/multimedia/qdeclarativetorch.cpp +++ b/src/imports/multimedia/qdeclarativetorch.cpp @@ -46,16 +46,12 @@ QT_BEGIN_NAMESPACE \ingroup multimedia_qml - \c Torch is part of the \b{QtMultimedia 5.0} module. - In many cases the torch hardware is shared with camera flash functionality, and might be automatically controlled by the device. You have control over the power level (of course, higher power levels are brighter but reduce battery life significantly). \qml - import QtQuick 2.0 - import QtMultimedia 5.0 Torch { power: 75 // 75% of full power |