summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVenugopal Shivashankar <Venugopal.Shivashankar@qt.io>2022-09-29 14:07:37 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-10-07 12:33:23 +0000
commit386217e753a080c8d863a37a4df02a4247feed5c (patch)
tree0593ac50ce7518a4eb0f7df604e3bbf78b1c2334
parente920f72ebdefd976de9071a933ca19e5fd68a455 (diff)
Doc: Fix undocumented members warning in the widget API
Change-Id: Ibcf3c3385ba00a2bd4f1c89811906be6437dc56f Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit d20bdbb041948737df13934418b8a3ec4979fc9b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/doc/qtmultimedia.qdocconf2
-rw-r--r--src/multimediawidgets/qgraphicsvideoitem.cpp18
-rw-r--r--src/multimediawidgets/qvideowidget.cpp8
3 files changed, 26 insertions, 2 deletions
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf
index ede949fc9..02fab4485 100644
--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/src/multimedia/doc/qtmultimedia.qdocconf
@@ -6,7 +6,7 @@ project = QtMultimedia
description = Qt Multimedia Documentation
version = $QT_VERSION
-moduleheader = QtMultimedia
+moduleheader = QtMultimediaDoc
includepaths += .
examplesinstallpath = multimedia
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 1dae17b8b..c82c2da3c 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -220,6 +220,22 @@ void QGraphicsVideoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
}
/*!
+ \fn int QGraphicsVideoItem::type() const
+ \reimp
+
+ Returns an int representing the type of the video item.
+*/
+/*!
+ \variable QGraphicsVideoItem::d_ptr
+ \internal
+*/
+/*!
+ \enum QGraphicsVideoItem::anonymous
+ \internal
+
+ \omitvalue Type
+*/
+/*!
\reimp
\internal
@@ -240,3 +256,5 @@ void QGraphicsVideoItem::timerEvent(QTimerEvent *event)
QT_END_NAMESPACE
#include "moc_qgraphicsvideoitem.cpp"
+
+
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index d71996ec5..1b8c41980 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -49,7 +49,10 @@ QT_BEGIN_NAMESPACE
\sa QCamera, QMediaPlayer, QGraphicsVideoItem
*/
-
+/*!
+ \variable QVideoWidget::d_ptr
+ \internal
+*/
/*!
Constructs a new video widget.
@@ -78,6 +81,9 @@ QVideoWidget::~QVideoWidget()
delete d_ptr;
}
+/*!
+ Returns the QVideoSink instance.
+*/
QVideoSink *QVideoWidget::videoSink() const
{
return d_ptr->videoWindow->videoSink();