diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:14:36 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:14:36 +0200 |
| commit | 074bd6ab37bbbb4dbba188921783fd98be872555 (patch) | |
| tree | 318284e5ce86569c6d0c9c37d143b6f63781eede /src/multimedia | |
| parent | 4ba4f1a51db14c1df20b27cc375255077f051819 (diff) | |
| parent | 8da61153c9b4e505b6f8a0e7a6c630690516d845 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I38ebcb3da0e4d2acc9e7108c9579ea98323864e0
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/doc/src/multimediabackend.qdoc | 2 | ||||
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-cpp.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/doc/src/multimediabackend.qdoc b/src/multimedia/doc/src/multimediabackend.qdoc index 68159d340..ff35090da 100644 --- a/src/multimedia/doc/src/multimediabackend.qdoc +++ b/src/multimedia/doc/src/multimediabackend.qdoc @@ -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. diff --git a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc index b67163efe..06f9e771b 100644 --- a/src/multimedia/doc/src/qtmultimedia-cpp.qdoc +++ b/src/multimedia/doc/src/qtmultimedia-cpp.qdoc @@ -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}. */ |