summaryrefslogtreecommitdiff
path: root/src/qtmultimediaquicktools
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@digia.com>2014-02-10 19:33:51 +0100
committerYoann Lopes <yoann.lopes@digia.com>2014-07-17 18:58:00 +0200
commit888759e334e81117843afb6d0f8991db8aec5ca8 (patch)
treed0b6eb0b094557d5c25bf865998915f0839d596d /src/qtmultimediaquicktools
parentcddbe8736d995b4bfdfbbf1abfc3d6aeae3eb214 (diff)
downloadqtmultimedia-888759e334e81117843afb6d0f8991db8aec5ca8.tar.gz
New camera selection API in QML.
Also added a new QtMultimedia global object which makes it possible to retrieve the list of available cameras. It can be extended with new utility functions in the future. Includes documentation, example and auto tests. Task-number: QTBUG-23770 Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/qtmultimediaquicktools')
-rw-r--r--src/qtmultimediaquicktools/qdeclarativevideooutput.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index e904307df..875b9d268 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -421,6 +421,8 @@ void QDeclarativeVideoOutput::_q_screenOrientationChanged(int orientation)
The orientation change will also affect the mapping
of coordinates from source to viewport.
+
+ \sa autoOrientation
*/
int QDeclarativeVideoOutput::orientation() const
{
@@ -477,6 +479,7 @@ void QDeclarativeVideoOutput::setOrientation(int orientation)
By default \c autoOrientation is disabled.
+ \sa orientation
\since QtMultimedia 5.2
*/
bool QDeclarativeVideoOutput::autoOrientation() const