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

4
doc/config/compat.qdocconf
View File

@@ -1,11 +1,11 @@
#alias.i = e
alias.i = e
alias.include = input
macro.0 = "\\\\0"
macro.b = "\\\\b"
macro.n = "\\\\n"
macro.r = "\\\\r"
#macro.i = "\\o"
macro.i = "\\o"
macro.i11 = "\\o{1,1}"
macro.i12 = "\\o{1,2}"
macro.i13 = "\\o{1,3}"

5
doc/config/qtmultimedia.qdocconf
View File

@@ -1,3 +1,8 @@
include(compat.qdocconf)
include(macros.qdocconf)
include(qt-cpp-ignore.qdocconf)
include(qt-defines.qdocconf)
# Name of the project.
project = Qt Multimedia
description = Qt Multimedia Documentation

1
doc/config/qtmultimedia_doc.pri
View File

@@ -43,5 +43,4 @@ OTHER_FILES += \
doc/src/audiooverview.qdoc \
doc/src/radiooverview.qdoc \
doc/src/videooverview.qdoc \
doc/src/audioengineoverview.qdoc \
doc/src/plugins/qml-multimedia.qdoc

300
doc/src/legal/3rdparty.qdoc
View File

@@ -1,300 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/*!
\page 3rdparty.html
\title Third-Party Licenses Used in Qt
\ingroup licensing
\brief License information for third-party libraries supplied with Qt.
Qt includes a number of third-party libraries that are used to provide
certain features. Unlike the code described in the
\l{Other Licenses Used in Qt}{code used in Qt} document, these
libraries are supplied alongside the Qt modules.
Third Party Software may impose additional restrictions and it is the
user's responsibility to ensure that they have met the licensing
requirements of the GPL, LGPL, or Qt Commercial license and the relevant
license of the Third Party Software they are using.
Run \c{configure -help} to see any options that may be available for
controlling the use of these libraries.
\tableofcontents
\section1 DES (\c des.cpp)
\e {Implementation of DES encryption for NTLM\br
Copyright 1997-2005 Simon Tatham.\br
This software is released under the MIT license.}
See \c src/3rdparty/des/des.cpp for more information about the terms and
conditions under which the code is supplied.
\section1 FreeType 2 (\c freetype) version 2.3.6
\e {The FreeType project is a team of volunteers who develop free, portable
and high-quality software solutions for digital typography. We specifically
target embedded systems and focus on bringing small, efficient and
ubiquitous products.} -- quoted from \c 3rdparty/freetype/docs/freetype2.html.
See \c src/3rdparty/freetype/docs/FTL.txt and \c
src/3rdparty/freetype/docs/GPL.txt for license details.
See also the files in \c src/3rdparty/harfbuzz, which are used by
FreeType.
Parts of the FreeType projects have been modified and put into Qt
for use in the painting subsystem. These files are ftraster.h,
ftraster.c, ftgrays.h and ftgrays.c. The following modifications
has been made to these files:
\list
\o Renamed FT_ and ft_ symbols to QT_FT_ and qt_ft_ to avoid name
conflicts.
\o Removed parts of code not relevant when compiled with
_STANDALONE_ defined.
\o Changed behavior in ftraster.c to follow X polygon filling
rules.
\o Implemented support in ftraster.c for winding / odd even
polygon fill rules.
\o Replaced bitmap generation with span generation in ftraster.c
\o Renamed: ftraster.h to qblackraster_p.h
\o Renamed: ftraster.c to qblackraster.c
\o Renamed: ftgrays.h to qgrayraster_p.h
\o Renamed: ftgrays.c to qgrayraster.c
\endlist
\section1 HarfBuzz (\c harfbuzz)
\e {This is HarfBuzz, an OpenType Layout engine.}
\e {It was derived originally from the OpenType code in FreeType-1.x, ported to
FreeType2. (This code has been abandoned for FreeType2, but until something
better comes along, should serve our purposes.) In addition to porting to
FreeType-2, it has been modified in various other ways.} -- quoted from
\c src/3rdparty/harfbuzz/README.
See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
for license details.
\section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 6b
\e {This package contains C software to implement JPEG image compression and
decompression. JPEG (pronounced "jay-peg") is a standardized compression
method for full-color and gray-scale images. JPEG is intended for compressing
"real-world" scenes; line drawings, cartoons and other non-realistic images
are not its strong suit. JPEG is lossy, meaning that the output image is not
exactly identical to the input image.} -- quoted from \c
src/3rdparty/libjpeg/README.
See \c src/3rdparty/libjpeg/README for license details.
\section1 MD4 (\c md4.cpp and \c md4.h)
\e {MD4 (RFC-1320) message digest.\br
Modified from MD5 code by Andrey Panin <pazke@donpac.ru>\br\br
Written by Solar Designer <solar@openwall.com> in 2001, and placed in\br
the public domain. There's absolutely no warranty.}
See \c src/3rdparty/md4/md4.cpp and \c src/3rdparty/md4/md4.h for more
information about the terms and conditions under which the code is
supplied.
\section1 MD5 (\c md5.cpp and \c md5.h)
\e {This code implements the MD5 message-digest algorithm.
The algorithm is due to Ron Rivest. This code was
written by Colin Plumb in 1993, no copyright is claimed.
This code is in the public domain; do with it what you wish.} -- quoted from
\c src/3rdparty/md5/md5.h
See \c src/3rdparty/md5/md5.cpp and \c src/3rdparty/md5/md5.h for more
information about the terms and conditions under which the code is
supplied.
\section1 MNG Library (\c libmng) version 1.0.10
\e {The libmng library supports decoding, displaying, encoding, and various
other manipulations of the Multiple-image Network Graphics (MNG) format
image files. It uses the zlib compression library, and optionally the
JPEG library by the Independant JPEG Group (IJG) and/or
lcms (little cms), a color-management library by Marti Maria Saguer.}
-- quoted from \c src/3rdparty/libmng/doc/libmng.txt
See \c src/3rdparty/libmng/LICENSE for license details.
\section1 PNG Reference Library (\c libpng) version 1.2.29
\e {Libpng was written as a companion to the PNG specification, as a way
of reducing the amount of time and effort it takes to support the PNG
file format in application programs.} -- quoted from \c
src/3rdparty/libpng/libpng.txt.
See \c src/3rdparty/libpng/LICENSE for license details.
\section1 The ptmalloc memory allocator (\c ptmalloc3) version 1.8
\e ptmcalloc3 is a scalable concurrent memory allocator suitable
for use in multi-threaded programs.
\hr
Copyright (c) 2001-2006 Wolfram Gloger
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without fee,
provided that (i) the above copyright notices and this permission
notice appear in all copies of the software and related documentation,
and (ii) the name of Wolfram Gloger may not be used in any advertising
or publicity relating to the software.
THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
IN NO EVENT SHALL WOLFRAM GLOGER BE LIABLE FOR ANY SPECIAL,
INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY
DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY
OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
\hr
See \c src/3rdparty/ptmalloc/COPYRIGHT for license details.
\section1 SHA-1 (\c sha1.cpp)
\e {Based on the public domain implementation of the SHA-1 algorithm\br
Copyright (C) Dominik Reichl <dominik.reichl@t-online.de>}
See \c src/3rdparty/sha1/sha1.cpp for more information about the terms and
conditions under which the code is supplied.
\section1 SQLite (\c sqlite) version 3.5.9
\e {SQLite is a small C library that implements a
self-contained, embeddable, zero-configuration SQL database engine.}
-- quoted from \l{http://www.sqlite.org/}{www.sqlite.org}.
According to the comments in the source files, the code is in the public
domain. See the
\l{http://www.sqlite.org/copyright.html}{SQLite Copyright} page on the
SQLite web site for further information.
\section1 TIFF Software Distribution (\c libtiff) version 3.8.2
\e {libtiff is a set of C functions (a library) that support the
manipulation of TIFF image files.} -- quoted from \c
src/libtiff/html/libtiff.html
\hr
Copyright (c) 1988-1997 Sam Leffler\br
Copyright (c) 1991-1997 Silicon Graphics, Inc.\br
Copyright (C) 2004, Andrey Kiselev <dron@ak4719.spb.edu>\br
Copyright (c) 1997 Greg Ward Larson
Permission to use, copy, modify, distribute, and sell this software and
its documentation for any purpose is hereby granted without fee, provided
that (i) the above copyright notices and this permission notice appear in
all copies of the software and related documentation, and (ii) the names of
Sam Leffler and Silicon Graphics may not be used in any advertising or
publicity relating to the software without the specific, prior written
permission of Sam Leffler and Silicon Graphics.
THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS SOFTWARE.
\hr
Copyright (c) 1996-1997 Sam Leffler\br
Copyright (c) 1996 Pixar
Permission to use, copy, modify, distribute, and sell this software and
its documentation for any purpose is hereby granted without fee, provided
that (i) the above copyright notices and this permission notice appear in
all copies of the software and related documentation, and (ii) the names of
Pixar, Sam Leffler and Silicon Graphics may not be used in any advertising or
publicity relating to the software without the specific, prior written
permission of Pixar, Sam Leffler and Silicon Graphics.
THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
IN NO EVENT SHALL PIXAR, SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS SOFTWARE.
\hr
See \c src/3rdparty/libtiff/COPYRIGHT for license details.
\section1 Wintab API (\c wintab)
Wintab is a de facto API for pointing devices on Windows. The
wintab code is from \l{http://www.pointing.com/WINTAB.HTM}.
See \c src/3rdparty/wintab/wintab.h for license details.
\section1 Data Compression Library (\c zlib) version 1.2.3
\e {zlib is a general purpose data compression library. All the code
is thread safe. The data format used by the zlib library is described
by RFCs (Request for Comments) 1950 to 1952} -- quoted from \c
src/3rdparty/zlib/README.
See \c src/3rdparty/zlib/README for license details.
*/

64
doc/src/legal/editions.qdoc
View File

@@ -1,64 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/*!
\page editions.html
\title Qt Editions
\ingroup licensing
\brief Information about the different editions of Qt.
Qt can be used to create both commercial and non-commercial
software for a wide range of different deployment environments,
and is supplied in a number of different forms to suit the needs
of different kinds of developers.
In terms of license conditions, there are two main forms of Qt:
\list
\o The \l{Qt Commercial Edition} are the commercial
versions of \l{About Qt}{Qt}.
\o The \l{Open Source Versions of Qt} are freely available for download.
\endlist
On the Qt web site, you can find a
\l{Qt Licensing Overview} and information on \l{Qt License Pricing}
for commercial editions of Qt and other Qt-related products.
*/

67
doc/src/legal/gpl.qdoc
View File

@@ -1,67 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/*! \page lgpl.html
\title GNU Lesser General Public License (LGPL)
\ingroup licensing
\brief About the LGPL license used for Qt.
The Qt GUI Toolkit is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).\br
Contact: http://www.qt-project.org/
Qt is available under the LGPL.
\section1 The GNU Lesser General Public License (Version 2.1)
Reference: \l{GNU Lesser General Public License, version 2.1}
\snippet doc/src/snippets/code/doc_src_lgpl.qdoc LGPL v2.1
\section1 Nokia Qt LGPL Exception version 1.0
As a special exception to the GNU Lesser General Public License version 2.1,
the object code form of a "work that uses the Library" may incorporate material
from a header file that is part of the Library. You may distribute such object
code under terms of your choice, provided that the incorporated material
(i) does not exceed more than 5% of the total size of the Library; and
(ii) is limited to numerical parameters, data structure layouts, accessors,
macros, inline functions and templates.
*/

91
doc/src/legal/opensourceedition.qdoc
View File

@@ -1,91 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/*!
\page opensourceedition.html
\title Open Source Versions of Qt
\ingroup licensing
\brief Information about the license and features of the Open Source Edition.
Free (or open source) software is software that comes with a license
that gives users certain rights. In particular the right to use the
software, to modify it, to obtain its source, and to pass it on (under
the same terms). Notice that the term "free" is about rights, not
money. The Free Software Foundation (creators of the GNU GPL) speaks
of free in this context as in "free speech", not as in "no cost".
Nokia supports the free software concept by providing the Qt Open Source
Edition, which is licensed under the \l{GNU General Public License (GPL)}
(version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1).
You can use this edition of Qt to create and distribute software with licenses
that are compatible to these free software licenses.
The support of open source with the Open Source Versions of Qt has enabled large
successful software projects like KDE to thrive, with thousands of developers
around the world using open source versions of Qt at no cost to themselves. With
the release of Qt 4, open source versions of Qt became available for Unix/X11,
Mac OS X, and Windows platforms.
The Open Source Edition can be downloaded from the \l{Downloads}{Qt website}.
Please refer to the online \l{License FAQ} for answers to frequently asked
questions on open source licensing and its implications.
More information on Free and Open Source software is available online:
\list
\o GNU GPL: \l http://www.gnu.org/.
\o Open Source licensing: \l http://www.opensource.org/.
\endlist
See \l{Licensing Information} for a collection of documents about licenses
used in Qt.
Information about Qt Commercial License Agreements is available
in the \l{Qt Licensing Overview} on the Qt website or by contacting
the sales department at http://qt.nokia.com/contact.
If you are in doubt what edition of Qt is right for your project,
please contact
\l{mailto:qt-info@nokia.com}{qt-info@nokia.com}.
*/

77
doc/src/legal/trademarks.qdoc
View File

@@ -1,77 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/*!
\page trademarks.html
\title Trademarks
\ingroup licensing
\brief Information about trademarks owned by Nokia and other organisations.
Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia \reg
Corporation and/or its subsidiaries in Finland and other countries.
\list
\o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
Intel Corporation in the United States, other countries, or both.
\o Java and all Java-based trademarks are trademarks of Sun Microsystems,
Inc. in the United States, other countries, or both.
\o Linux is a \reg trademark of Linus Torvalds in the United States, other
countries or both.
\o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
registered in the U.S. and other countries.
\o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo
are \reg trademarks of Microsoft Corporation in the United States, other
countries, or both.
\o Motif is a registered trademark of The Open Group in the United States,
other countries, or both.
\o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
and other countries.
\o UNIX is a registered trademark of The Open Group in the United States
and other countries.
\o Versit is a \reg trademark of the Internet Mail Consortium in the United States
and other countries.
\o All other company, product, or service names may be trademarks or
service marks of others and are the property of their respective owners.
The use of the word partner does not imply a partnership relationship
between Nokia and any other company.
\endlist
*/

1
doc/src/multimedia.qdoc
View File

@@ -26,7 +26,6 @@
****************************************************************************/
/*!
\page multimediaoverview.html
\title Qt Multimedia
\brief A set of APIs for working with audio, video, radio and camera devices.

42
doc/src/qtmultimedia5.qdoc Normal file
View File

@@ -0,0 +1,42 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
** GNU Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
** Foundation and appearing in the file included in the packaging of
** this file.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms
** and conditions contained in a signed written agreement between you
** and Nokia.
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
/*!
\qmlmodule QtMultimedia 5
\title QtMultimedia 5.0
\brief The QML import for QtMultimedia
\section1 Overview
The identifying string for this component is \e QtMultimedia. Use this in the QML \e import statement.
\section1 QML Elements
\annotatedlist multimedia_qml
*/

2
qtmultimedia.pro
View File

@@ -24,7 +24,7 @@ module_qtmultimedia_docsnippets.CONFIG = no_default_install
SUBDIRS += module_qtmultimedia_src \
module_qtmultimedia_examples \
module_qtmultimedia_tests \
module_qtmultimedia_docsnippets
module_qtmultimedia_docsnippets \
# for make docs:
include(doc/config/qtmultimedia_doc.pri)

140
src/imports/multimedia/qdeclarativeaudio.cpp
View File

@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
\qmlclass MediaPlayer
\brief The MediaPlayer element allows you to add media playback to a scene.
\inqmlmodule QtMultimedia 5
\ingroup multimedia_qml
This element is part of the \bold{QtMultimedia 5.0} module.
@@ -107,6 +108,7 @@ QT_BEGIN_NAMESPACE
\qmlclass Audio QDeclarativeAudio
\brief The Audio element allows you to add audio playback to a scene.
\inqmlmodule QtMultimedia 5
\ingroup multimedia_qml
This element is part of the \bold{QtMultimedia 5.0} module.
@@ -162,7 +164,7 @@ QDeclarativeAudio::~QDeclarativeAudio()
}
/*!
\qmlmethod Audio::play()
\qmlmethod QtMultimedia5::Audio::play()
Starts playback of the media.
@@ -178,7 +180,7 @@ void QDeclarativeAudio::play()
}
/*!
\qmlmethod Audio::pause()
\qmlmethod QtMultimedia5::Audio::pause()
Pauses playback of the media.
@@ -194,7 +196,7 @@ void QDeclarativeAudio::pause()
}
/*!
\qmlmethod Audio::stop()
\qmlmethod QtMultimedia5::Audio::stop()
Stops playback of the media.
@@ -210,13 +212,13 @@ void QDeclarativeAudio::stop()
}
/*!
\qmlproperty url Audio::source
\qmlproperty url QtMultimedia5::Audio::source
This property holds the source URL of the media.
*/
/*!
\qmlproperty url Audio::autoLoad
\qmlproperty url QtMultimedia5::Audio::autoLoad
This property indicates if loading of media should begin immediately.
@@ -224,32 +226,32 @@ void QDeclarativeAudio::stop()
*/
/*!
\qmlsignal Audio::playbackStateChanged()
\qmlsignal QtMultimedia5::Audio::playbackStateChanged()
This handler is called when the \l playbackState property is altered.
*/
/*!
\qmlsignal Audio::paused()
\qmlsignal QtMultimedia5::Audio::paused()
This handler is called when playback is paused.
*/
/*!
\qmlsignal Audio::stopped()
\qmlsignal QtMultimedia5::Audio::stopped()
This handler is called when playback is stopped.
*/
/*!
\qmlsignal Audio::playing()
\qmlsignal QtMultimedia5::Audio::playing()
This handler is called when playback is started or resumed.
*/
/*!
\qmlproperty enumeration Audio::status
\qmlproperty enumeration QtMultimedia5::Audio::status
This property holds the status of media loading. It can be one of:
@@ -273,7 +275,7 @@ QDeclarativeAudio::Status QDeclarativeAudio::status() const
/*!
\qmlproperty enumeration Audio::playbackState
\qmlproperty enumeration QtMultimedia5::Audio::playbackState
This property holds the state of media playback. It can be one of:
@@ -290,7 +292,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
}
/*!
\qmlproperty int Audio::autoPlay
\qmlproperty int QtMultimedia5::Audio::autoPlay
This property controls whether the media will begin to play on start up.
@@ -298,7 +300,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
*/
/*!
\qmlproperty int Audio::duration
\qmlproperty int QtMultimedia5::Audio::duration
This property holds the duration of the media in milliseconds.
@@ -306,7 +308,7 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
*/
/*!
\qmlproperty int Audio::position
\qmlproperty int QtMultimedia5::Audio::position
This property holds the current playback position in milliseconds.
@@ -314,19 +316,19 @@ QDeclarativeAudio::PlaybackState QDeclarativeAudio::playbackState() const
*/
/*!
\qmlproperty real Audio::volume
\qmlproperty real QtMultimedia5::Audio::volume
This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
*/
/*!
\qmlproperty bool Audio::muted
\qmlproperty bool QtMultimedia5::Audio::muted
This property holds whether the audio output is muted.
*/
/*!
\qmlproperty bool Audio::hasAudio
\qmlproperty bool QtMultimedia5::Audio::hasAudio
This property holds whether the media contains audio.
*/
@@ -337,7 +339,7 @@ bool QDeclarativeAudio::hasAudio() const
}
/*!
\qmlproperty bool Audio::hasVideo
\qmlproperty bool QtMultimedia5::Audio::hasVideo
This property holds whether the media contains video.
*/
@@ -348,14 +350,14 @@ bool QDeclarativeAudio::hasVideo() const
}
/*!
\qmlproperty real Audio::bufferProgress
\qmlproperty real QtMultimedia5::Audio::bufferProgress
This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
(full).
*/
/*!
\qmlproperty bool Audio::seekable
\qmlproperty bool QtMultimedia5::Audio::seekable
This property holds whether position of the audio can be changed.
@@ -363,13 +365,13 @@ bool QDeclarativeAudio::hasVideo() const
*/
/*!
\qmlproperty real Audio::playbackRate
\qmlproperty real QtMultimedia5::Audio::playbackRate
This property holds the rate at which audio is played at as a multiple of the normal rate.
*/
/*!
\qmlproperty enumeration Audio::error
\qmlproperty enumeration QtMultimedia5::Audio::error
This property holds the error state of the audio. It can be one of:
@@ -410,13 +412,13 @@ void QDeclarativeAudio::componentComplete()
/*!
\qmlproperty string Audio::errorString
\qmlproperty string QtMultimedia5::Audio::errorString
This property holds a string describing the current error condition in more detail.
*/
/*!
\qmlsignal Audio::onError(error, errorString)
\qmlsignal QtMultimedia5::Audio::onError(error, errorString)
This handler is called when an \l {QMediaPlayer::Error}{error} has
occurred. The errorString parameter may contain more detailed
@@ -424,7 +426,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.title
\qmlproperty variant QtMultimedia5::Audio::metaData.title
This property holds the tile of the media.
@@ -432,7 +434,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.subTitle
\qmlproperty variant QtMultimedia5::Audio::metaData.subTitle
This property holds the sub-title of the media.
@@ -440,7 +442,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.author
\qmlproperty variant QtMultimedia5::Audio::metaData.author
This property holds the author of the media.
@@ -448,7 +450,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.comment
\qmlproperty variant QtMultimedia5::Audio::metaData.comment
This property holds a user comment about the media.
@@ -456,7 +458,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.description
\qmlproperty variant QtMultimedia5::Audio::metaData.description
This property holds a description of the media.
@@ -464,7 +466,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.category
\qmlproperty variant QtMultimedia5::Audio::metaData.category
This property holds the category of the media
@@ -472,7 +474,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.genre
\qmlproperty variant QtMultimedia5::Audio::metaData.genre
This property holds the genre of the media.
@@ -480,7 +482,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.year
\qmlproperty variant QtMultimedia5::Audio::metaData.year
This property holds the year of release of the media.
@@ -488,7 +490,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.date
\qmlproperty variant QtMultimedia5::Audio::metaData.date
This property holds the date of the media.
@@ -496,7 +498,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.userRating
\qmlproperty variant QtMultimedia5::Audio::metaData.userRating
This property holds a user rating of the media in the range of 0 to 100.
@@ -504,7 +506,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.keywords
\qmlproperty variant QtMultimedia5::Audio::metaData.keywords
This property holds a list of keywords describing the media.
@@ -512,7 +514,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.language
\qmlproperty variant QtMultimedia5::Audio::metaData.language
This property holds the language of the media, as an ISO 639-2 code.
@@ -520,7 +522,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.publisher
\qmlproperty variant QtMultimedia5::Audio::metaData.publisher
This property holds the publisher of the media.
@@ -528,7 +530,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.copyright
\qmlproperty variant QtMultimedia5::Audio::metaData.copyright
This property holds the media's copyright notice.
@@ -536,7 +538,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.parentalRating
\qmlproperty variant QtMultimedia5::Audio::metaData.parentalRating
This property holds the parental rating of the media.
@@ -544,7 +546,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.ratingOrganization
\qmlproperty variant QtMultimedia5::Audio::metaData.ratingOrganization
This property holds the name of the rating organization responsible for the
parental rating of the media.
@@ -553,7 +555,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.size
\qmlproperty variant QtMultimedia5::Audio::metaData.size
This property property holds the size of the media in bytes.
@@ -561,7 +563,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.mediaType
\qmlproperty variant QtMultimedia5::Audio::metaData.mediaType
This property holds the type of the media.
@@ -569,7 +571,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.audioBitRate
\qmlproperty variant QtMultimedia5::Audio::metaData.audioBitRate
This property holds the bit rate of the media's audio stream ni bits per
second.
@@ -578,7 +580,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.audioCodec
\qmlproperty variant QtMultimedia5::Audio::metaData.audioCodec
This property holds the encoding of the media audio stream.
@@ -586,7 +588,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.averageLevel
\qmlproperty variant QtMultimedia5::Audio::metaData.averageLevel
This property holds the average volume level of the media.
@@ -594,7 +596,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.channelCount
\qmlproperty variant QtMultimedia5::Audio::metaData.channelCount
This property holds the number of channels in the media's audio stream.
@@ -602,7 +604,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.peakValue
\qmlproperty variant QtMultimedia5::Audio::metaData.peakValue
This property holds the peak volume of media's audio stream.
@@ -610,7 +612,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.sampleRate
\qmlproperty variant QtMultimedia5::Audio::metaData.sampleRate
This property holds the sample rate of the media's audio stream in hertz.
@@ -618,7 +620,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.albumTitle
\qmlproperty variant QtMultimedia5::Audio::metaData.albumTitle
This property holds the title of the album the media belongs to.
@@ -626,7 +628,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.albumArtist
\qmlproperty variant QtMultimedia5::Audio::metaData.albumArtist
This property holds the name of the principal artist of the album the media
belongs to.
@@ -635,7 +637,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.contributingArtist
\qmlproperty variant QtMultimedia5::Audio::metaData.contributingArtist
This property holds the names of artists contributing to the media.
@@ -643,7 +645,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.composer
\qmlproperty variant QtMultimedia5::Audio::metaData.composer
This property holds the composer of the media.
@@ -651,7 +653,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.conductor
\qmlproperty variant QtMultimedia5::Audio::metaData.conductor
This property holds the conductor of the media.
@@ -659,7 +661,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.lyrics
\qmlproperty variant QtMultimedia5::Audio::metaData.lyrics
This property holds the lyrics to the media.
@@ -667,7 +669,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.mood
\qmlproperty variant QtMultimedia5::Audio::metaData.mood
This property holds the mood of the media.
@@ -675,7 +677,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.trackNumber
\qmlproperty variant QtMultimedia5::Audio::metaData.trackNumber
This property holds the track number of the media.
@@ -683,7 +685,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.trackCount
\qmlproperty variant QtMultimedia5::Audio::metaData.trackCount
This property holds the number of track on the album containing the media.
@@ -691,7 +693,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.coverArtUrlSmall
\qmlproperty variant QtMultimedia5::Audio::metaData.coverArtUrlSmall
This property holds the URL of a small cover art image.
@@ -699,7 +701,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.coverArtUrlLarge
\qmlproperty variant QtMultimedia5::Audio::metaData.coverArtUrlLarge
This property holds the URL of a large cover art image.
@@ -707,7 +709,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.resolution
\qmlproperty variant QtMultimedia5::Audio::metaData.resolution
This property holds the dimension of an image or video.
@@ -715,7 +717,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.pixelAspectRatio
\qmlproperty variant QtMultimedia5::Audio::metaData.pixelAspectRatio
This property holds the pixel aspect ratio of an image or video.
@@ -723,7 +725,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.videoFrameRate
\qmlproperty variant QtMultimedia5::Audio::metaData.videoFrameRate
This property holds the frame rate of the media's video stream.
@@ -731,7 +733,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.videoBitRate
\qmlproperty variant QtMultimedia5::Audio::metaData.videoBitRate
This property holds the bit rate of the media's video stream in bits per
second.
@@ -740,7 +742,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.videoCodec
\qmlproperty variant QtMultimedia5::Audio::metaData.videoCodec
This property holds the encoding of the media's video stream.
@@ -748,7 +750,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.posterUrl
\qmlproperty variant QtMultimedia5::Audio::metaData.posterUrl
This property holds the URL of a poster image.
@@ -756,7 +758,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.chapterNumber
\qmlproperty variant QtMultimedia5::Audio::metaData.chapterNumber
This property holds the chapter number of the media.
@@ -764,7 +766,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.director
\qmlproperty variant QtMultimedia5::Audio::metaData.director
This property holds the director of the media.
@@ -772,7 +774,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.leadPerformer
\qmlproperty variant QtMultimedia5::Audio::metaData.leadPerformer
This property holds the lead performer in the media.
@@ -780,7 +782,7 @@ void QDeclarativeAudio::componentComplete()
*/
/*!
\qmlproperty variant Audio::metaData.writer
\qmlproperty variant QtMultimedia5::Audio::metaData.writer
This property holds the writer of the media.

142
src/imports/multimedia/qdeclarativeaudio_4.cpp
View File

@@ -46,7 +46,7 @@
QT_BEGIN_NAMESPACE
/*!
/*
\qmlclass Audio QDeclarativeAudio
\brief The Audio element allows you to add audio playback to a scene.
@@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE
\sa Video
*/
/*!
/*
\internal
\class QDeclarativeAudio
\brief The QDeclarativeAudio class provides an audio item that you can add to a QDeclarativeView.
@@ -104,7 +104,7 @@ QDeclarativeAudio_4::~QDeclarativeAudio_4()
shutdown();
}
/*!
/*
\qmlmethod Audio::play()
Starts playback of the media.
@@ -121,7 +121,7 @@ void QDeclarativeAudio_4::play()
setPlaying(true);
}
/*!
/*
\qmlmethod Audio::pause()
Pauses playback of the media.
@@ -138,7 +138,7 @@ void QDeclarativeAudio_4::pause()
setPlaying(true);
}
/*!
/*
\qmlmethod Audio::stop()
Stops playback of the media.
@@ -155,13 +155,13 @@ void QDeclarativeAudio_4::stop()
setPaused(false);
}
/*!
/*
\qmlproperty url Audio::source
This property holds the source URL of the media.
*/
/*!
/*
\qmlproperty url Audio::autoLoad
This property indicates if loading of media should begin immediately.
@@ -169,7 +169,7 @@ void QDeclarativeAudio_4::stop()
Defaults to true, if false media will not be loaded until playback is started.
*/
/*!
/*
\qmlproperty bool Audio::playing
This property holds whether the media is playing.
@@ -177,7 +177,7 @@ void QDeclarativeAudio_4::stop()
Defaults to false, and can be set to true to start playback.
*/
/*!
/*
\qmlproperty bool Audio::paused
This property holds whether the media is paused.
@@ -185,31 +185,31 @@ void QDeclarativeAudio_4::stop()
Defaults to false, and can be set to true to pause playback.
*/
/*!
/*
\qmlsignal Audio::onStarted()
This handler is called when playback is started.
*/
/*!
/*
\qmlsignal Audio::onResumed()
This handler is called when playback is resumed from the paused state.
*/
/*!
/*
\qmlsignal Audio::onPaused()
This handler is called when playback is paused.
*/
/*!
/*
\qmlsignal Audio::onStopped()
This handler is called when playback is stopped.
*/
/*!
/*
\qmlproperty enumeration Audio::status
This property holds the status of media loading. It can be one of:
@@ -232,7 +232,7 @@ QDeclarativeAudio_4::Status QDeclarativeAudio_4::status() const
return Status(m_status);
}
/*!
/*
\qmlproperty int Audio::duration
This property holds the duration of the media in milliseconds.
@@ -240,7 +240,7 @@ QDeclarativeAudio_4::Status QDeclarativeAudio_4::status() const
If the media doesn't have a fixed duration (a live stream for example) this will be 0.
*/
/*!
/*
\qmlproperty int Audio::position
This property holds the current playback position in milliseconds.
@@ -248,19 +248,19 @@ QDeclarativeAudio_4::Status QDeclarativeAudio_4::status() const
If the \l seekable property is true, this property can be set to seek to a new position.
*/
/*!
/*
\qmlproperty real Audio::volume
This property holds the volume of the audio output, from 0.0 (silent) to 1.0 (maximum volume).
*/
/*!
/*
\qmlproperty bool Audio::muted
This property holds whether the audio output is muted.
*/
/*!
/*
\qmlproperty bool Audio::hasAudio
This property holds whether the media contains audio.
@@ -271,7 +271,7 @@ bool QDeclarativeAudio_4::hasAudio() const
return !m_complete ? false : m_playerControl->isAudioAvailable();
}
/*!
/*
\qmlproperty bool Audio::hasVideo
This property holds whether the media contains video.
@@ -282,14 +282,14 @@ bool QDeclarativeAudio_4::hasVideo() const
return !m_complete ? false : m_playerControl->isVideoAvailable();
}
/*!
/*
\qmlproperty real Audio::bufferProgress
This property holds how much of the data buffer is currently filled, from 0.0 (empty) to 1.0
(full).
*/
/*!
/*
\qmlproperty bool Audio::seekable
This property holds whether position of the audio can be changed.
@@ -297,13 +297,13 @@ bool QDeclarativeAudio_4::hasVideo() const
If true; setting a \l position value will cause playback to seek to the new position.
*/
/*!
/*
\qmlproperty real Audio::playbackRate
This property holds the rate at which audio is played at as a multiple of the normal rate.
*/
/*!
/*
\qmlproperty enumeration Audio::error
This property holds the error state of the audio. It can be one of:
@@ -344,13 +344,13 @@ void QDeclarativeAudio_4::componentComplete()
}
/*!
/*
\qmlproperty string Audio::errorString
This property holds a string describing the current error condition in more detail.
*/
/*!
/*
\qmlsignal Audio::onError(error, errorString)
This handler is called when an \l {QMediaPlayer::Error}{error} has
@@ -358,7 +358,7 @@ void QDeclarativeAudio_4::componentComplete()
information about the error.
*/
/*!
/*
\qmlproperty variant Audio::metaData.title
This property holds the tile of the media.
@@ -366,7 +366,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Title}
*/
/*!
/*
\qmlproperty variant Audio::metaData.subTitle
This property holds the sub-title of the media.
@@ -374,7 +374,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::SubTitle}
*/
/*!
/*
\qmlproperty variant Audio::metaData.author
This property holds the author of the media.
@@ -382,7 +382,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Author}
*/
/*!
/*
\qmlproperty variant Audio::metaData.comment
This property holds a user comment about the media.
@@ -390,7 +390,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Comment}
*/
/*!
/*
\qmlproperty variant Audio::metaData.description
This property holds a description of the media.
@@ -398,7 +398,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Description}
*/
/*!
/*
\qmlproperty variant Audio::metaData.category
This property holds the category of the media
@@ -406,7 +406,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Category}
*/
/*!
/*
\qmlproperty variant Audio::metaData.genre
This property holds the genre of the media.
@@ -414,7 +414,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Genre}
*/
/*!
/*
\qmlproperty variant Audio::metaData.year
This property holds the year of release of the media.
@@ -422,7 +422,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Year}
*/
/*!
/*
\qmlproperty variant Audio::metaData.date
This property holds the date of the media.
@@ -430,7 +430,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Date}
*/
/*!
/*
\qmlproperty variant Audio::metaData.userRating
This property holds a user rating of the media in the range of 0 to 100.
@@ -438,7 +438,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::UserRating}
*/
/*!
/*
\qmlproperty variant Audio::metaData.keywords
This property holds a list of keywords describing the media.
@@ -446,7 +446,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Keywords}
*/
/*!
/*
\qmlproperty variant Audio::metaData.language
This property holds the language of the media, as an ISO 639-2 code.
@@ -454,7 +454,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Language}
*/
/*!
/*
\qmlproperty variant Audio::metaData.publisher
This property holds the publisher of the media.
@@ -462,7 +462,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Publisher}
*/
/*!
/*
\qmlproperty variant Audio::metaData.copyright
This property holds the media's copyright notice.
@@ -470,7 +470,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Copyright}
*/
/*!
/*
\qmlproperty variant Audio::metaData.parentalRating
This property holds the parental rating of the media.
@@ -478,7 +478,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::ParentalRating}
*/
/*!
/*
\qmlproperty variant Audio::metaData.ratingOrganization
This property holds the name of the rating organization responsible for the
@@ -487,7 +487,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::RatingOrganization}
*/
/*!
/*
\qmlproperty variant Audio::metaData.size
This property property holds the size of the media in bytes.
@@ -495,7 +495,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Size}
*/
/*!
/*
\qmlproperty variant Audio::metaData.mediaType
This property holds the type of the media.
@@ -503,7 +503,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::MediaType}
*/
/*!
/*
\qmlproperty variant Audio::metaData.audioBitRate
This property holds the bit rate of the media's audio stream ni bits per
@@ -512,7 +512,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::AudioBitRate}
*/
/*!
/*
\qmlproperty variant Audio::metaData.audioCodec
This property holds the encoding of the media audio stream.
@@ -520,7 +520,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::AudioCodec}
*/
/*!
/*
\qmlproperty variant Audio::metaData.averageLevel
This property holds the average volume level of the media.
@@ -528,7 +528,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::AverageLevel}
*/
/*!
/*
\qmlproperty variant Audio::metaData.channelCount
This property holds the number of channels in the media's audio stream.
@@ -536,7 +536,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::ChannelCount}
*/
/*!
/*
\qmlproperty variant Audio::metaData.peakValue
This property holds the peak volume of media's audio stream.
@@ -544,7 +544,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::PeakValue}
*/
/*!
/*
\qmlproperty variant Audio::metaData.sampleRate
This property holds the sample rate of the media's audio stream in hertz.
@@ -552,7 +552,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::SampleRate}
*/
/*!
/*
\qmlproperty variant Audio::metaData.albumTitle
This property holds the title of the album the media belongs to.
@@ -560,7 +560,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::AlbumTitle}
*/
/*!
/*
\qmlproperty variant Audio::metaData.albumArtist
This property holds the name of the principal artist of the album the media
@@ -569,7 +569,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::AlbumArtist}
*/
/*!
/*
\qmlproperty variant Audio::metaData.contributingArtist
This property holds the names of artists contributing to the media.
@@ -577,7 +577,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::ContributingArtist}
*/
/*!
/*
\qmlproperty variant Audio::metaData.composer
This property holds the composer of the media.
@@ -585,7 +585,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Composer}
*/
/*!
/*
\qmlproperty variant Audio::metaData.conductor
This property holds the conductor of the media.
@@ -593,7 +593,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Conductor}
*/
/*!
/*
\qmlproperty variant Audio::metaData.lyrics
This property holds the lyrics to the media.
@@ -601,7 +601,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Lyrics}
*/
/*!
/*
\qmlproperty variant Audio::metaData.mood
This property holds the mood of the media.
@@ -609,7 +609,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Mood}
*/
/*!
/*
\qmlproperty variant Audio::metaData.trackNumber
This property holds the track number of the media.
@@ -617,7 +617,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::TrackNumber}
*/
/*!
/*
\qmlproperty variant Audio::metaData.trackCount
This property holds the number of track on the album containing the media.
@@ -625,7 +625,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::TrackNumber}
*/
/*!
/*
\qmlproperty variant Audio::metaData.coverArtUrlSmall
This property holds the URL of a small cover art image.
@@ -633,7 +633,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::CoverArtUrlSmall}
*/
/*!
/*
\qmlproperty variant Audio::metaData.coverArtUrlLarge
This property holds the URL of a large cover art image.
@@ -641,7 +641,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::CoverArtUrlLarge}
*/
/*!
/*
\qmlproperty variant Audio::metaData.resolution
This property holds the dimension of an image or video.
@@ -649,7 +649,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Resolution}
*/
/*!
/*
\qmlproperty variant Audio::metaData.pixelAspectRatio
This property holds the pixel aspect ratio of an image or video.
@@ -657,7 +657,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::PixelAspectRatio}
*/
/*!
/*
\qmlproperty variant Audio::metaData.videoFrameRate
This property holds the frame rate of the media's video stream.
@@ -665,7 +665,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::VideoFrameRate}
*/
/*!
/*
\qmlproperty variant Audio::metaData.videoBitRate
This property holds the bit rate of the media's video stream in bits per
@@ -674,7 +674,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::VideoBitRate}
*/
/*!
/*
\qmlproperty variant Audio::metaData.videoCodec
This property holds the encoding of the media's video stream.
@@ -682,7 +682,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::VideoCodec}
*/
/*!
/*
\qmlproperty variant Audio::metaData.posterUrl
This property holds the URL of a poster image.
@@ -690,7 +690,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::PosterUrl}
*/
/*!
/*
\qmlproperty variant Audio::metaData.chapterNumber
This property holds the chapter number of the media.
@@ -698,7 +698,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::ChapterNumber}
*/
/*!
/*
\qmlproperty variant Audio::metaData.director
This property holds the director of the media.
@@ -706,7 +706,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::Director}
*/
/*!
/*
\qmlproperty variant Audio::metaData.leadPerformer
This property holds the lead performer in the media.
@@ -714,7 +714,7 @@ void QDeclarativeAudio_4::componentComplete()
\sa {QtMultimedia::MetaData::LeadPerformer}
*/
/*!
/*
\qmlproperty variant Audio::metaData.writer
This property holds the writer of the media.

28
src/imports/multimedia/qdeclarativecamera.cpp
View File

@@ -73,6 +73,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
\brief The Camera element allows you to access viewfinder frames, and take photos and movies.
\ingroup multimedia_qml
\ingroup camera_qml
\inqmlmodule QtMultimedia 5
\inherits Item
@@ -83,6 +84,7 @@ void QDeclarativeCamera::_q_updateState(QCamera::State state)
viewfinder you can use a \l VideoOutput element with the Camera element set as the source.
\qml
import QtQuick 2.0
import QtMultimedia 5.0
@@ -206,7 +208,7 @@ QDeclarativeCamera::Error QDeclarativeCamera::error() const
}
/*!
\qmlproperty string Camera::errorString
\qmlproperty string QtMultimedia5::Camera::errorString
A description of the current error, if any.
*/
@@ -216,7 +218,7 @@ QString QDeclarativeCamera::errorString() const
}
/*!
\qmlproperty enumeration Camera::captureMode
\qmlproperty enumeration QtMultimedia5::Camera::captureMode
\table
\header \o Value \o Description
@@ -241,7 +243,7 @@ void QDeclarativeCamera::setCaptureMode(QDeclarativeCamera::CaptureMode mode)
/*!
\qmlproperty enumeration Camera::cameraState
\qmlproperty enumeration QtMultimedia5::Camera::cameraState
The current state of the camera object.
@@ -298,7 +300,7 @@ void QDeclarativeCamera::setCameraState(QDeclarativeCamera::State state)
}
/*!
\qmlmethod Camera::start()
\qmlmethod QtMultimedia5::Camera::start()
\fn QDeclarativeCamera::start()
Starts the camera. Viewfinder frames will
@@ -311,7 +313,7 @@ void QDeclarativeCamera::start()
}
/*!
\qmlmethod Camera::stop()
\qmlmethod QtMultimedia5::Camera::stop()
\fn QDeclarativeCamera::stop()
Stops the camera, but leaves the camera
@@ -324,7 +326,7 @@ void QDeclarativeCamera::stop()
/*!
\qmlproperty enumeration Camera::lockStatus
\qmlproperty enumeration QtMultimedia5::Camera::lockStatus
The overall status for all the requested camera locks.
@@ -381,7 +383,7 @@ QDeclarativeCamera::LockStatus QDeclarativeCamera::lockStatus() const
}
/*!
\qmlmethod Camera::searchAndLock()
\qmlmethod QtMultimedia5::Camera::searchAndLock()
\fn QDeclarativeCamera::searchAndLock()
Start focusing, exposure and white balance calculation.
@@ -397,7 +399,7 @@ void QDeclarativeCamera::searchAndLock()
}
/*!
\qmlmethod Camera::unlock()
\qmlmethod QtMultimedia5::Camera::unlock()
\fn QDeclarativeCamera::unlock()
Unlock focus, exposure and white balance locks.
@@ -408,7 +410,7 @@ void QDeclarativeCamera::unlock()
}
/*!
\qmlproperty real Camera::maximumOpticalZoom
\qmlproperty real QtMultimedia5::Camera::maximumOpticalZoom
\property QDeclarativeCamera::maximumOpticalZoom
The maximum optical zoom factor, or 1.0 if optical zoom is not supported.
@@ -419,7 +421,7 @@ qreal QDeclarativeCamera::maximumOpticalZoom() const
}
/*!
\qmlproperty real Camera::maximumDigitalZoom
\qmlproperty real QtMultimedia5::Camera::maximumDigitalZoom
\property QDeclarativeCamera::maximumDigitalZoom
The maximum digital zoom factor, or 1.0 if digital zoom is not supported.
@@ -430,7 +432,7 @@ qreal QDeclarativeCamera::maximumDigitalZoom() const
}
/*!
\qmlproperty real Camera::opticalZoom
\qmlproperty real QtMultimedia5::Camera::opticalZoom
\property QDeclarativeCamera::opticalZoom
The current optical zoom factor.
@@ -446,7 +448,7 @@ void QDeclarativeCamera::setOpticalZoom(qreal value)
}
/*!
\qmlproperty real Camera::digitalZoom
\qmlproperty real QtMultimedia5::Camera::digitalZoom
\property QDeclarativeCamera::digitalZoom
The current digital zoom factor.
@@ -463,7 +465,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
/*!
\qmlsignal Camera::onError(error, errorString)
\qmlsignal QtMultimedia5::Camera::onError(error, errorString)
This handler is called when an error occurs. The enumeration value \a error is one of the
values defined below, and a descriptive string value is available in \a errorString.

25
src/imports/multimedia/qdeclarativecameracapture.cpp
View File

@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
\qmlclass CameraCapture QDeclarativeCameraCapture
\brief The CameraCapture element provides an interface for capturing camera images
\ingroup multimedia_qml
\inqmlmodule QtMultimedia 5
\ingroup camera_qml
This element allows you to capture still images and be notified when they
@@ -119,7 +120,7 @@ QDeclarativeCameraCapture::~QDeclarativeCameraCapture()
}
/*!
\qmlproperty bool CameraCapture::ready
\qmlproperty bool QtMultimedia5::CameraCapture::ready
\property QDeclarativeCameraCapture::ready
Indicates camera is ready to capture photo.
@@ -130,7 +131,7 @@ bool QDeclarativeCameraCapture::isReadyForCapture() const
}
/*!
\qmlmethod CameraCapture::capture()
\qmlmethod QtMultimedia5::CameraCapture::capture()
\fn QDeclarativeCameraCapture::capture()
Start image capture. The \l onImageCaptured() and \l onImageSaved() signals will
@@ -147,7 +148,7 @@ int QDeclarativeCameraCapture::capture()
}
/*!
\qmlmethod CameraCapture::captureToLocation(location)
\qmlmethod QtMultimedia5::CameraCapture::captureToLocation(location)
\fn QDeclarativeCameraCapture::captureToLocation(const QString &location)
Start image capture to specified \a location. The \l onImageCaptured() and \l onImageSaved() signals will
@@ -162,7 +163,7 @@ int QDeclarativeCameraCapture::captureToLocation(const QString &location)
}
/*!
\qmlmethod CameraCapture::cancelCapture()
\qmlmethod QtMultimedia5::CameraCapture::cancelCapture()
\fn QDeclarativeCameraCapture::cancelCapture()
Cancel pending image capture requests.
@@ -174,7 +175,7 @@ void QDeclarativeCameraCapture::cancelCapture()
}
/*!
\qmlproperty string CameraCapture::capturedImagePath
\qmlproperty string QtMultimedia5::CameraCapture::capturedImagePath
\property QDeclarativeCameraCapture::capturedImagePath
The path to the last captured image.
@@ -212,7 +213,7 @@ void QDeclarativeCameraCapture::_q_captureFailed(int id, QCameraImageCapture::Er
}
/*!
\qmlproperty size CameraCapture::resolution
\qmlproperty size QtMultimedia5::CameraCapture::resolution
\property QDeclarativeCameraCapture::resolution
The resolution to capture the image at. If empty, the system will pick
@@ -240,7 +241,7 @@ QCameraImageCapture::Error QDeclarativeCameraCapture::error() const
/*!
\qmlproperty string CameraCapture::errorString
\qmlproperty string QtMultimedia5::CameraCapture::errorString
\property QDeclarativeCameraCapture::errorString
The last capture related error message.
@@ -251,7 +252,7 @@ QString QDeclarativeCameraCapture::errorString() const
}
/*!
\qmlmethod CameraCapture::setMetadata(key, value)
\qmlmethod QtMultimedia5::CameraCapture::setMetadata(key, value)
\fn QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &value)
Sets a particular metadata \a key to \a value for the subsequent image captures.
@@ -263,7 +264,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
}
/*!
\qmlsignal CameraCapture::onCaptureFailed(requestId, message)
\qmlsignal QtMultimedia5::CameraCapture::onCaptureFailed(requestId, message)
\fn QDeclarativeCameraCapture::captureFailed(int requestId, const QString &message)
This handler is called when an error occurs during capture with \a requestId.
@@ -271,7 +272,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
*/
/*!
\qmlsignal CameraCapture::onImageCaptured(requestId, preview)
\qmlsignal QtMultimedia5::CameraCapture::onImageCaptured(requestId, preview)
\fn QDeclarativeCameraCapture::imageCaptured(int requestId, const QString &preview)
This handler is called when an image with \a requestId has been captured
@@ -282,7 +283,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
*/
/*!
\qmlsignal CameraCapture::onImageSaved(requestId, path)
\qmlsignal QtMultimedia5::CameraCapture::onImageSaved(requestId, path)
\fn QDeclarativeCameraCapture::imageSaved(int requestId, const QString &path)
This handler is called after the image with \a requestId has been written to the filesystem.
@@ -293,7 +294,7 @@ void QDeclarativeCameraCapture::setMetadata(const QString &key, const QVariant &
/*!
\qmlsignal CameraCapture::onImageMetadataAvailable(requestId, key, value)
\qmlsignal QtMultimedia5::CameraCapture::onImageMetadataAvailable(requestId, key, value)
\fn QDeclarativeCameraCapture::imageMetadataAvailable(int requestId, const QString &key, const QVariant &value);
This handler is called when the image with \a requestId has new metadata

27
src/imports/multimedia/qdeclarativecameraexposure.cpp
View File

@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
\brief The CameraExposure element provides interface for exposure related camera settings.
\ingroup multimedia_qml
\ingroup camera_qml
\inqmlmodule QtMultimedia 5
This element is part of the \bold{QtMultimedia 5.0} module.
@@ -118,7 +119,7 @@ QDeclarativeCameraExposure::~QDeclarativeCameraExposure()
}
/*!
\qmlproperty real CameraExposure::exposureCompensation
\qmlproperty real QtMultimedia5::CameraExposure::exposureCompensation
\property QDeclarativeCameraExposure::exposureCompensation
Adjustment for the automatically calculated exposure. The value is
@@ -135,7 +136,7 @@ void QDeclarativeCameraExposure::setExposureCompensation(qreal ev)
}
/*!
\qmlproperty integer CameraExposure::iso
\qmlproperty integer QtMultimedia5::CameraExposure::iso
\property QDeclarativeCameraExposure::iso
The sensor's ISO sensitivity.
@@ -146,7 +147,7 @@ int QDeclarativeCameraExposure::isoSensitivity() const
}
/*!
\qmlproperty real CameraExposure::shutterSpeed
\qmlproperty real QtMultimedia5::CameraExposure::shutterSpeed
\property QDeclarativeCameraExposure::shutterSpeed
The camera's current shutter speed setting, in seconds. To affect
@@ -160,7 +161,7 @@ qreal QDeclarativeCameraExposure::shutterSpeed() const
}
/*!
\qmlproperty real CameraExposure::aperture
\qmlproperty real QtMultimedia5::CameraExposure::aperture
\property QDeclarativeCameraExposure::aperture
The current lens aperture as an F number (the ratio of
@@ -174,7 +175,7 @@ qreal QDeclarativeCameraExposure::aperture() const
}
/*!
\qmlproperty integer CameraExposure::manualIsoSensitivity
\qmlproperty integer QtMultimedia5::CameraExposure::manualIsoSensitivity
\property QDeclarativeCameraExposure::manualIsoSensitivity
This property allows you to set a specific ISO setting
@@ -203,7 +204,7 @@ void QDeclarativeCameraExposure::setManualIsoSensitivity(int iso)
}
/*!
\qmlproperty real CameraExposure::manualShutterSpeed
\qmlproperty real QtMultimedia5::CameraExposure::manualShutterSpeed
\property QDeclarativeCameraExposure::manualShutterSpeed
This property allows you to set the shutter speed to
@@ -230,7 +231,7 @@ void QDeclarativeCameraExposure::setManualShutterSpeed(qreal speed)
}
/*!
\qmlproperty real CameraExposure::manualAperture
\qmlproperty real QtMultimedia5::CameraExposure::manualAperture
\property QDeclarativeCameraExposure::manualAperture
This property allows you to set the aperture (F number)
@@ -257,7 +258,7 @@ void QDeclarativeCameraExposure::setManualAperture(qreal aperture)
}
/*!
\qmlmethod CameraExposure::setAutoAperture()
\qmlmethod QtMultimedia5::CameraExposure::setAutoAperture()
Turn on auto aperture selection. The manual aperture value is reset to -1.0
*/
void QDeclarativeCameraExposure::setAutoAperture()
@@ -266,7 +267,7 @@ void QDeclarativeCameraExposure::setAutoAperture()
}
/*!
\qmlmethod CameraExposure::setAutoShutterSpeed()
\qmlmethod QtMultimedia5::CameraExposure::setAutoShutterSpeed()
Turn on auto shutter speed selection. The manual shutter speed value is reset to -1.0
*/
void QDeclarativeCameraExposure::setAutoShutterSpeed()
@@ -275,7 +276,7 @@ void QDeclarativeCameraExposure::setAutoShutterSpeed()
}
/*!
\qmlmethod CameraExposure::setAutoIsoSensitivity()
\qmlmethod QtMultimedia5::CameraExposure::setAutoIsoSensitivity()
Turn on auto ISO sensitivity selection. The manual ISO value is reset to -1.
*/
void QDeclarativeCameraExposure::setAutoIsoSensitivity()
@@ -284,7 +285,7 @@ void QDeclarativeCameraExposure::setAutoIsoSensitivity()
}
/*!
\qmlproperty enumeration CameraExposure::exposureMode
\qmlproperty enumeration QtMultimedia5::CameraExposure::exposureMode
\property QDeclarativeCameraExposure::exposureMode
Set the camera exposure mode to one of the following:
@@ -320,7 +321,7 @@ void QDeclarativeCameraExposure::setExposureMode(QDeclarativeCamera::ExposureMod
}
/*!
\qmlproperty QPointF CameraExposure::spotMeteringPoint
\qmlproperty QPointF QtMultimedia5::CameraExposure::spotMeteringPoint
\property QDeclarativeCameraExposure::spotMeteringPoint
The relative frame coordinates of the point to use for exposure metering.
@@ -343,7 +344,7 @@ void QDeclarativeCameraExposure::setSpotMeteringPoint(const QPointF &point)
}
/*!
\qmlproperty enumeration CameraExposure::meteringMode
\qmlproperty enumeration QtMultimedia5::CameraExposure::meteringMode
\property QDeclarativeCameraExposure::meteringMode
Set the camera metering mode (how exposure is balanced)

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

@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass CameraFlash QDeclarativeCameraFlash
\inqmlmodule QtMultimedia 5
\brief The CameraFlash element provides interface for flash related camera settings.
\ingroup multimedia_qml
\ingroup camera_qml
@@ -95,7 +96,7 @@ QDeclarativeCameraFlash::~QDeclarativeCameraFlash()
}
/*!
\qmlproperty bool QDeclarativeCameraFlash::ready
\qmlproperty bool QtMultimedia5::QDeclarativeCameraFlash::ready
\property bool QDeclarativeCameraFlash::ready
Indicates flash is charged.
@@ -106,7 +107,7 @@ bool QDeclarativeCameraFlash::isFlashReady() const
}
/*!
\qmlproperty enumeration CameraExposure::flashMode
\qmlproperty enumeration QtMultimedia5::CameraExposure::flashMode
\property QDeclarativeCameraFlash::flashMode
\table
@@ -140,12 +141,12 @@ void QDeclarativeCameraFlash::setFlashMode(int mode)
}
/*!
\qmlsignal CameraExposure::flashModeChanged(int)
\qmlsignal QtMultimedia5::CameraExposure::flashModeChanged(int)
\fn void QDeclarativeCameraFlash::flashModeChanged(int)
*/
/*!
\qmlsignal CameraExposure::flashReady(bool)
\qmlsignal QtMultimedia5::CameraExposure::flashReady(bool)
\fn void QDeclarativeCameraFlash::flashReady(bool)
*/

13
src/imports/multimedia/qdeclarativecamerafocus.cpp
View File

@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass CameraFocus QDeclarativeCameraFocus
\inqmlmodule QtMultimedia 5
\brief The CameraFocus element provides interface for focus related camera settings.
\ingroup multimedia_qml
\ingroup camera_qml
@@ -103,7 +104,7 @@ QDeclarativeCameraFocus::~QDeclarativeCameraFocus()
/*!
\qmlproperty Camera::FocusMode CameraFocus::focusMode
\qmlproperty QtMultimedia5::Camera::FocusMode CameraFocus::focusMode
\property QDeclarativeCameraFocus::focusMode
The current camera focus mode.
@@ -121,7 +122,7 @@ QDeclarativeCamera::FocusMode QDeclarativeCameraFocus::focusMode() const
}
/*!
\qmlmethod bool CameraFocus::isFocusModeSupported(mode)
\qmlmethod bool QtMultimedia5::CameraFocus::isFocusModeSupported(mode)
\fn QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::FocusMode mode)
Returns true if the supplied \a mode is a supported focus mode, and
@@ -138,7 +139,7 @@ void QDeclarativeCameraFocus::setFocusMode(QDeclarativeCamera::FocusMode mode)
}
/*!
\qmlproperty CameraFocus::FocusPointMode CameraFocus::focusPointMode
\qmlproperty QtMultimedia5::CameraFocus::FocusPointMode CameraFocus::focusPointMode
\property QDeclarativeCameraFocus::focusPointMode
The current camera focus point mode. This is used in automatic
@@ -162,7 +163,7 @@ void QDeclarativeCameraFocus::setFocusPointMode(QDeclarativeCamera::FocusPointMo
}
/*!
\qmlmethod bool CameraFocus::isFocusPointModeSupported(mode)
\qmlmethod bool QtMultimedia5::CameraFocus::isFocusPointModeSupported(mode)
\fn QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::FocusPointMode mode)
Returns true if the supplied \a mode is a supported focus point mode, and
@@ -174,7 +175,7 @@ bool QDeclarativeCameraFocus::isFocusPointModeSupported(QDeclarativeCamera::Focu
}
/*!
\qmlproperty QPointF CameraFocus::customFocusPoint
\qmlproperty QPointF QtMultimedia5::CameraFocus::customFocusPoint
\property QDeclarativeCameraFocus::customFocusPoint
Position of custom focus point, in relative frame coordinates:
@@ -198,7 +199,7 @@ void QDeclarativeCameraFocus::setCustomFocusPoint(const QPointF &point)
}
/*!
\qmlproperty QPointF CameraFocus::focusZones
\qmlproperty QPointF QtMultimedia5::CameraFocus::focusZones
\property QDeclarativeCameraFocus::focusZones
List of current camera focus zones,

17
src/imports/multimedia/qdeclarativecameraimageprocessing.cpp
View File

@@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass CameraImageProcessing QDeclarativeCameraImageProcessing
\inqmlmodule QtMultimedia 5
\brief The CameraCapture element provides an interface for camera capture related settings
\ingroup multimedia_qml
\ingroup camera_qml
@@ -93,7 +94,7 @@ QDeclarativeCameraImageProcessing::~QDeclarativeCameraImageProcessing()
}
/*!
\qmlproperty enumeration CameraImageProcessing::whiteBalanceMode
\qmlproperty enumeration QtMultimedia5::CameraImageProcessing::whiteBalanceMode
\table
\header \o Value \o Description
@@ -130,7 +131,7 @@ void QDeclarativeCameraImageProcessing::setWhiteBalanceMode(QDeclarativeCameraIm
}
/*!
\qmlproperty qreal CameraImageProcessing::manualWhiteBalance
\qmlproperty qreal QtMultimedia5::CameraImageProcessing::manualWhiteBalance
The color temperature used when in manual white balance mode (WhiteBalanceManual).
The units are Kelvin.
@@ -151,7 +152,7 @@ void QDeclarativeCameraImageProcessing::setManualWhiteBalance(qreal colorTemp) c
}
/*!
\qmlproperty int CameraImageProcessing::contrast
\qmlproperty int QtMultimedia5::CameraImageProcessing::contrast
Image contrast adjustment.
Valid contrast adjustment values range between -1.0 and 1.0, with a default of 0.
@@ -170,7 +171,7 @@ void QDeclarativeCameraImageProcessing::setContrast(qreal value)
}
/*!
\qmlproperty int CameraImageProcessing::saturation
\qmlproperty int QtMultimedia5::CameraImageProcessing::saturation
Image saturation adjustment.
Valid saturation adjustment values range between -1.0 and 1.0, the default is 0.
@@ -189,7 +190,7 @@ void QDeclarativeCameraImageProcessing::setSaturation(qreal value)
}
/*!
\qmlproperty int CameraImageProcessing::sharpeningLevel
\qmlproperty int QtMultimedia5::CameraImageProcessing::sharpeningLevel
Adjustment of sharpening level applied to image.
@@ -210,7 +211,7 @@ void QDeclarativeCameraImageProcessing::setSharpeningLevel(qreal value)
}
/*!
\qmlproperty int CameraImageProcessing::denoisingLevel
\qmlproperty int QtMultimedia5::CameraImageProcessing::denoisingLevel
Adjustment of denoising applied to image.
@@ -231,11 +232,11 @@ void QDeclarativeCameraImageProcessing::setDenoisingLevel(qreal value)
}
/*!
\qmlsignal Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode)
\qmlsignal QtMultimedia5::Camera::whiteBalanceModeChanged(Camera::WhiteBalanceMode)
*/
/*!
\qmlsignal Camera::manualWhiteBalanceChanged(qreal)
\qmlsignal QtMultimedia5::Camera::manualWhiteBalanceChanged(qreal)
*/
QT_END_NAMESPACE

37
src/imports/multimedia/qdeclarativecamerarecorder.cpp
View File

@@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass CameraRecorder QDeclarativeCameraRecorder
\inqmlmodule QtMultimedia 5
\brief The CameraRecorder element controls video recording with the Camera.
\ingroup multimedia_qml
\ingroup camera_qml
@@ -87,7 +88,7 @@ QDeclarativeCameraRecorder::~QDeclarativeCameraRecorder()
}
/*!
\qmlproperty size CameraRecorder::captureResolution
\qmlproperty size QtMultimedia5::CameraRecorder::captureResolution
The video frame dimensions to use when capturing
video.
@@ -98,7 +99,7 @@ QSize QDeclarativeCameraRecorder::captureResolution()
}
/*!
\qmlproperty string CameraRecorder::audioCodec
\qmlproperty string QtMultimedia5::CameraRecorder::audioCodec
The audio codec to use for recording video.
Typically this is something like \c aac or \c amr-wb.
@@ -111,7 +112,7 @@ QString QDeclarativeCameraRecorder::audioCodec() const
}
/*!
\qmlproperty string CameraRecorder::videoCodec
\qmlproperty string QtMultimedia5::CameraRecorder::videoCodec
The video codec to use for recording video.
Typically this is something like \c h264.
@@ -122,7 +123,7 @@ QString QDeclarativeCameraRecorder::videoCodec() const
}
/*!
\qmlproperty string CameraRecorder::mediaContainer
\qmlproperty string QtMultimedia5::CameraRecorder::mediaContainer
The media container to use for recording video.
Typically this is something like \c mp4.
@@ -169,7 +170,7 @@ void QDeclarativeCameraRecorder::setMediaContainer(const QString &container)
}
/*!
\qmlproperty qreal CameraRecorder::frameRate
\qmlproperty qreal QtMultimedia5::CameraRecorder::frameRate
The video framerate to use when recording video,
in frames per second.
@@ -180,7 +181,7 @@ qreal QDeclarativeCameraRecorder::frameRate() const
}
/*!
\qmlproperty int CameraRecorder::videoBitRate
\qmlproperty int QtMultimedia5::CameraRecorder::videoBitRate
The video bit rate to use when recording video,
in bits per second.
@@ -191,7 +192,7 @@ int QDeclarativeCameraRecorder::videoBitRate() const
}
/*!
\qmlproperty int CameraRecorder::audioBitRate
\qmlproperty int QtMultimedia5::CameraRecorder::audioBitRate
The audio bit rate to use when recording video,
in bits per second.
@@ -202,7 +203,7 @@ int QDeclarativeCameraRecorder::audioBitRate() const
}
/*!
\qmlproperty int CameraRecorder::audioChannels
\qmlproperty int QtMultimedia5::CameraRecorder::audioChannels
The number of audio channels to encode when
recording video (1 is mono, 2 is stereo).
@@ -213,7 +214,7 @@ int QDeclarativeCameraRecorder::audioChannels() const
}
/*!
\qmlproperty int CameraRecorder::audioSampleRate
\qmlproperty int QtMultimedia5::CameraRecorder::audioSampleRate
The audio sample rate to encode audio at, when
recording video.
@@ -275,7 +276,7 @@ QMediaRecorder::Error QDeclarativeCameraRecorder::error() const
}
/*!
\qmlproperty string Camera::errorString
\qmlproperty string QtMultimedia5::Camera::errorString
A description of the current error, if any.
*/
@@ -285,7 +286,7 @@ QString QDeclarativeCameraRecorder::errorString() const
}
/*!
\qmlproperty enumeration CameraRecorder::recorderState
\qmlproperty enumeration QtMultimedia5::CameraRecorder::recorderState
The current state of the camera recorder object.
@@ -310,7 +311,7 @@ QDeclarativeCameraRecorder::RecorderState QDeclarativeCameraRecorder::recorderSt
}
/*!
\qmlmethod CameraRecorder::record()
\qmlmethod QtMultimedia5::CameraRecorder::record()
Starts recording.
*/
@@ -320,7 +321,7 @@ void QDeclarativeCameraRecorder::record()
}
/*!
\qmlmethod CameraRecorder::stop()
\qmlmethod QtMultimedia5::CameraRecorder::stop()
Stops recording.
*/
@@ -345,7 +346,7 @@ void QDeclarativeCameraRecorder::setRecorderState(QDeclarativeCameraRecorder::Re
}
/*!
\qmlproperty string CameraRecorder::outputLocation
\qmlproperty string QtMultimedia5::CameraRecorder::outputLocation
\property QDeclarativeCameraRecorder::outputLocation
\brief the destination location of media content.
@@ -360,7 +361,7 @@ QString QDeclarativeCameraRecorder::outputLocation() const
}
/*!
\qmlproperty string CameraRecorder::actualLocation
\qmlproperty string QtMultimedia5::CameraRecorder::actualLocation
\property QDeclarativeCameraRecorder::actualLocation
\brief the actual location of the last media content.
@@ -383,7 +384,7 @@ void QDeclarativeCameraRecorder::setOutputLocation(const QString &location)
}
/*!
\qmlproperty int CameraRecorder::duration
\qmlproperty int QtMultimedia5::CameraRecorder::duration
\property QDeclarativeCameraRecorder::duration
Returns the current duration of the recording, in
@@ -395,7 +396,7 @@ qint64 QDeclarativeCameraRecorder::duration() const
}
/*!
\qmlproperty bool CameraRecorder::muted
\qmlproperty bool QtMultimedia5::CameraRecorder::muted
\property QDeclarativeCameraRecorder::muted
Whether or not the audio input is muted during
@@ -412,7 +413,7 @@ void QDeclarativeCameraRecorder::setMuted(bool muted)
}
/*!
\qmlmethod CameraRecorder::setMetadata(key, value)
\qmlmethod QtMultimedia5::CameraRecorder::setMetadata(key, value)
Sets metadata for the next video to be recorder, with
the given \a key being associated with \a value.

47
src/imports/multimedia/qdeclarativeradio.cpp
View File

@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass Radio QDeclarativeRadio
\inqmlmodule QtMultimedia 5
\brief The Radio element allows you to access radio functionality from a QML application.
\ingroup multimedia_qml
\inherits Item
@@ -119,7 +120,7 @@ QDeclarativeRadio::~QDeclarativeRadio()
}
/*!
\qmlproperty enumeration Radio::state
\qmlproperty enumeration QtMultimedia5::Radio::state
This property holds the current state of the Radio element.
@@ -141,7 +142,7 @@ QDeclarativeRadio::State QDeclarativeRadio::state() const
}
/*!
\qmlproperty enumeration Radio::band
\qmlproperty enumeration QtMultimedia5::Radio::band
This property holds the frequency band used for the radio, which can be specified as
any one of the values in the table below.
@@ -171,7 +172,7 @@ QDeclarativeRadio::Band QDeclarativeRadio::band() const
}
/*!
\qmlproperty int Radio::frequency
\qmlproperty int QtMultimedia5::Radio::frequency
Sets the frequency in Hertz that the radio is tuned to. The frequency must be within the frequency
range for the current band, otherwise it will be changed to be within the frequency range.
@@ -184,7 +185,7 @@ int QDeclarativeRadio::frequency() const
}
/*!
\qmlproperty enumeration Radio::stereoMode
\qmlproperty enumeration QtMultimedia5::Radio::stereoMode
This property holds the stereo mode of the radio, which can be set to any one of the
values in the table below.
@@ -208,7 +209,7 @@ QDeclarativeRadio::StereoMode QDeclarativeRadio::stereoMode() const
}
/*!
\qmlproperty int Radio::volume
\qmlproperty int QtMultimedia5::Radio::volume
Set this property to control the volume of the radio. The valid range of the volume is from 0 to 100.
*/
@@ -218,7 +219,7 @@ int QDeclarativeRadio::volume() const
}
/*!
\qmlproperty bool Radio::muted
\qmlproperty bool QtMultimedia5::Radio::muted
This property reflects whether the radio is muted or not.
*/
@@ -228,7 +229,7 @@ bool QDeclarativeRadio::muted() const
}
/*!
\qmlproperty bool Radio::stereo
\qmlproperty bool QtMultimedia5::Radio::stereo
This property holds whether the radio is receiving a stereo signal or not. If \l stereoMode is
set to ForceMono the value will always be false. Likewise, it will always be true if stereoMode
@@ -242,7 +243,7 @@ bool QDeclarativeRadio::stereo() const
}
/*!
\qmlproperty int Radio::signalStrength
\qmlproperty int QtMultimedia5::Radio::signalStrength
The strength of the current radio signal as a percentage where 0% equals no signal, and 100% is a
very good signal.
@@ -253,7 +254,7 @@ int QDeclarativeRadio::signalStrength() const
}
/*!
\qmlproperty bool Radio::searching
\qmlproperty bool QtMultimedia5::Radio::searching
This property is true if the radio is currently searching for radio stations, for instance using the \l scanUp,
\l scanDown, and \l searchAllStations methods. Once the search completes, or if it is cancelled using
@@ -265,7 +266,7 @@ bool QDeclarativeRadio::searching() const
}
/*!
\qmlproperty int Radio::frequencyStep
\qmlproperty int QtMultimedia5::Radio::frequencyStep
The number of Hertz for each step when tuning the radio manually. The value is for the current \l band.
*/
@@ -275,7 +276,7 @@ int QDeclarativeRadio::frequencyStep() const
}
/*!
\qmlproperty int Radio::minimumFrequency
\qmlproperty int QtMultimedia5::Radio::minimumFrequency
The minimum frequency for the current \l band.
*/
@@ -285,7 +286,7 @@ int QDeclarativeRadio::minimumFrequency() const
}
/*!
\qmlproperty int Radio::maximumFrequency
\qmlproperty int QtMultimedia5::Radio::maximumFrequency
The maximum frequency for the current \l band.
*/
@@ -295,7 +296,7 @@ int QDeclarativeRadio::maximumFrequency() const
}
/*!
\qmlproperty int Radio::antennaConnected
\qmlproperty int QtMultimedia5::Radio::antennaConnected
This property is true if there is an antenna connected. Otherwise it will be false.
*/
@@ -305,7 +306,7 @@ bool QDeclarativeRadio::isAntennaConnected() const
}
/*!
\qmlmethod bool Radio::isAvailable()
\qmlmethod bool QtMultimedia5::Radio::isAvailable()
Returns whether the radio is ready to use.
*/
@@ -340,7 +341,7 @@ void QDeclarativeRadio::setMuted(bool muted)
}
/*!
\qmlmethod Radio::cancelScan()
\qmlmethod QtMultimedia5::Radio::cancelScan()
Cancel the current scan. Will also cancel a search started with \l searchAllStations.
*/
@@ -350,7 +351,7 @@ void QDeclarativeRadio::cancelScan()
}
/*!
\qmlmethod Radio::scanDown()
\qmlmethod QtMultimedia5::Radio::scanDown()
Searches backward in the frequency range for the current band.
*/
@@ -360,7 +361,7 @@ void QDeclarativeRadio::scanDown()
}
/*!
\qmlmethod Radio::scanUp()
\qmlmethod QtMultimedia5::Radio::scanUp()
Searches forward in the frequency range for the current band.
*/
@@ -370,7 +371,7 @@ void QDeclarativeRadio::scanUp()
}
/*!
\qmlmethod Radio::searchAllStations(enumeration searchMode)
\qmlmethod QtMultimedia5::Radio::searchAllStations(enumeration searchMode)
Start searching the complete frequency range for the current band, and save all the
radio stations found. The search mode can be either of the values described in the
@@ -429,7 +430,7 @@ void QDeclarativeRadio::searchAllStations(QDeclarativeRadio::SearchMode searchMo
}
/*!
\qmlmethod Radio::tuneDown()
\qmlmethod QtMultimedia5::Radio::tuneDown()
Decrements the frequency by the frequency step for the current band. If the frequency is already set
to the minimum frequency, calling this function has no effect.
@@ -444,7 +445,7 @@ void QDeclarativeRadio::tuneDown()
}
/*!
\qmlmethod Radio::tuneUp()
\qmlmethod QtMultimedia5::Radio::tuneUp()
Increments the frequency by the frequency step for the current band. If the frequency is already set
to the maximum frequency, calling this function has no effect.
@@ -459,7 +460,7 @@ void QDeclarativeRadio::tuneUp()
}
/*!
\qmlmethod Radio::start()
\qmlmethod QtMultimedia5::Radio::start()
Starts the radio. If the radio is available, as determined by the \l isAvailable method,
this will result in the \l state becoming \c ActiveState.
@@ -470,7 +471,7 @@ void QDeclarativeRadio::start()
}
/*!
\qmlmethod Radio::stop()
\qmlmethod QtMultimedia5::Radio::stop()
Stops the radio. After calling this method the \l state will be \c StoppedState.
*/
@@ -496,7 +497,7 @@ void QDeclarativeRadio::_q_error(QRadioTuner::Error errorCode)
}
/*!
\qmlsignal Radio::stationFound(int frequency, string stationId)
\qmlsignal QtMultimedia5::Radio::stationFound(int frequency, string stationId)
This signal is emitted when a new radio station is found. This signal is only emitted
if \l searchAllStations is called with \c SearchGetStationId.

15
src/imports/multimedia/qdeclarativeradiodata.cpp
View File

@@ -45,6 +45,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmlclass RadioData QDeclarativeRadioData
\inqmlmodule QtMultimedia 5
\brief The RadioData element allows you to access RDS data from a QML application.
\ingroup multimedia_qml
\inherits Item
@@ -119,7 +120,7 @@ QDeclarativeRadioData::~QDeclarativeRadioData()
}
/*!
\qmlmethod bool RadioData::isAvailable()
\qmlmethod bool QtMultimedia5::RadioData::isAvailable()
Returns whether the radio data element is ready to use.
*/
@@ -129,7 +130,7 @@ bool QDeclarativeRadioData::isAvailable() const
}
/*!
\qmlproperty string RadioData::stationId
\qmlproperty string QtMultimedia5::RadioData::stationId
This property allows you to read the station Id of the currently tuned radio
station.
@@ -140,7 +141,7 @@ QString QDeclarativeRadioData::stationId() const
}
/*!
\qmlproperty enumeration RadioData::programType
\qmlproperty enumeration QtMultimedia5::RadioData::programType
This property holds the type of the currently playing program as transmitted
by the radio station. The value can be any one of the values defined in the
@@ -205,7 +206,7 @@ QDeclarativeRadioData::ProgramType QDeclarativeRadioData::programType() const
}
/*!
\qmlproperty string RadioData::programTypeName
\qmlproperty string QtMultimedia5::RadioData::programTypeName
This property holds a string representation of the \l programType.
*/
@@ -215,7 +216,7 @@ QString QDeclarativeRadioData::programTypeName() const
}
/*!
\qmlproperty string RadioData::stationName
\qmlproperty string QtMultimedia5::RadioData::stationName
This property has the name of the currently tuned radio station.
*/
@@ -225,7 +226,7 @@ QString QDeclarativeRadioData::stationName() const
}
/*!
\qmlproperty string RadioData::radioText
\qmlproperty string QtMultimedia5::RadioData::radioText
This property holds free-text transmitted by the radio station. This is typically used to
show supporting information for the currently playing content, for instance song title or
@@ -237,7 +238,7 @@ QString QDeclarativeRadioData::radioText() const
}
/*!
\qmlproperty bool RadioData::alternativeFrequenciesEnabled
\qmlproperty bool QtMultimedia5::RadioData::alternativeFrequenciesEnabled
This property allows you to specify whether the radio should try and tune to alternative
frequencies if the signal strength of the current station becomes too weak. The alternative

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.

27
src/imports/multimedia/qdeclarativevideooutput.cpp
View File

@@ -123,6 +123,7 @@ private:
\brief The VideoOutput element allows you to render video or camera viewfinder.
\ingroup multimedia_qml
\inqmlmodule QtMultimedia 5
This element is part of the \bold{QtMultimedia 5.0} module.
@@ -201,7 +202,7 @@ QDeclarativeVideoOutput::~QDeclarativeVideoOutput()
}
/*!
\qmlproperty variant VideoOutput::source
\qmlproperty variant QtMultimedia5::VideoOutput::source
This property holds the source item providing the video frames like MediaPlayer or Camera.
@@ -338,7 +339,7 @@ static inline int qNormalizedOrientation(int o)
}
/*!
\qmlproperty enumeration VideoOutput::fillMode
\qmlproperty enumeration QtMultimedia5::VideoOutput::fillMode
Set this property to define how the video is scaled to fit the target area.
@@ -445,7 +446,7 @@ void QDeclarativeVideoOutput::_q_updateGeometry()
emit contentRectChanged();
}
/*!
\qmlproperty int VideoOutput::orientation
\qmlproperty int QtMultimedia5::VideoOutput::orientation
In some cases the source video stream requires a certain
orientation to be correct. This includes
@@ -506,7 +507,7 @@ void QDeclarativeVideoOutput::setOrientation(int orientation)
}
/*!
\qmlproperty rectangle VideoOutput::contentRect
\qmlproperty rectangle QtMultimedia5::VideoOutput::contentRect
This property holds the item coordinates of the area that
would contain video to render. With certain fill modes,
@@ -527,7 +528,7 @@ QRectF QDeclarativeVideoOutput::contentRect() const
}
/*!
\qmlproperty rectangle VideoOutput::sourceRect
\qmlproperty rectangle QtMultimedia5::VideoOutput::sourceRect
This property holds the area of the source video
content that is considered for rendering. The
@@ -550,7 +551,7 @@ QRectF QDeclarativeVideoOutput::sourceRect() const
}
/*!
\qmlmethod mapNormalizedPointToItem
\qmlmethod QtMultimedia5::VideoOutput::mapNormalizedPointToItem
Given normalized coordinates \a point (that is, each
component in the range of 0 to 1.0), return the mapped point
@@ -587,7 +588,7 @@ QPointF QDeclarativeVideoOutput::mapNormalizedPointToItem(const QPointF &point)
}
/*!
\qmlmethod mapNormalizedRectToItem
\qmlmethod QtMultimedia5::VideoOutput::mapNormalizedRectToItem
Given a rectangle \a rectangle in normalized
coordinates (that is, each component in the range of 0 to 1.0),
@@ -604,7 +605,7 @@ QRectF QDeclarativeVideoOutput::mapNormalizedRectToItem(const QRectF &rectangle)
}
/*!
\qmlmethod mapPointToItem
\qmlmethod QtMultimedia5::VideoOutput::mapPointToItem
Given a point \a point in item coordinates, return the
corresponding point in source coordinates. This mapping is
@@ -624,7 +625,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSource(const QPointF &point) const
}
/*!
\qmlmethod mapRectToSource
\qmlmethod QtMultimedia5::VideoOutput::mapRectToSource
Given a rectangle \a rectangle in item coordinates, return the
corresponding rectangle in source coordinates. This mapping is
@@ -642,7 +643,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSource(const QRectF &rectangle) const
}
/*!
\qmlmethod mapPointToItemNormalized
\qmlmethod QtMultimedia5::VideoOutput::mapPointToItemNormalized
Given a point \a point in item coordinates, return the
corresponding point in normalized source coordinates. This mapping is
@@ -677,7 +678,7 @@ QPointF QDeclarativeVideoOutput::mapPointToSourceNormalized(const QPointF &point
}
/*!
\qmlmethod mapRectToSourceNormalized
\qmlmethod QtMultimedia5::VideoOutput::mapRectToSourceNormalized
Given a rectangle \a rectangle in item coordinates, return the
corresponding rectangle in normalized source coordinates. This mapping is
@@ -695,7 +696,7 @@ QRectF QDeclarativeVideoOutput::mapRectToSourceNormalized(const QRectF &rectangl
}
/*!
\qmlmethod mapPointToItem
\qmlmethod QtMultimedia5::VideoOutput::mapPointToItem
Given a point \a point in source coordinates, return the
corresponding point in item coordinates. This mapping is
@@ -718,7 +719,7 @@ QPointF QDeclarativeVideoOutput::mapPointToItem(const QPointF &point) const
}
/*!
\qmlmethod mapRectToItem
\qmlmethod QtMultimedia5::VideoOutput::mapRectToItem
Given a rectangle \a rectangle in source coordinates, return the
corresponding rectangle in item coordinates. This mapping is

33
src/multimedia/audio/qsoundeffect.cpp
View File

@@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE
\inmodule QtMultimedia
\ingroup multimedia_qml
\inqmlmodule QtMultimedia 5
This element is part of the \bold{QtMultimedia 5.0} module.
@@ -74,14 +75,14 @@ QT_BEGIN_NAMESPACE
*/
/*!
\qmlproperty url SoundEffect::source
\qmlproperty url QtMultimedia5::SoundEffect::source
\property QSoundEffect::source
This property provides a way to control the sound to play.
*/
/*!
\qmlproperty int SoundEffect::loops
\qmlproperty int QtMultimedia5::SoundEffect::loops
This property provides a way to control the number of times to repeat the sound on each play().
@@ -96,7 +97,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
\qmlproperty qreal SoundEffect::volume
\qmlproperty qreal QtMultimedia5::SoundEffect::volume
\property QSoundEffect::volume
This property holds the volume of the playback, from 0.0 (silent) to 1.0 (maximum volume).
@@ -104,21 +105,21 @@ QT_BEGIN_NAMESPACE
*/
/*!
\qmlproperty bool SoundEffect::muted
\qmlproperty bool QtMultimedia5::SoundEffect::muted
\property QSoundEffect::muted
This property provides a way to control muting. A value of \c true will mute this effect.
*/
/*!
\qmlproperty bool SoundEffect::playing
\qmlproperty bool QtMultimedia5::SoundEffect::playing
\property QSoundEffect::source
This property indicates if the soundeffect is playing or not.
*/
/*!
\qmlproperty int SoundEffect::status
\qmlproperty int QtMultimedia5::SoundEffect::status
This property indicates the following status of the soundeffect.
@@ -129,55 +130,55 @@ QT_BEGIN_NAMESPACE
*/
/*!
\qmlsignal SoundEffect::sourceChanged()
\qmlsignal QtMultimedia5::SoundEffect::sourceChanged()
\fn void QSoundEffect::sourceChanged()
This handler is called when the source has changed.
*/
/*!
\qmlsignal SoundEffect::loadedChanged()
\qmlsignal QtMultimedia5::SoundEffect::loadedChanged()
\fn void QSoundEffect::loadedChanged()
This handler is called when the loading state has changed.
*/
/*!
\qmlsignal SoundEffect::loopCountChanged()
\qmlsignal QtMultimedia5::SoundEffect::loopCountChanged()
\fn void QSoundEffect::loopCountChanged()
This handler is called when the initial number of loops has changed.
*/
/*!
\qmlsignal SoundEffect::loopsRemainingChanged()
\qmlsignal QtMultimedia5::SoundEffect::loopsRemainingChanged()
\fn void QSoundEffect::loopsRemainingChanged()
This handler is called when the remaining number of loops has changed.
*/
/*!
\qmlsignal SoundEffect::volumeChanged()
\qmlsignal QtMultimedia5::SoundEffect::volumeChanged()
\fn void QSoundEffect::volumeChanged()
This handler is called when the volume has changed.
*/
/*!
\qmlsignal SoundEffect::mutedChanged()
\qmlsignal QtMultimedia5::SoundEffect::mutedChanged()
\fn void QSoundEffect::mutedChanged()
This handler is called when the mute state has changed.
*/
/*!
\qmlsignal SoundEffect::playingChanged()
\qmlsignal QtMultimedia5::SoundEffect::playingChanged()
\fn void QSoundEffect::playingChanged()
This handler is called when the playing property has changed.
*/
/*!
\qmlsignal SoundEffect::statusChanged()
\qmlsignal QtMultimedia5::SoundEffect::statusChanged()
\fn void QSoundEffect::statusChanged()
This handler is called when the status property has changed.
@@ -289,7 +290,7 @@ bool QSoundEffect::isLoaded() const
}
/*!
\qmlmethod SoundEffect::play()
\qmlmethod QtMultimedia5::SoundEffect::play()
Start playback of the sound effect, looping the effect for the number of
times as specified in the loops property.
@@ -326,7 +327,7 @@ QSoundEffect::Status QSoundEffect::status() const
/*!
\qmlmethod SoundEffect::stop()
\qmlmethod QtMultimedia5::SoundEffect::stop()
Stop current playback.
Note that if the backend is PulseAudio, due to the limitation of the underlying API,

26
src/multimediawidgets/qgraphicsvideoitem_maemo6.cpp
View File

@@ -197,7 +197,7 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
}
/*!
/*
\class QGraphicsVideoItem
\brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject.
@@ -228,7 +228,7 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
\sa QMediaObject, QMediaPlayer, QVideoWidget
*/
/*!
/*
Constructs a graphics item that displays video.
The \a parent is passed to QGraphicsItem.
@@ -261,7 +261,7 @@ QGraphicsVideoItem::~QGraphicsVideoItem()
delete d_ptr;
}
/*!
/*
\property QGraphicsVideoItem::mediaObject
\brief the media object which provides the video displayed by a graphics
item.
@@ -272,7 +272,7 @@ QMediaObject *QGraphicsVideoItem::mediaObject() const
return d_func()->mediaObject;
}
/*!
/*
\internal
*/
bool QGraphicsVideoItem::setMediaObject(QMediaObject *object)
@@ -319,7 +319,7 @@ bool QGraphicsVideoItem::setMediaObject(QMediaObject *object)
return false;
}
/*!
/*
\property QGraphicsVideoItem::aspectRatioMode
\brief how a video is scaled to fit the graphics item's size.
*/
@@ -337,7 +337,7 @@ void QGraphicsVideoItem::setAspectRatioMode(Qt::AspectRatioMode mode)
d->updateRects();
}
/*!
/*
\property QGraphicsVideoItem::offset
\brief the video item's offset.
@@ -358,7 +358,7 @@ void QGraphicsVideoItem::setOffset(const QPointF &offset)
d->updateRects();
}
/*!
/*
\property QGraphicsVideoItem::size
\brief the video item's size.
@@ -379,7 +379,7 @@ void QGraphicsVideoItem::setSize(const QSizeF &size)
d->updateRects();
}
/*!
/*
\property QGraphicsVideoItem::nativeSize
\brief the native size of the video.
*/
@@ -389,13 +389,13 @@ QSizeF QGraphicsVideoItem::nativeSize() const
return d_func()->nativeSize;
}
/*!
/*
\fn QGraphicsVideoItem::nativeSizeChanged(const QSizeF &size)
Signals that the native \a size of the video has changed.
*/
/*!
/*
\reimp
*/
QRectF QGraphicsVideoItem::boundingRect() const
@@ -403,7 +403,7 @@ QRectF QGraphicsVideoItem::boundingRect() const
return d_func()->boundingRect;
}
/*!
/*
\reimp
*/
void QGraphicsVideoItem::paint(
@@ -476,7 +476,7 @@ void QGraphicsVideoItem::paint(
}
}
/*!
/*
\reimp
\internal
@@ -486,7 +486,7 @@ QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVarian
return QGraphicsItem::itemChange(change, value);
}
/*!
/*
\internal
*/
void QGraphicsVideoItem::timerEvent(QTimerEvent *event)