summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-09-22 11:50:34 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-22 18:07:57 +0000
commit7fdae2e60130093a8f2ae74704123b579e2e493b (patch)
treed9e0e00bd54a1a6b06e2e7d1e871b1ed787e3115
parent51ab62e82d79b8b13fb031671f15d967dc533d18 (diff)
downloadqtmultimedia-7fdae2e60130093a8f2ae74704123b579e2e493b.tar.gz
Fix documented property types for MediaDevices
Change-Id: I379d6dfacbecf8cbc6698972d16e6a55d471b689 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> (cherry picked from commit dfe779c8ec36324ed17b8d4053bcc723aa260aac) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/qmediadevices.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/multimedia/qmediadevices.cpp b/src/multimedia/qmediadevices.cpp
index 4e7cf3ca3..2d406e1f1 100644
--- a/src/multimedia/qmediadevices.cpp
+++ b/src/multimedia/qmediadevices.cpp
@@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \qmlproperty QtMultimedia::MediaDevices::audioInputs
+ \qmlproperty list<audioDevice> QtMultimedia::MediaDevices::audioInputs
Contains a list of available audio input devices on the system.
Those devices are usually microphones. Devices can be either built-in, or
@@ -151,7 +151,7 @@ QList<QAudioDevice> QMediaDevices::audioInputs()
}
/*!
- \qmlproperty QtMultimedia::MediaDevices::audioOutputs
+ \qmlproperty list<audioDevice> QtMultimedia::MediaDevices::audioOutputs
Contains a list of available audio output devices on the system.
Those devices are usually loudspeakers or head sets. Devices can be either
@@ -170,7 +170,7 @@ QList<QAudioDevice> QMediaDevices::audioOutputs()
}
/*!
- \qmlproperty QtMultimedia::MediaDevices::videoInputs
+ \qmlproperty list<cameraDevice> QtMultimedia::MediaDevices::videoInputs
Contains a list of cameras on the system.
*/
@@ -183,7 +183,7 @@ QList<QCameraDevice> QMediaDevices::videoInputs()
}
/*!
- \qmlproperty QtMultimedia::MediaDevices::defaultAudioInput
+ \qmlproperty audioDevice QtMultimedia::MediaDevices::defaultAudioInput
Returns the default audio input device.
The default device can change during the runtime of the application. The value
@@ -206,7 +206,7 @@ QAudioDevice QMediaDevices::defaultAudioInput()
}
/*!
- \qmlproperty QtMultimedia::MediaDevices::defaultAudioOutput
+ \qmlproperty audioDevice QtMultimedia::MediaDevices::defaultAudioOutput
Returns the default audio output device.
The default device can change during the runtime of the application. The value
@@ -229,7 +229,7 @@ QAudioDevice QMediaDevices::defaultAudioOutput()
}
/*!
- \qmlproperty QtMultimedia::MediaDevices::defaultVideoInput
+ \qmlproperty cameraDevice QtMultimedia::MediaDevices::defaultVideoInput
Returns the default camera on the system.
\note The returned object should be checked using isNull() before being used,