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

Docs: fix qml links and standalone build for Multimedia

Browse Source 
Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Peter Yard
2012-02-21 15:58:01 +10:00
committed by Qt by Nokia
parent e791e4f0e9
commit cd5a8fc69d
35 changed files with 828 additions and 1367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Torch QDeclarativeTorch
\inqmlmodule QtMultimedia 5
\brief The Torch element provides simple control over torch functionality
\ingroup multimedia_qml
@@ -90,7 +91,7 @@ QDeclarativeTorch::~QDeclarativeTorch()
}
/*!
\qmlproperty bool Torch::enabled
\qmlproperty bool QtMultimedia5::Torch::enabled
\property QDeclarativeTorch::enabled
Whether the torch is on. If the torch functionality is shared
@@ -137,7 +138,7 @@ void QDeclarativeTorch::setEnabled(bool on)
}
/*!
\qmlproperty int Torch::power
\qmlproperty int QtMultimedia5::Torch::power
\property QDeclarativeTorch::power
The current torch power setting, as a percentage of full power.