slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.6.0' into 5.6

Browse Source 
Change-Id: I91fb2886b4ab8f0b9e2e28329cec69dfa2cb5435
This commit is contained in:
Frederik Gladhorn
2016-03-17 16:05:28 +01:00
parent b17e0cd5dd 9985224a89
commit 812ab8e6a3
17 changed files with 150 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/doc/src/multimedia.qdoc
View File

@@ -177,12 +177,12 @@ what changed, and what you might need to change when porting code.
\section2 QML Types
The QML types are accessed by using:
\code
import QtMultimedia 5.5
import QtMultimedia 5.6
\endcode
\annotatedlist multimedia_qml
The following types are accessed by using \l{Qt Audio Engine QML Types}{Qt Audio Engine}:
\code
import QtAudioEngine 1.0
import QtAudioEngine 1.1
\endcode
\annotatedlist multimedia_audioengine

4
src/multimedia/doc/src/qtaudioengine.qdoc
View File

@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\qmlmodule QtAudioEngine 1.0
\qmlmodule QtAudioEngine 1.1
\title Qt Audio Engine QML Types
\ingroup qmlmodules
\brief Provides QML types for 3D positional audio playback and content management.
@@ -37,7 +37,7 @@ 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.0
import QtAudioEngine 1.1
\endcode
\section1 Qt Audio Engine Features

2
src/multimedia/doc/src/qtmultimedia-index.qdoc
View File

@@ -54,7 +54,7 @@
import statement in your \c {.qml} file.
\code
import QtMultimedia 5.5
import QtMultimedia 5.6
\endcode
If you intend to use the C++ classes in your application, include the C++

4
src/multimedia/doc/src/qtmultimedia5.qdoc
View File

@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\qmlmodule QtMultimedia 5.5
\qmlmodule QtMultimedia 5.6
\title Qt Multimedia QML Types
\ingroup qmlmodules
\brief Provides QML types for multimedia support.
@@ -42,7 +42,7 @@ The QML types for \l{Qt Multimedia} support the basic use cases such as:
The QML types can be imported into your application using the following import
statement in your .qml file:
\code
import QtMultimedia 5.5
import QtMultimedia 5.6
\endcode
\section1 QML types