diff options
Diffstat (limited to 'src/multimedia/doc')
-rw-r--r-- | src/multimedia/doc/QtMultimediaDoc | 1 | ||||
-rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 5 | ||||
-rw-r--r-- | src/multimedia/doc/src/multimedia.qdoc | 6 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtaudioengine.qdoc | 10 | ||||
-rw-r--r-- | src/multimedia/doc/src/qtmultimedia5.qdoc | 29 |
5 files changed, 34 insertions, 17 deletions
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..dfafd8715 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtmultimedia.qdocconf) project = QtMultimedia description = Qt Multimedia Documentation @@ -56,9 +57,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/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index 68e8ba31c..ad8273612 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/src/multimedia/doc/src/multimedia.qdoc @@ -181,9 +181,9 @@ import QtMultimedia 5.8 \endcode \annotatedlist multimedia_qml The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}: -\code -import QtAudioEngine 1.1 -\endcode +\qml \QtMinorVersion +import QtAudioEngine 1.\1 +\endqml \annotatedlist multimedia_audioengine \section2 Multimedia Classes diff --git a/src/multimedia/doc/src/qtaudioengine.qdoc b/src/multimedia/doc/src/qtaudioengine.qdoc index bb12489de..c45d4e8af 100644 --- a/src/multimedia/doc/src/qtaudioengine.qdoc +++ b/src/multimedia/doc/src/qtaudioengine.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! -\qmlmodule QtAudioEngine 1.1 +\qmlmodule QtAudioEngine 1.\QtMinorVersion \title Qt Audio Engine QML Types \ingroup qmlmodules \brief Provides QML types for 3D positional audio playback and content management. @@ -36,9 +36,9 @@ Engine provides types for 3D positional audio playback and content management. The QML types can be imported into your application using the following import statement in your .qml file: -\code -import QtAudioEngine 1.1 -\endcode +\qml \QtMinorVersion +import QtAudioEngine 1.\1 +\endqml \section1 Qt Audio Engine Features @@ -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 */ |