6 files changed, 5 insertions, 15 deletions
diff --git a/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
index 3870237ac3..9043ee6361 100644
--- a/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
@@ -49,9 +49,8 @@
 ****************************************************************************/
 
 //! [0]
-QPixmap* pp;
 QPixmap p;
-if ((pp=QPixmapCache::find("my_big_image", pm))) {
+if (QPixmap *pp = QPixmapCache::find("my_big_image"))) {
     p = *pp;
 } else {
     p.load("bigimage.png");
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
index f1f51c0582..138d0dfa1b 100644
--- a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
 //! [3]
 QSize MyWidget::sizeHint() const
 {
-    return QSize(80, 25).expandedTo(QApplication::globalStrut());
+    return QSize(80, 25);
 }
 //! [3]
 
diff --git a/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
index 37fae52778..d1ee6bbdea 100644
--- a/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
@@ -93,9 +93,9 @@ painter2->begin(myWidget); // impossible - only one painter at a time
 //! [4]
 void QPainter::rotate(qreal angle)
 {
-    QMatrix matrix;
+    QTransform matrix;
     matrix.rotate(angle);
-    setWorldMatrix(matrix, true);
+    setWorldTransform(matrix, true);
 }
 //! [4]
 
diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc
index 98d71e9e55..163c0252da 100644
--- a/src/gui/doc/src/paintsystem.qdoc
+++ b/src/gui/doc/src/paintsystem.qdoc
@@ -93,7 +93,6 @@
     \page paintsystem-devices.html
     \title Paint Devices and Backends
 
-    \contentspage The Paint System
     \nextpage Drawing and Filling
 
     \section1 Creating a Paint Device
@@ -185,7 +184,6 @@
     \title Drawing and Filling
 
     \previouspage Paint Devices and Backends
-    \contentspage The Paint System
     \nextpage Coordinate System
 
     \section1 Drawing
@@ -303,7 +301,6 @@
     \title Reading and Writing Image Files
 
     \previouspage Coordinate System
-    \contentspage The Paint System
 
     The most common way to read images is through QImage and QPixmap's
     constructors, or by calling the QImage::load() and QPixmap::load()
diff --git a/src/gui/doc/src/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index 392b6040cb..f8a3ce84aa 100644
--- a/src/gui/doc/src/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -62,7 +62,7 @@
     \include module-use.qdocinc using qt module
     \quotefile overview/using-qt-gui.cmake
 
-    See also the \l[QtDoc]{Build with CMake} overview.
+    See also the \l{Build with CMake} overview.
 
     \section2 Building with qmake
 
diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc
index 1ef34455ab..a963124849 100644
--- a/src/gui/doc/src/richtext.qdoc
+++ b/src/gui/doc/src/richtext.qdoc
@@ -83,7 +83,6 @@
 
 /*!
     \page richtext-structure.html
-    \contentspage richtext.html Contents
     \previouspage Rich Text Processing
     \nextpage The QTextCursor Interface
 
@@ -349,7 +348,6 @@
 
 /*!
     \page richtext-cursor.html
-    \contentspage richtext.html Contents
     \previouspage Rich Text Document Structure
     \nextpage Document Layouts
 
@@ -656,7 +654,6 @@
 
 /*!
     \page richtext-layouts.html
-    \contentspage richtext.html Contents
     \previouspage The QTextCursor Interface
     \nextpage Common Rich Text Editing Tasks
 
@@ -707,7 +704,6 @@
 
     /*!
     \page richtext-common-tasks.html
-    \contentspage richtext.html Contents
     \previouspage Document Layouts
     \nextpage Advanced Rich Text Processing
 
@@ -800,7 +796,6 @@
 
 /*!
     \page richtext-advanced-processing.html
-    \contentspage richtext.html Contents
     \previouspage Common Rich Text Editing Tasks
     \nextpage Supported HTML Subset
 
@@ -849,7 +844,6 @@
     \title Supported HTML Subset
     \brief Describes the support for HTML markup in text widgets.
 
-    \contentspage richtext.html Contents
     \previouspage Common Rich Text Editing Tasks
 
     Qt's text widgets are able to display rich text, specified using a subset of \l {http://www.w3.org/TR/html401/}{HTML 4}