summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Bennett <nicholas.bennett@qt.io>2022-05-09 16:05:21 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-13 09:35:18 +0000
commitba91807003b49f61e65a4958241ab4699a1c2fbb (patch)
treed7f0bd78e695248c54c5aaef19cb97d58ce5f695
parentbce1fd6773634859764700451c36de3eff7f27ce (diff)
Docs: Fix broken links
The muted and volume properties belong to the AudioOutput qml type, not the MediaPlayer type, so these were fixed. Added qtquickcontrols module dependency to qdoc project. Task-number: QTBUG-102306 Change-Id: Iac447482c27a10a2cdba204739f753ccecd88289 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit e4fb343f897718beee106e72df13b5063d71d402) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc7
-rw-r--r--src/multimedia/doc/qtmultimedia.qdocconf2
2 files changed, 5 insertions, 4 deletions
diff --git a/examples/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc b/examples/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc
index 9ddf91bc3..56cf91596 100644
--- a/examples/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc
+++ b/examples/multimedia/video/mediaplayer/doc/src/mediaplayer.qdoc
@@ -168,7 +168,7 @@
\youtube sf_yv01UtIw
Defined in \c PlaybackSeekControl.qml, this component comprises of an item
- with a Text, \c mediaTime, and \l{Slider}, \c mediaSlider, in a RowLayout.
+ with a Text, \c mediaTime, and \l[QML]{Slider}, \c mediaSlider, in a RowLayout.
\c mediaTime uses MediaPlayer's \l{MediaPlayer::position}{position} property
like so:
@@ -194,8 +194,9 @@
\section2 Audio control
\image audio-control.gif
This type is defined in \c AudioControl.qml, and utilizes the
- \l{MediaPlayer::muted}{muted} and \l{MediaPlayer::volume}{volume} properties
- of MediaPlayer.
+ \l{AudioOutput::muted}{muted} and \l{AudioOutput::volume}{volume} properties
+ of the AudioOutput instantiated within the MediaPlayer, which is
+ instantiated in \c{main.qml}.
\quotefromfile multimedia/video/mediaplayer/AudioControl.qml
\skipto required
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index c75716620..f93091179 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -62,7 +62,7 @@ sourcedirs += ../..
excludedirs += ../../gsttools
-depends += qtcore qtdoc qtgui qtquick qtqml qtwidgets qtnetwork qmake qtcmake
+depends += qtcore qtdoc qtgui qtquick qtqml qtwidgets qtnetwork qmake qtcmake qtquickcontrols
# Ignore \since commands for versions earlier than 6.3
ignoresince = 6.3