diff --git a/doc/src/demos/deform.qdoc b/doc/src/examples/deform.qdoc
similarity index 94%
rename from doc/src/demos/deform.qdoc
rename to doc/src/examples/deform.qdoc
index 7b11a9a95a4..1a810532481 100644
--- a/doc/src/demos/deform.qdoc
+++ b/doc/src/examples/deform.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/deform
+    \example painting/deform
     \title Vector Deformation
 
-    This demo shows how to use advanced vector techniques to draw text 
+    This example shows how to use advanced vector techniques to draw text
     using a \c QPainterPath.
 
     \image deform-demo.png
diff --git a/doc/src/demos/digiflip.qdoc b/doc/src/examples/digiflip.qdoc
similarity index 92%
rename from doc/src/demos/digiflip.qdoc
rename to doc/src/examples/digiflip.qdoc
index 33f083f9570..ae3b18216b7 100644
--- a/doc/src/demos/digiflip.qdoc
+++ b/doc/src/examples/digiflip.qdoc
@@ -26,6 +26,6 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/digiflip
-    \title Digiflip Demonstration
+    \example embedded/digiflip
+    \title Digiflip
 */
diff --git a/doc/src/demos/embeddeddialogs.qdoc b/doc/src/examples/embeddeddialogs.qdoc
similarity index 96%
rename from doc/src/demos/embeddeddialogs.qdoc
rename to doc/src/examples/embeddeddialogs.qdoc
index e80f76c1139..685bcf8e221 100644
--- a/doc/src/demos/embeddeddialogs.qdoc
+++ b/doc/src/examples/embeddeddialogs.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embeddeddialogs
+    \example graphicsview/embeddeddialogs
     \title Embedded Dialogs
 
     This example shows how to embed standard dialogs into
diff --git a/doc/src/demos/flickable.qdoc b/doc/src/examples/flickable.qdoc
similarity index 92%
rename from doc/src/demos/flickable.qdoc
rename to doc/src/examples/flickable.qdoc
index 540857be966..378bfcaf477 100644
--- a/doc/src/demos/flickable.qdoc
+++ b/doc/src/examples/flickable.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/flickable
-    \title Flickable List Demonstration
+    \example embedded/flickable
+    \title Flickable List
 
     \image flickable-demo.png
 */
diff --git a/doc/src/demos/flightinfo.qdoc b/doc/src/examples/flightinfo.qdoc
similarity index 92%
rename from doc/src/demos/flightinfo.qdoc
rename to doc/src/examples/flightinfo.qdoc
index e812dbff757..f3b5e321978 100644
--- a/doc/src/demos/flightinfo.qdoc
+++ b/doc/src/examples/flightinfo.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/flightinfo
-    \title Flight Info Demonstration
+    \example embedded/flightinfo
+    \title Flight Info
 
     \image flightinfo-demo.png
 */
diff --git a/doc/src/demos/gradients.qdoc b/doc/src/examples/gradients.qdoc
similarity index 94%
rename from doc/src/demos/gradients.qdoc
rename to doc/src/examples/gradients.qdoc
index 1f29a4ae102..430ce3ce872 100644
--- a/doc/src/demos/gradients.qdoc
+++ b/doc/src/examples/gradients.qdoc
@@ -26,10 +26,10 @@
 ****************************************************************************/
 
 /*!
-    \example demos/gradients
+    \example painting/gradients
     \title Gradients
 
-    In this demo we show the various types of gradients that can
+    In this example we show the various types of gradients that can
     be used in Qt.
 
     \image gradients-demo.png
diff --git a/doc/src/demos/lightmaps.qdoc b/doc/src/examples/lightmaps.qdoc
similarity index 92%
rename from doc/src/demos/lightmaps.qdoc
rename to doc/src/examples/lightmaps.qdoc
index a8594f9d9b9..0b5b8079195 100644
--- a/doc/src/demos/lightmaps.qdoc
+++ b/doc/src/examples/lightmaps.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/lightmaps
-    \title Light Maps Demonstration
+    \example embedded/lightmaps
+    \title Light Maps
 
     \image lightmaps-demo.png
 */
diff --git a/doc/src/demos/raycasting.qdoc b/doc/src/examples/raycasting.qdoc
similarity index 92%
rename from doc/src/demos/raycasting.qdoc
rename to doc/src/examples/raycasting.qdoc
index 5c03e2092f6..ae5be0f7072 100644
--- a/doc/src/demos/raycasting.qdoc
+++ b/doc/src/examples/raycasting.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/raycasting
-    \title Ray Casting Demonstration
+    \example embedded/raycasting
+    \title Ray Casting
 
     \image raycasting-demo.png
 */
diff --git a/doc/src/demos/styledemo.qdoc b/doc/src/examples/styledemo.qdoc
similarity index 91%
rename from doc/src/demos/styledemo.qdoc
rename to doc/src/examples/styledemo.qdoc
index 415d2843b77..5a5bb5b47da 100644
--- a/doc/src/demos/styledemo.qdoc
+++ b/doc/src/examples/styledemo.qdoc
@@ -26,8 +26,8 @@
 ****************************************************************************/
 
 /*!
-    \example demos/embedded/styledemo
-    \title Embedded Styles Demonstration
+    \example embedded/styledemo
+    \title Embedded Styles
 
     \image styledemo-demo.png
 */
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 79c4c4e4e48..8599cb1d750 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -1307,7 +1307,7 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
     {coordinate mode} use coordinateMode().
 
 
-    \sa {demos/gradients}{The Gradients Demo}, QBrush
+    \sa {painting/gradients}{The Gradients Example}, QBrush
 */
 
 /*!
@@ -1617,8 +1617,8 @@ bool QGradient::operator==(const QGradient &gradient)
     returns the final stop point of the gradient, and the start()
     function returning the start point of the gradient.
 
-    \sa QRadialGradient, QConicalGradient, {demos/gradients}{The
-    Gradients Demo}
+    \sa QRadialGradient, QConicalGradient, {painting/gradients}{The
+    Gradients Example}
 */
 
 
@@ -1803,8 +1803,8 @@ void QLinearGradient::setFinalStop(const QPointF &stop)
     radius() functions returning the gradient's center, focal point
     and radius respectively.
 
-    \sa QLinearGradient, QConicalGradient, {demos/gradients}{The
-    Gradients Demo}
+    \sa QLinearGradient, QConicalGradient, {painting/gradients}{The
+    Gradients Example}
 */
 
 static QPointF qt_radial_gradient_adapt_focal_point(const QPointF &center,
@@ -2173,8 +2173,8 @@ void QRadialGradient::setFocalPoint(const QPointF &focalPoint)
     gradient can be specified through its radius or final stop points,
     respectively.
 
-    \sa QLinearGradient, QRadialGradient, {demos/gradients}{The
-    Gradients Demo}
+    \sa QLinearGradient, QRadialGradient, {painting/gradients}{The
+    Gradients Example}
 */
 
 
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index b57f6d77d7e..d5a0dd7f40f 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1119,9 +1119,9 @@ void QPainterPrivate::updateState(QPainterState *newState)
     function that draws the outline of the given path (i.e. strokes
     the path).
 
-    See also the \l {demos/deform}{Vector Deformation} demo which
+    See also the \l {painting/deform}{Vector Deformation} example which
     shows how to use advanced vector techniques to draw text using a
-    QPainterPath, the \l {demos/gradients}{Gradients} demo which shows
+    QPainterPath, the \l {painting/gradients}{Gradients} example which shows
     the different types of gradients that are available in Qt, and the \l
     {demos/pathstroke}{Path Stroking} demo which shows Qt's built-in
     dash patterns and shows how custom patterns can be used to extend
@@ -1129,8 +1129,8 @@ void QPainterPrivate::updateState(QPainterState *newState)
 
     \table
     \header
-    \o \l {demos/deform}{Vector Deformation}
-    \o \l {demos/gradients}{Gradients}
+    \o \l {painting/deform}{Vector Deformation}
+    \o \l {painting/gradients}{Gradients}
     \o \l {demos/pathstroke}{Path Stroking}
     \row
     \o \inlineimage qpainter-vectordeformation.png
@@ -3413,7 +3413,7 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
     \endtable
 
     \sa {painting/painterpaths}{the Painter Paths
-    example},{demos/deform}{the Vector Deformation demo}
+    example},{painting/deform}{the Vector Deformation example}
 */
 void QPainter::drawPath(const QPainterPath &path)
 {
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index c2385781993..8bb599f9f07 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -305,19 +305,19 @@ static void qt_debug_path(const QPainterPath &path)
     \section1 Examples
 
     Qt provides the \l {painting/painterpaths}{Painter Paths Example}
-    and the \l {demos/deform}{Vector Deformation Demo} which are
-    located in Qt's example and demo directories respectively.
+    and the \l {painting/deform}{Vector Deformation example} which are
+    located in Qt's example directory.
 
     The \l {painting/painterpaths}{Painter Paths Example} shows how
     painter paths can be used to build complex shapes for rendering
     and lets the user experiment with the filling and stroking.  The
-    \l {demos/deform}{Vector Deformation Demo} shows how to use
+    \l {painting/deform}{Vector Deformation Example} shows how to use
     QPainterPath to draw text.
 
     \table
     \header
     \o \l {painting/painterpaths}{Painter Paths Example}
-    \o \l {demos/deform}{Vector Deformation Demo}
+    \o \l {painting/deform}{Vector Deformation Example}
     \row
     \o \inlineimage qpainterpath-example.png
     \o \inlineimage qpainterpath-demo.png
diff --git a/tests/auto/guiapplauncher/demos.txt b/tests/auto/guiapplauncher/demos.txt
index d2b2e083cde..779089720ed 100644
--- a/tests/auto/guiapplauncher/demos.txt
+++ b/tests/auto/guiapplauncher/demos.txt
@@ -1,6 +1,3 @@
-"Deform Demo", "demos/deform", "deform", 0, -1
-"Embeddeddialogs Demo", "demos/embeddeddialogs", "embeddeddialogs", 0, -1
-"Gradients Demo", "demos/gradients", "gradients", 0, -1
 "Interview Demo", "demos/interview", "interview", 0, -1
 "Mainwindow Demo", "demos/mainwindow", "mainwindow", 0, -1
 "PathStroke Demo", "demos/pathstroke", "pathstroke", 0, -1
diff --git a/tests/auto/guiapplauncher/examples.txt b/tests/auto/guiapplauncher/examples.txt
index 25265714743..08de59f557e 100644
--- a/tests/auto/guiapplauncher/examples.txt
+++ b/tests/auto/guiapplauncher/examples.txt
@@ -20,6 +20,7 @@
 "graphicsview/diagramscene Example", "examples/graphicsview/diagramscene", "diagramscene", 10, -1
 "graphicsview/dragdroprobot Example", "examples/graphicsview/dragdroprobot", "dragdroprobot", 10, -1
 "graphicsview/elasticnodes Example", "examples/graphicsview/elasticnodes", "elasticnodes", 10, -1
+"graphicsview/embeddeddialogs Example", "examples/graphicsview/embeddeddialogs", "embeddeddialogs", 0, -1
 "graphicsview/flowlayout Example", "examples/graphicsview/flowlayout", "flowlayout", 10, -1
 "graphicsview/padnavigator Example", "examples/graphicsview/padnavigator", "padnavigator", 0, -1
 "graphicsview/portedasteroids Example", "examples/graphicsview/portedasteroids", "portedasteroids", 10, -1
@@ -66,7 +67,9 @@
 "painting/basicdrawing Example", "examples/painting/basicdrawing", "basicdrawing", 10, -1
 "painting/composition Example", "examples/painting/composition", "composition", 0, -1
 "painting/concentriccircles Example", "examples/painting/concentriccircles", "concentriccircles", 0, -1
+"painting/deform Example", "examples/painting/deform", "deform", 0, -1
 "painting/fontsampler Example", "examples/painting/fontsampler", "fontsampler", 0, -1
+"painting/gradients Example", "examples/painting/gradients", "gradients", 0, -1
 "painting/imagecomposition Example", "examples/painting/imagecomposition", "imagecomposition", 10, -1
 "painting/painterpaths Example", "examples/painting/painterpaths", "painterpaths", 10, -1
 "painting/transformations Example", "examples/painting/transformations", "transformations", 0, -1