diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2014-06-27 14:49:13 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2014-07-01 13:10:14 +0200 |
| commit | c9b47933501604cf2ec779bd767ff5dd6a33fcb0 (patch) | |
| tree | 8f54472825ab60c9aa45beee17c0c35c27f9289d | |
| parent | c8b88cd02752fb623f65dc3fe930d60fc00fd15d (diff) | |
| download | qtmultimedia-c9b47933501604cf2ec779bd767ff5dd6a33fcb0.tar.gz | |
Doc: link errors
Task-number: QTBUG-34749
Change-Id: I1d107a8700e03ac550fd6611d80a985a36558b22
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | examples/multimedia/video/doc/src/qmlvideofx.qdoc | 3 | ||||
| -rw-r--r-- | src/multimedia/doc/src/multimediabackend.qdoc | 2 | ||||
| -rw-r--r-- | src/multimedia/doc/src/qtmultimedia-cpp.qdoc | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/examples/multimedia/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc index edbd369c0..b24114084 100644 --- a/examples/multimedia/video/doc/src/qmlvideofx.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc @@ -181,8 +181,7 @@ that the divider should be displayed. The main.qml file shows a \l{video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen}, which allows -the user to select the input source and an -\l{video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel} +the user to select the input source and an EffectSelectionPanel item, which lists each of the available shader effects. As described above, a \l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the appropriate input and effect type. A 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}. */ |