Get started with patching up the Qt GUI docs

Primary goal, make the front page of the Qt GUI module a bit more
clarifying and avoid downstream references inside the Qt GUI docs.

Change-Id: Icbcfbb64b93963add889bf83711daa9575885c02
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

9 files changed, 12 insertions, 5 deletions

diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index 837e5d0cd8..59756d8693 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -52,6 +52,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QBitmap
+    \inmodule QtGui
     \brief The QBitmap class provides monochrome (1-bit depth) pixmaps.
 
     \ingroup painting
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 0b330107f6..8536e59440 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -266,6 +266,7 @@ bool QImageData::checkForAlphaPixels() const
 /*!
     \class QImage
 
+    \inmodule QtGui
     \ingroup painting
     \ingroup shared
 
diff --git a/src/gui/image/qimageiohandler.cpp b/src/gui/image/qimageiohandler.cpp
index 9a82056053..fcf2dd499a 100644
--- a/src/gui/image/qimageiohandler.cpp
+++ b/src/gui/image/qimageiohandler.cpp
@@ -44,6 +44,7 @@
     \brief The QImageIOHandler class defines the common image I/O
     interface for all image formats in Qt.
     \reentrant
+    \inmodule QtGui
 
     Qt uses QImageIOHandler for reading and writing images through
     QImageReader and QImageWriter. You can also derive from this class
@@ -160,6 +161,7 @@
 
 /*!
     \class QImageIOPlugin
+    \inmodule QtGui
     \brief The QImageIOPlugin class defines an interface for writing
     an image format plugin.
     \reentrant
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 9052187426..67a23dfaff 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -46,6 +46,7 @@
     \brief The QImageReader class provides a format independent interface
     for reading images from files or other devices.
 
+    \inmodule QtGui
     \reentrant
     \ingroup painting
     \ingroup io
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index c1b7a6459a..ba647b76f5 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -44,6 +44,7 @@
     \brief The QImageWriter class provides a format independent interface
     for writing images to files or other devices.
 
+    \inmodule QtGui
     \reentrant
     \ingroup painting
     \ingroup io
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index e1ddcf1a0c..8d3c6d3e1d 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -42,11 +42,11 @@
 /*! 
     \class QMovie
 
+    \inmodule QtGui
+
     \brief The QMovie class is a convenience class for playing movies
     with QImageReader.
 
-    \ingroup painting
-
     This class is used to show simple animations without sound. If you want
     to display video and media content, use the \l{Phonon Module}{Phonon}
     multimedia framework instead.
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index eaf8f8fb1e..47a483a7ce 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -71,7 +71,7 @@ void qt_format_text(const QFont &fnt, const QRectF &_r,
     \brief The QPicture class is a paint device that records and
     replays QPainter commands.
 
-    \ingroup painting
+    \inmodule QtGui
     \ingroup shared
 
 
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 4cdf61138c..183c13698a 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1192,6 +1192,7 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
 
 /*!
     \class QPixmap
+    \inmodule QtGui
 
     \brief The QPixmap class is an off-screen image representation
     that can be used as a paint device.
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index b0e5b7e1e3..f6c3a8866c 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -49,11 +49,10 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \class QPixmapCache
+    \inmodule QtGui
 
     \brief The QPixmapCache class provides an application-wide cache for pixmaps.
 
-    \ingroup painting
-
     This class is a tool for optimized drawing with QPixmap. You can
     use it to store temporary pixmaps that are expensive to generate
     without using more storage space than cacheLimit(). Use insert()
@@ -97,6 +96,7 @@ static int cache_limit = 10240; // 10 MB cache limit for desktop
     \class QPixmapCache::Key
     \brief The QPixmapCache::Key class can be used for efficient access
     to the QPixmapCache.
+    \inmodule QtGui
     \since 4.6
 
     Use QPixmapCache::insert() to receive an instance of Key generated