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

Merge remote-tracking branch 'origin/5.3' into dev

Browse Source 
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
This commit is contained in:
Frederik Gladhorn
2014-07-10 10:14:36 +02:00
parent 4ba4f1a51d 8da61153c9
commit 074bd6ab37
15 changed files with 110 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/doc/src/multimediabackend.qdoc
View File

@@ -71,7 +71,7 @@ classes derived from them.
Consider a developer creating, for example, a media player class called MyPlayer.
It may have special requirements beyond ordinary media players and so may
need a custom service and a custom control. We can subclass \l QMediaServiceProvider
need a custom service and a custom control. We can subclass QMediaServiceProvider
to create our MyServiceProvider class. Also we will create a
MyMediaService, and the MyMediaControl to manipulate the media service.

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

@@ -38,5 +38,5 @@
QML alternatives. If your application is serving complex use cases such as
decoding media files, accessing video or audio buffers, use the C++
alternative. For more details about the complex audio, video, and camera use
cases supported by the C++ classes, refer to \l {Qt Multimedia Overview}.
cases supported by the C++ classes, refer to \l {Multimedia}{Multimedia Overview}.
*/