summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-09-22 10:39:45 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-22 18:07:50 +0000
commit51ab62e82d79b8b13fb031671f15d967dc533d18 (patch)
tree5f7f8e307dd8821f7e5ee14909077546585466dc
parentd7f9a029de26d58b53ecac1cd11fdfe45effb162 (diff)
downloadqtmultimedia-51ab62e82d79b8b13fb031671f15d967dc533d18.tar.gz
Minor doc fixes for the QML MediaPlayer
Give the proper QML element as the return type, not the C++ type. Change-Id: I6436bc8c9e3433c4e0df6d978ff1378971c5d736 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit b21f76f377bcebe143e0ff878c09b40ef74f8672) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/playback/qmediaplayer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 2bf388f3a..f46ed261a 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -632,7 +632,7 @@ void QMediaPlayer::setSourceDevice(QIODevice *device, const QUrl &sourceUrl)
}
/*!
- \qmlproperty QAudioOutput* QtMultimedia::MediaPlayer::audioOutput
+ \qmlproperty AudioOutput QtMultimedia::MediaPlayer::audioOutput
This property holds the target audio output.
Accepts one AudioOutput elements.
@@ -852,7 +852,7 @@ void QMediaPlayer::setActiveSubtitleTrack(int index)
}
/*!
- \qmlproperty QObject* QtMultimedia::MediaPlayer::videoOutput
+ \qmlproperty VideoOutput QtMultimedia::MediaPlayer::videoOutput
This property holds the target video output.
Accepts one VideoOutput elements.