diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:31:24 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:36:13 +0200 |
commit | a2244c9b7aa11e386c3331cbbc36336fb8fea3b9 (patch) | |
tree | a77ac99aa38c40e98aa483795e3cb8061f404203 /src/multimedia/doc/src/qtmultimedia-index.qdoc | |
parent | 31fce88b3fcdbb4d4b2b9a889d24e25c3a5c9507 (diff) | |
parent | 008d20e0ece4c6dac148915b998a0005657d73a1 (diff) | |
download | qtmultimedia-a2244c9b7aa11e386c3331cbbc36336fb8fea3b9.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/imports/multimedia/qdeclarativeaudio.cpp
Change-Id: I57c6252b084e4ed796f6f308b2e0c717d0f59b13
Diffstat (limited to 'src/multimedia/doc/src/qtmultimedia-index.qdoc')
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia-index.qdoc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/multimedia/doc/src/qtmultimedia-index.qdoc b/src/multimedia/doc/src/qtmultimedia-index.qdoc index cf26f6509..0e2750872 100644 --- a/src/multimedia/doc/src/qtmultimedia-index.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-index.qdoc @@ -46,7 +46,7 @@ import statement in your \c {.qml} file. \code - import QtMultimedia 5.4 + import QtMultimedia 5.5 \endcode If you intend to use the C++ classes in your application, include the C++ @@ -105,11 +105,17 @@ \li QAudioOutput \li Sends audio data to an audio output device \row + \li QAudioRecorder + \li Record media content from an audio source. + \row \li QCamera \li Access camera viewfinder. \row \li QCameraImageCapture - \li Record media content. Intended to be used with QCamera to record media. + \li Capture still images with a camera. + \row + \li QMediaRecorder + \li Record media content from a camera or radio tuner source. \row \li QMediaPlayer \li Playback media from a source. @@ -120,8 +126,8 @@ \li QRadioTuner \li Access radio device. \row - \li QVideoRendererControl - \li Control video data. + \li QAbstractVideoSurface + \li Base class for video presentation. \endtable \section1 Related Information |