summaryrefslogtreecommitdiffstats
path: root/src/multimediawidgets
diff options
context:
space:
mode:
authorMichael Goddard <michael.goddard@nokia.com>2012-02-06 15:49:54 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-06 07:45:05 +0100
commitc0fd63d143e798203f1108824e7a7c6a3ea6e0e2 (patch)
treed6e2d1298e5bdbd535ef9f475a856a70a19e4707 /src/multimediawidgets
parent51ca5582c2475ea91fe2d86793f000f7bed41f51 (diff)
Documentation tweaks.
Mostly move widgets classes into the QtMultimediaWidgets module, but also mark a few mostly internal playlist classes as \internal. A few other tweaks. Change-Id: If0e376410bf2187cafb24f583108c6beb7b910a9 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r--src/multimediawidgets/qcameraviewfinder.cpp2
-rw-r--r--src/multimediawidgets/qgraphicsvideoitem.cpp2
-rw-r--r--src/multimediawidgets/qvideowidget.cpp4
-rw-r--r--src/multimediawidgets/qvideowidgetcontrol.cpp2
-rw-r--r--src/multimediawidgets/qvideowindowcontrol.cpp2
5 files changed, 5 insertions, 7 deletions
diff --git a/src/multimediawidgets/qcameraviewfinder.cpp b/src/multimediawidgets/qcameraviewfinder.cpp
index 92d1ccb6c..341bd79f0 100644
--- a/src/multimediawidgets/qcameraviewfinder.cpp
+++ b/src/multimediawidgets/qcameraviewfinder.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
\brief The QCameraViewfinder class provides a camera viewfinder widget.
- \inmodule QtMultimedia
+ \inmodule QtMultimediaWidgets
\ingroup camera
\snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 97df9f5cd..304767a85 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -173,7 +173,7 @@ void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
\brief The QGraphicsVideoItem class provides a graphics item which display video produced by a QMediaObject.
- \inmodule QtMultimedia
+ \inmodule QtMultimediaWidgets
\ingroup multimedia
Attaching a QGraphicsVideoItem to a QMediaObject allows it to display
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index c7a66d645..22d459857 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -584,9 +584,7 @@ void QVideoWidgetPrivate::_q_dimensionsChanged()
\brief The QVideoWidget class provides a widget which presents video
produced by a media object.
\ingroup multimedia
- \inmodule QtMultimedia
-
- \inmodule QtMultimedia
+ \inmodule QtMultimediaWidgets
Attaching a QVideoWidget to a QMediaObject allows it to display the
video or image output of that media object. A QVideoWidget is attached
diff --git a/src/multimediawidgets/qvideowidgetcontrol.cpp b/src/multimediawidgets/qvideowidgetcontrol.cpp
index bb0ff7110..0b98b8695 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.cpp
+++ b/src/multimediawidgets/qvideowidgetcontrol.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
\brief The QVideoWidgetControl class provides a media control which
implements a video widget.
- \inmodule QtMultimedia
+ \inmodule QtMultimediaWidgets
\ingroup multimedia-serv
The videoWidget() property of QVideoWidgetControl provides a pointer to a
diff --git a/src/multimediawidgets/qvideowindowcontrol.cpp b/src/multimediawidgets/qvideowindowcontrol.cpp
index 3f3ea06c3..3c56096cd 100644
--- a/src/multimediawidgets/qvideowindowcontrol.cpp
+++ b/src/multimediawidgets/qvideowindowcontrol.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
/*!
\class QVideoWindowControl
- \inmodule QtMultimedia
+ \inmodule QtMultimediaWidgets
\ingroup multimedia-serv
\brief The QVideoWindowControl class provides a media control for rendering video to a window.