12 files changed, 21 insertions, 38 deletions
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp
index a1497bc..bef1738 100644
--- a/src/gui/image/qbitmap.cpp
+++ b/src/gui/image/qbitmap.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \class QBitmap
     \brief The QBitmap class provides monochrome (1-bit depth) pixmaps.
 
-    \ingroup multimedia
+    \ingroup painting
     \ingroup shared
 
     The QBitmap class is a monochrome off-screen paint device used
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 677cc44..5a88e29 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -445,9 +445,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loaderV2,
   \brief The QIcon class provides scalable icons in different modes
   and states.
 
-  \ingroup multimedia
+  \ingroup painting
   \ingroup shared
-  \mainclass
+
 
   A QIcon can generate smaller, larger, active, and disabled pixmaps
   from the set of pixmaps it is given. Such pixmaps are used by Qt
diff --git a/src/gui/image/qiconengine.cpp b/src/gui/image/qiconengine.cpp
index 8e39607..930834d 100644
--- a/src/gui/image/qiconengine.cpp
+++ b/src/gui/image/qiconengine.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
   \brief The QIconEngine class provides an abstract base class for QIcon renderers.
 
-  \ingroup multimedia
+  \ingroup painting
 
   \bold {Use QIconEngineV2 instead.}
 
@@ -144,7 +144,7 @@ void QIconEngine::addFile(const QString &/*fileName*/, const QSize &/*size*/, QI
 
     \brief The QIconEngineV2 class provides an abstract base class for QIcon renderers.
 
-    \ingroup multimedia
+    \ingroup painting
     \since 4.3
 
     An icon engine renders \l{QIcon}s. With icon engines, you can
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 0001e2b..3faca46 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -61,11 +61,7 @@
 
 #include <qhash.h>
 
-#ifdef QT_RASTER_IMAGEENGINE
 #include <private/qpaintengine_raster_p.h>
-#else
-#include <qpaintengine.h>
-#endif
 
 #include <private/qimage_p.h>
 
@@ -337,9 +333,9 @@ bool QImageData::checkForAlphaPixels() const
 /*!
     \class QImage
 
-    \ingroup multimedia
+    \ingroup painting
     \ingroup shared
-    \mainclass
+
     \reentrant
 
     \brief The QImage class provides a hardware-independent image
@@ -5255,11 +5251,10 @@ QPaintEngine *QImage::paintEngine() const
     if (!d)
         return 0;
 
-#ifdef QT_RASTER_IMAGEENGINE
     if (!d->paintEngine) {
         d->paintEngine = new QRasterPaintEngine(const_cast<QImage *>(this));
     }
-#endif
+
     return d->paintEngine;
 }
 
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index 06c8f21..b127de7 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -47,7 +47,7 @@
     for reading images from files or other devices.
 
     \reentrant
-    \ingroup multimedia
+    \ingroup painting
     \ingroup io
 
     The most common way to read images is through QImage and QPixmap's
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index c734169..1f06493 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -45,7 +45,7 @@
     for writing images to files or other devices.
 
     \reentrant
-    \ingroup multimedia
+    \ingroup painting
     \ingroup io
 
     QImageWriter supports setting format specific options, such as the
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index c341e5e..179e6bb 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -45,7 +45,7 @@
     \brief The QMovie class is a convenience class for playing movies
     with QImageReader.
 
-    \ingroup multimedia
+    \ingroup painting
 
     First, create a QMovie object by passing either the name of a file or a
     pointer to a QIODevice containing an animated image format to QMovie's
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index fbc2a5d..7b02dca 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -69,9 +69,9 @@ 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 multimedia
+    \ingroup painting
     \ingroup shared
-    \mainclass
+
 
     A picture serializes painter commands to an IO device in a
     platform-independent format. They are sometimes referred to as meta-files.
@@ -1298,7 +1298,7 @@ QList<QByteArray> QPicture::outputFormats()
     \brief The QPictureIO class contains parameters for loading and
     saving pictures.
 
-    \ingroup multimedia
+    \ingroup painting
     \ingroup io
 
     QPictureIO contains a QIODevice object that is used for picture data
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 81440b3..0fad1c7 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1550,9 +1550,9 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
     \brief The QPixmap class is an off-screen image representation
     that can be used as a paint device.
 
-    \ingroup multimedia
+    \ingroup painting
     \ingroup shared
-    \mainclass
+
 
     Qt provides four classes for handling image data: QImage, QPixmap,
     QBitmap and QPicture. QImage is designed and optimized for I/O,
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp
index 8c911bb..5959da1 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/src/gui/image/qpixmap_mac.cpp
@@ -38,7 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-//#define QT_RASTER_PAINTENGINE
 
 #include "qpixmap.h"
 #include "qimage.h"
@@ -52,9 +51,6 @@
 #include <private/qdrawhelper_p.h>
 #include <private/qpixmap_mac_p.h>
 #include <private/qpixmap_raster_p.h>
-#ifdef QT_RASTER_PAINTENGINE
-#  include <private/qpaintengine_raster_p.h>
-#endif
 #include <private/qpaintengine_mac_p.h>
 #include <private/qt_mac_p.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
@@ -1098,14 +1094,7 @@ QPaintEngine* QMacPixmapData::paintEngine() const
 {
     if (!pengine) {
         QMacPixmapData *that = const_cast<QMacPixmapData*>(this);
-#ifdef QT_RASTER_PAINTENGINE
-        if (qgetenv("QT_MAC_USE_COREGRAPHICS").isNull())
-            that->pengine = new QRasterPaintEngine();
-        else
-            that->pengine = new QCoreGraphicsPaintEngine();
-#else
         that->pengine = new QCoreGraphicsPaintEngine();
-#endif
     }
     return pengine;
 }
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 762c98f..cef5c49 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -51,8 +51,7 @@ QT_BEGIN_NAMESPACE
 
     \brief The QPixmapCache class provides an application-wide cache for pixmaps.
 
-    \ingroup environment
-    \ingroup multimedia
+    \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
diff --git a/src/gui/image/qpixmapfilter.cpp b/src/gui/image/qpixmapfilter.cpp
index aad2f16..e95cf89 100644
--- a/src/gui/image/qpixmapfilter.cpp
+++ b/src/gui/image/qpixmapfilter.cpp
@@ -65,7 +65,7 @@ public:
 /*!
     \class QPixmapFilter
     \since 4.5
-    \ingroup multimedia
+    \ingroup painting
 
     \brief The QPixmapFilter class provides the basic functionality for
     pixmap filter classes. Pixmap filter can be for example colorize or blur.
@@ -175,7 +175,7 @@ QRectF QPixmapFilter::boundingRectFor(const QRectF &rect) const
 /*!
     \class QPixmapConvolutionFilter
     \since 4.5
-    \ingroup multimedia
+    \ingroup painting
 
     \brief The QPixmapConvolutionFilter class provides convolution
     filtering for pixmaps.
@@ -741,7 +741,7 @@ static void grayscale(const QImage &image, QImage &dest, const QRect& rect = QRe
 /*!
     \class QPixmapColorizeFilter
     \since 4.5
-    \ingroup multimedia
+    \ingroup painting
 
     \brief The QPixmapColorizeFilter class provides colorizing
     filtering for pixmaps.
@@ -865,7 +865,7 @@ public:
 /*!
     \class QPixmapDropShadowFilter
     \since 4.5
-    \ingroup multimedia
+    \ingroup painting
 
     \brief The QPixmapDropShadowFilter class is a convenience class
     for drawing pixmaps with drop shadows.