Fix up a few doc issues

* lingering references to Mobility
* missing group tags on some classes meant they went missing
* put classes into functional groups as well (e.g. audio, camera)
* added some of the qdoc files to OTHER_FILES so they show up in Creator

There are still a lot of warnings since it seems like qdoc is not
processing the controls directory.

Change-Id: I036f8826ae63f8273b3e649cb32c091d964ce830
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>

8 files changed, 12 insertions, 2 deletions

diff --git a/src/multimedia/playback/qaudioendpointselector.cpp b/src/multimedia/playback/qaudioendpointselector.cpp
index 0b448f9ef..33ec30b0b 100644
--- a/src/multimedia/playback/qaudioendpointselector.cpp
+++ b/src/multimedia/playback/qaudioendpointselector.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
     \brief The QAudioEndpointSelector class provides an audio endpoint selector media control.
     \inmodule QtMultimedia
     \ingroup multimedia
+    \ingroup multimedia_control
 
     The QAudioEndpointSelector class provides descriptions of the audio
     endpoints available on a system and allows one to be selected as the audio
diff --git a/src/multimedia/playback/qmediacontent.cpp b/src/multimedia/playback/qmediacontent.cpp
index 76e23791f..816acb729 100644
--- a/src/multimedia/playback/qmediacontent.cpp
+++ b/src/multimedia/playback/qmediacontent.cpp
@@ -89,6 +89,7 @@ private:
 
     \inmodule QtMultimedia
     \ingroup multimedia
+    \ingroup multimedia_playback
 
     QMediaContent is used within the multimedia framework as the logical handle
     to media content.  A QMediaContent object is composed of one or more
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index 49f2e1147..58660745c 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -65,8 +65,7 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaPlayer class allows the playing of a media source.
     \inmodule QtMultimedia
     \ingroup multimedia
-
-
+    \ingroup multimedia_playback
 
     The QMediaPlayer class is a high level media playback class. It can be used
     to playback such content as songs, movies and internet radio. The content
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index bc285769a..ff8ec2f98 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
@@ -79,6 +79,7 @@ namespace
     \class QMediaPlaylist
     \inmodule QtMultimedia
     \ingroup multimedia
+    \ingroup multimedia_playback
 
 
     \brief The QMediaPlaylist class provides a list of media content to play.
diff --git a/src/multimedia/playback/qmediaplaylistioplugin.cpp b/src/multimedia/playback/qmediaplaylistioplugin.cpp
index 228a5a753..ce308b18c 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/playback/qmediaplaylistioplugin.cpp
@@ -49,6 +49,9 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaPlaylistReader class provides an interface for reading a playlist file.
     \inmodule QtMultimedia
 
+    \ingroup multimedia
+    \ingroup multimedia_playback
+
     \sa QMediaPlaylistIOPlugin
 */
 
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 85dc68f3c..56bd8819a 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -196,6 +196,7 @@ int QMediaPlaylistNavigatorPrivate::previousItemPos(int steps) const
     \brief The QMediaPlaylistNavigator class provides navigation for a media playlist.
     \inmodule QtMultimedia
     \ingroup multimedia
+    \ingroup multimedia_playback
 
     \sa QMediaPlaylist, QMediaPlaylistProvider
 */
diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp
index fac0eff3a..acca5d618 100644
--- a/src/multimedia/playback/qmediaplaylistprovider.cpp
+++ b/src/multimedia/playback/qmediaplaylistprovider.cpp
@@ -52,6 +52,9 @@ QT_BEGIN_NAMESPACE
     \brief The QMediaPlaylistProvider class provides an abstract list of media.
     \inmodule QtMultimedia
 
+    \ingroup multimedia
+    \ingroup multimedia_playback
+
     \sa QMediaPlaylist
 */
 
diff --git a/src/multimedia/playback/qmediaresource.cpp b/src/multimedia/playback/qmediaresource.cpp
index b6676b052..d66f12dd7 100644
--- a/src/multimedia/playback/qmediaresource.cpp
+++ b/src/multimedia/playback/qmediaresource.cpp
@@ -66,6 +66,7 @@ namespace
     \brief The QMediaResource class provides a description of a media resource.
     \inmodule QtMultimedia
     \ingroup multimedia
+    \ingroup multimedia_playback
 
     A media resource is composed of a \l {url()}{URL} containing the
     location of the resource and a set of properties that describe the