diff options
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/audio/qaudiobuffer.cpp | 5 | ||||
-rw-r--r-- | src/multimedia/doc/QtMultimediaDoc | 1 | ||||
-rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 4 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtaudioengine.qdoc | 2 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia5.qdoc | 29 |
5 files changed, 26 insertions, 15 deletions
diff --git a/src/multimedia/audio/qaudiobuffer.cpp b/src/multimedia/audio/qaudiobuffer.cpp index f3e7ae670..1e43ebd00 100644 --- a/src/multimedia/audio/qaudiobuffer.cpp +++ b/src/multimedia/audio/qaudiobuffer.cpp @@ -573,35 +573,30 @@ void *QAudioBuffer::data() /*! \typedef QAudioBuffer::S8U - \relates QAudioBuffer::StereoFrame This is a predefined specialization for an unsigned stereo 8 bit sample. Each channel is an \e {unsigned char}. */ /*! \typedef QAudioBuffer::S8S - \relates QAudioBuffer::StereoFrame This is a predefined specialization for a signed stereo 8 bit sample. Each channel is a \e {signed char}. */ /*! \typedef QAudioBuffer::S16U - \relates QAudioBuffer::StereoFrame This is a predefined specialization for an unsigned stereo 16 bit sample. Each channel is an \e {unsigned short}. */ /*! \typedef QAudioBuffer::S16S - \relates QAudioBuffer::StereoFrame This is a predefined specialization for a signed stereo 16 bit sample. Each channel is a \e {signed short}. */ /*! \typedef QAudioBuffer::S32F - \relates QAudioBuffer::StereoFrame This is a predefined specialization for an 32 bit float sample. Each channel is a \e float. diff --git a/src/multimedia/doc/QtMultimediaDoc b/src/multimedia/doc/QtMultimediaDoc index 5723c2a78..e57c3595b 100644 --- a/src/multimedia/doc/QtMultimediaDoc +++ b/src/multimedia/doc/QtMultimediaDoc @@ -1,3 +1,2 @@ #include <QtMultimedia/QtMultimedia> #include <QtMultimediaWidgets/QtMultimediaWidgets> -#include "../gsttools_headers/qgstutils_p.h" diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index b547db762..256ad261e 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -56,9 +56,9 @@ imagedirs += src/images \ sourcedirs += ../.. -#excludedirs += ../../multimediawidgets +excludedirs += ../../gsttools -depends += qtcore qtdoc qtgui qtquick qtqml qtwidgets +depends += qtcore qtdoc qtgui qtquick qtqml qtwidgets qtnetwork navigation.landingpage = "Qt Multimedia" navigation.cppclassespage = "Qt Multimedia C++ Classes" diff --git a/src/multimedia/doc/src/qtaudioengine.qdoc b/src/multimedia/doc/src/qtaudioengine.qdoc index bf8be899e..c45d4e8af 100644 --- a/src/multimedia/doc/src/qtaudioengine.qdoc +++ b/src/multimedia/doc/src/qtaudioengine.qdoc @@ -55,5 +55,5 @@ SoundInstance for easier QML bindings. \li \l {AudioEngine Example}{Audio Engine} \endlist -\section1 QML types +\section1 QML Types */ diff --git a/src/multimedia/doc/src/qtmultimedia5.qdoc b/src/multimedia/doc/src/qtmultimedia5.qdoc index aec3d99d0..a2aaa1a80 100644 --- a/src/multimedia/doc/src/qtmultimedia5.qdoc +++ b/src/multimedia/doc/src/qtmultimedia5.qdoc @@ -39,11 +39,28 @@ The QML types for \l{Qt Multimedia} support the basic use cases such as: \li and access camera settings. \endlist -The QML types can be imported into your application using the following import -statement in your .qml file: -\code -import QtMultimedia 5.8 -\endcode +\section1 QML Types -\section1 QML types +Qt Multimedia QML types can be imported into your application using the +following import statement in your .qml file: + +\qml \QtMinorVersion +import QtMultimedia 5.\1 +\endqml + +\generatelist qmltypesbymodule QtMultimedia + +\section2 Qt Audio Engine + +\l {QtAudioEngine}{Qt Audio Engine} provides types for 3D positional audio +playback and content management. These types can be imported into your +application using the following import statement in your .qml file: + +\qml \QtMinorVersion +import QtAudioEngine 1.\1 +\endqml + +\generatelist qmltypesbymodule QtAudioEngine + +\noautolist */ |