Doc: Modularize QtGui documentation.

This change moves the snippets and images to the modularized
directories.

Change-Id: I5f86f598fbe7c47d632c613b85d94ced89ba2c29
Reviewed-by: Marius Storm-Olsen <[email protected]>

221 files changed, 249 insertions, 157 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 02318468bb3..6f1d505a4e4 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -460,7 +460,7 @@ static void qAccessibleCleanup()
     This is a typedef for a pointer to a function with the following
     signature:
 
-    \snippet doc/src/snippets/code/src_gui_accessible_qaccessible.cpp 1
+    \snippet code/src_gui_accessible_qaccessible.cpp 1
 
     The function receives a QString and a QObject pointer, where the
     QString is the key identifying the interface. The QObject is used
diff --git a/doc/src/images/brush-outline.png b/src/gui/doc/images/brush-outline.png
index f560c9faf57..f560c9faf57 100644
--- a/doc/src/images/brush-outline.png
+++ b/src/gui/doc/images/brush-outline.png
diff --git a/src/gui/doc/images/brush-styles.png b/src/gui/doc/images/brush-styles.png
new file mode 100644
index 00000000000..eecb006af14
--- /dev/null
+++ b/src/gui/doc/images/brush-styles.png
diff --git a/doc/src/images/coordinatesystem-analogclock.png b/src/gui/doc/images/coordinatesystem-analogclock.png
index 16e3091b773..16e3091b773 100644
--- a/doc/src/images/coordinatesystem-analogclock.png
+++ b/src/gui/doc/images/coordinatesystem-analogclock.png
diff --git a/doc/src/images/coordinatesystem-line-antialias.png b/src/gui/doc/images/coordinatesystem-line-antialias.png
index 90dfa8730e4..90dfa8730e4 100644
--- a/doc/src/images/coordinatesystem-line-antialias.png
+++ b/src/gui/doc/images/coordinatesystem-line-antialias.png
diff --git a/doc/src/images/coordinatesystem-line-raster.png b/src/gui/doc/images/coordinatesystem-line-raster.png
index 65201bde9f6..65201bde9f6 100644
--- a/doc/src/images/coordinatesystem-line-raster.png
+++ b/src/gui/doc/images/coordinatesystem-line-raster.png
diff --git a/doc/src/images/coordinatesystem-line.png b/src/gui/doc/images/coordinatesystem-line.png
index fbf68730842..fbf68730842 100644
--- a/doc/src/images/coordinatesystem-line.png
+++ b/src/gui/doc/images/coordinatesystem-line.png
diff --git a/doc/src/images/coordinatesystem-rect-antialias.png b/src/gui/doc/images/coordinatesystem-rect-antialias.png
index 162e1df9cbd..162e1df9cbd 100644
--- a/doc/src/images/coordinatesystem-rect-antialias.png
+++ b/src/gui/doc/images/coordinatesystem-rect-antialias.png
diff --git a/doc/src/images/coordinatesystem-rect-raster.png b/src/gui/doc/images/coordinatesystem-rect-raster.png
index be3690d6ad2..be3690d6ad2 100644
--- a/doc/src/images/coordinatesystem-rect-raster.png
+++ b/src/gui/doc/images/coordinatesystem-rect-raster.png
diff --git a/doc/src/images/coordinatesystem-rect.png b/src/gui/doc/images/coordinatesystem-rect.png
index 76c06befd67..76c06befd67 100644
--- a/doc/src/images/coordinatesystem-rect.png
+++ b/src/gui/doc/images/coordinatesystem-rect.png
diff --git a/doc/src/images/coordinatesystem-transformations.png b/src/gui/doc/images/coordinatesystem-transformations.png
index 2736213c072..2736213c072 100644
--- a/doc/src/images/coordinatesystem-transformations.png
+++ b/src/gui/doc/images/coordinatesystem-transformations.png
diff --git a/src/gui/doc/images/cursor-arrow.png b/src/gui/doc/images/cursor-arrow.png
new file mode 100644
index 00000000000..a69ef4eb615
--- /dev/null
+++ b/src/gui/doc/images/cursor-arrow.png
diff --git a/src/gui/doc/images/cursor-busy.png b/src/gui/doc/images/cursor-busy.png
new file mode 100644
index 00000000000..53717e49928
--- /dev/null
+++ b/src/gui/doc/images/cursor-busy.png
diff --git a/src/gui/doc/images/cursor-closedhand.png b/src/gui/doc/images/cursor-closedhand.png
new file mode 100644
index 00000000000..b78dd1dac5a
--- /dev/null
+++ b/src/gui/doc/images/cursor-closedhand.png
diff --git a/src/gui/doc/images/cursor-cross.png b/src/gui/doc/images/cursor-cross.png
new file mode 100644
index 00000000000..fe38e744805
--- /dev/null
+++ b/src/gui/doc/images/cursor-cross.png
diff --git a/src/gui/doc/images/cursor-forbidden.png b/src/gui/doc/images/cursor-forbidden.png
new file mode 100644
index 00000000000..2b08c4e2a3c
--- /dev/null
+++ b/src/gui/doc/images/cursor-forbidden.png
diff --git a/src/gui/doc/images/cursor-hand.png b/src/gui/doc/images/cursor-hand.png
new file mode 100644
index 00000000000..d2004aefa73
--- /dev/null
+++ b/src/gui/doc/images/cursor-hand.png
diff --git a/src/gui/doc/images/cursor-hsplit.png b/src/gui/doc/images/cursor-hsplit.png
new file mode 100644
index 00000000000..a5667e3ffba
--- /dev/null
+++ b/src/gui/doc/images/cursor-hsplit.png
diff --git a/src/gui/doc/images/cursor-ibeam.png b/src/gui/doc/images/cursor-ibeam.png
new file mode 100644
index 00000000000..097fc5fa728
--- /dev/null
+++ b/src/gui/doc/images/cursor-ibeam.png
diff --git a/src/gui/doc/images/cursor-openhand.png b/src/gui/doc/images/cursor-openhand.png
new file mode 100644
index 00000000000..9181c859eda
--- /dev/null
+++ b/src/gui/doc/images/cursor-openhand.png
diff --git a/src/gui/doc/images/cursor-sizeall.png b/src/gui/doc/images/cursor-sizeall.png
new file mode 100644
index 00000000000..69f13eb347a
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizeall.png
diff --git a/src/gui/doc/images/cursor-sizeb.png b/src/gui/doc/images/cursor-sizeb.png
new file mode 100644
index 00000000000..f37d7b91e8c
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizeb.png
diff --git a/src/gui/doc/images/cursor-sizef.png b/src/gui/doc/images/cursor-sizef.png
new file mode 100644
index 00000000000..3b127a05d34
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizef.png
diff --git a/src/gui/doc/images/cursor-sizeh.png b/src/gui/doc/images/cursor-sizeh.png
new file mode 100644
index 00000000000..a9f40cbc3d7
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizeh.png
diff --git a/src/gui/doc/images/cursor-sizev.png b/src/gui/doc/images/cursor-sizev.png
new file mode 100644
index 00000000000..1edbab27a5b
--- /dev/null
+++ b/src/gui/doc/images/cursor-sizev.png
diff --git a/src/gui/doc/images/cursor-uparrow.png b/src/gui/doc/images/cursor-uparrow.png
new file mode 100644
index 00000000000..d3e70ef4c24
--- /dev/null
+++ b/src/gui/doc/images/cursor-uparrow.png
diff --git a/src/gui/doc/images/cursor-vsplit.png b/src/gui/doc/images/cursor-vsplit.png
new file mode 100644
index 00000000000..1beda2570e4
--- /dev/null
+++ b/src/gui/doc/images/cursor-vsplit.png
diff --git a/src/gui/doc/images/cursor-wait.png b/src/gui/doc/images/cursor-wait.png
new file mode 100644
index 00000000000..69056c479e9
--- /dev/null
+++ b/src/gui/doc/images/cursor-wait.png
diff --git a/src/gui/doc/images/cursor-whatsthis.png b/src/gui/doc/images/cursor-whatsthis.png
new file mode 100644
index 00000000000..b47601c3780
--- /dev/null
+++ b/src/gui/doc/images/cursor-whatsthis.png
diff --git a/doc/src/images/hoverevents.png b/src/gui/doc/images/hoverevents.png
index ccc079bdf16..ccc079bdf16 100644
--- a/doc/src/images/hoverevents.png
+++ b/src/gui/doc/images/hoverevents.png
diff --git a/doc/src/images/paintsystem-antialiasing.png b/src/gui/doc/images/paintsystem-antialiasing.png
index 1275841b932..1275841b932 100644
--- a/doc/src/images/paintsystem-antialiasing.png
+++ b/src/gui/doc/images/paintsystem-antialiasing.png
diff --git a/doc/src/images/paintsystem-core.png b/src/gui/doc/images/paintsystem-core.png
index 7d6a8e591bb..7d6a8e591bb 100644
--- a/doc/src/images/paintsystem-core.png
+++ b/src/gui/doc/images/paintsystem-core.png
diff --git a/doc/src/images/paintsystem-devices.png b/src/gui/doc/images/paintsystem-devices.png
index 7b81b7cbb8a..7b81b7cbb8a 100644
--- a/doc/src/images/paintsystem-devices.png
+++ b/src/gui/doc/images/paintsystem-devices.png
diff --git a/doc/src/images/paintsystem-fancygradient.png b/src/gui/doc/images/paintsystem-fancygradient.png
index 701df29e423..701df29e423 100644
--- a/doc/src/images/paintsystem-fancygradient.png
+++ b/src/gui/doc/images/paintsystem-fancygradient.png
diff --git a/doc/src/images/paintsystem-gradients.png b/src/gui/doc/images/paintsystem-gradients.png
index 50b2ed3671f..50b2ed3671f 100644
--- a/doc/src/images/paintsystem-gradients.png
+++ b/src/gui/doc/images/paintsystem-gradients.png
diff --git a/doc/src/images/paintsystem-icon.png b/src/gui/doc/images/paintsystem-icon.png
index 4623db0761b..4623db0761b 100644
--- a/doc/src/images/paintsystem-icon.png
+++ b/src/gui/doc/images/paintsystem-icon.png
diff --git a/doc/src/images/paintsystem-movie.png b/src/gui/doc/images/paintsystem-movie.png
index 992ea9edd4c..992ea9edd4c 100644
--- a/doc/src/images/paintsystem-movie.png
+++ b/src/gui/doc/images/paintsystem-movie.png
diff --git a/doc/src/images/paintsystem-painterpath.png b/src/gui/doc/images/paintsystem-painterpath.png
index f8154f26344..f8154f26344 100644
--- a/doc/src/images/paintsystem-painterpath.png
+++ b/src/gui/doc/images/paintsystem-painterpath.png
diff --git a/doc/src/images/paintsystem-stylepainter.png b/src/gui/doc/images/paintsystem-stylepainter.png
index a67c6c5afc3..a67c6c5afc3 100644
--- a/doc/src/images/paintsystem-stylepainter.png
+++ b/src/gui/doc/images/paintsystem-stylepainter.png
diff --git a/doc/src/images/paintsystem-svg.png b/src/gui/doc/images/paintsystem-svg.png
index ecc8ef8f972..ecc8ef8f972 100644
--- a/doc/src/images/paintsystem-svg.png
+++ b/src/gui/doc/images/paintsystem-svg.png
diff --git a/doc/src/images/qcolor-cmyk.png b/src/gui/doc/images/qcolor-cmyk.png
index dfe8f67a310..dfe8f67a310 100644
--- a/doc/src/images/qcolor-cmyk.png
+++ b/src/gui/doc/images/qcolor-cmyk.png
diff --git a/doc/src/images/qcolor-hsv.png b/src/gui/doc/images/qcolor-hsv.png
index 49fdf77222e..49fdf77222e 100644
--- a/doc/src/images/qcolor-hsv.png
+++ b/src/gui/doc/images/qcolor-hsv.png
diff --git a/doc/src/images/qcolor-hue.png b/src/gui/doc/images/qcolor-hue.png
index 144b27c87a1..144b27c87a1 100644
--- a/doc/src/images/qcolor-hue.png
+++ b/src/gui/doc/images/qcolor-hue.png
diff --git a/doc/src/images/qcolor-rgb.png b/src/gui/doc/images/qcolor-rgb.png
index fea4c63fd73..fea4c63fd73 100644
--- a/doc/src/images/qcolor-rgb.png
+++ b/src/gui/doc/images/qcolor-rgb.png
diff --git a/doc/src/images/qcolor-saturation.png b/src/gui/doc/images/qcolor-saturation.png
index f28776aff5e..f28776aff5e 100644
--- a/doc/src/images/qcolor-saturation.png
+++ b/src/gui/doc/images/qcolor-saturation.png
diff --git a/doc/src/images/qcolor-value.png b/src/gui/doc/images/qcolor-value.png
index 0e069123a9f..0e069123a9f 100644
--- a/doc/src/images/qcolor-value.png
+++ b/src/gui/doc/images/qcolor-value.png
diff --git a/doc/src/images/qconicalgradient.png b/src/gui/doc/images/qconicalgradient.png
index 82603066fb9..82603066fb9 100644
--- a/doc/src/images/qconicalgradient.png
+++ b/src/gui/doc/images/qconicalgradient.png
diff --git a/doc/src/images/qgradient-conical.png b/src/gui/doc/images/qgradient-conical.png
index cf06b70db6c..cf06b70db6c 100644
--- a/doc/src/images/qgradient-conical.png
+++ b/src/gui/doc/images/qgradient-conical.png
diff --git a/doc/src/images/qgradient-linear.png b/src/gui/doc/images/qgradient-linear.png
index 5a5e880de74..5a5e880de74 100644
--- a/doc/src/images/qgradient-linear.png
+++ b/src/gui/doc/images/qgradient-linear.png
diff --git a/doc/src/images/qgradient-radial.png b/src/gui/doc/images/qgradient-radial.png
index 95b9e9c3c9c..95b9e9c3c9c 100644
--- a/doc/src/images/qgradient-radial.png
+++ b/src/gui/doc/images/qgradient-radial.png
diff --git a/doc/src/images/qimage-32bit_scaled.png b/src/gui/doc/images/qimage-32bit_scaled.png
index 6932327456f..6932327456f 100644
--- a/doc/src/images/qimage-32bit_scaled.png
+++ b/src/gui/doc/images/qimage-32bit_scaled.png
diff --git a/doc/src/images/qimage-8bit_scaled.png b/src/gui/doc/images/qimage-8bit_scaled.png
index 7cbf0f1e298..7cbf0f1e298 100644
--- a/doc/src/images/qimage-8bit_scaled.png
+++ b/src/gui/doc/images/qimage-8bit_scaled.png
diff --git a/src/gui/doc/images/qimage-scaling.png b/src/gui/doc/images/qimage-scaling.png
new file mode 100644
index 00000000000..fcd71448f00
--- /dev/null
+++ b/src/gui/doc/images/qimage-scaling.png
diff --git a/doc/src/images/qlineargradient-pad.png b/src/gui/doc/images/qlineargradient-pad.png
index d77eb3dc3db..d77eb3dc3db 100644
--- a/doc/src/images/qlineargradient-pad.png
+++ b/src/gui/doc/images/qlineargradient-pad.png
diff --git a/doc/src/images/qlineargradient-reflect.png b/src/gui/doc/images/qlineargradient-reflect.png
index dd12665051f..dd12665051f 100644
--- a/doc/src/images/qlineargradient-reflect.png
+++ b/src/gui/doc/images/qlineargradient-reflect.png
diff --git a/doc/src/images/qlineargradient-repeat.png b/src/gui/doc/images/qlineargradient-repeat.png
index e38203c438a..e38203c438a 100644
--- a/doc/src/images/qlineargradient-repeat.png
+++ b/src/gui/doc/images/qlineargradient-repeat.png
diff --git a/doc/src/images/qmatrix-combinedtransformation.png b/src/gui/doc/images/qmatrix-combinedtransformation.png
index f791bfa917d..f791bfa917d 100644
--- a/doc/src/images/qmatrix-combinedtransformation.png
+++ b/src/gui/doc/images/qmatrix-combinedtransformation.png
diff --git a/doc/src/images/qmatrix-representation.png b/src/gui/doc/images/qmatrix-representation.png
index 2e3efd33fc7..2e3efd33fc7 100644
--- a/doc/src/images/qmatrix-representation.png
+++ b/src/gui/doc/images/qmatrix-representation.png
diff --git a/doc/src/images/qmatrix-simpletransformation.png b/src/gui/doc/images/qmatrix-simpletransformation.png
index dde8f4bc580..dde8f4bc580 100644
--- a/doc/src/images/qmatrix-simpletransformation.png
+++ b/src/gui/doc/images/qmatrix-simpletransformation.png
diff --git a/doc/src/images/qpainter-affinetransformations.png b/src/gui/doc/images/qpainter-affinetransformations.png
index fe2f9a072b1..fe2f9a072b1 100644
--- a/doc/src/images/qpainter-affinetransformations.png
+++ b/src/gui/doc/images/qpainter-affinetransformations.png
diff --git a/doc/src/images/qpainter-arc.png b/src/gui/doc/images/qpainter-arc.png
index 8cb9cec96b3..8cb9cec96b3 100644
--- a/doc/src/images/qpainter-arc.png
+++ b/src/gui/doc/images/qpainter-arc.png
diff --git a/doc/src/images/qpainter-basicdrawing.png b/src/gui/doc/images/qpainter-basicdrawing.png
index 3be48c87374..3be48c87374 100644
--- a/doc/src/images/qpainter-basicdrawing.png
+++ b/src/gui/doc/images/qpainter-basicdrawing.png
diff --git a/doc/src/images/qpainter-chord.png b/src/gui/doc/images/qpainter-chord.png
index a8090861a0d..a8090861a0d 100644
--- a/doc/src/images/qpainter-chord.png
+++ b/src/gui/doc/images/qpainter-chord.png
diff --git a/doc/src/images/qpainter-clock.png b/src/gui/doc/images/qpainter-clock.png
index 36347541617..36347541617 100644
--- a/doc/src/images/qpainter-clock.png
+++ b/src/gui/doc/images/qpainter-clock.png
diff --git a/doc/src/images/qpainter-compositiondemo.png b/src/gui/doc/images/qpainter-compositiondemo.png
index 40f62c75bee..40f62c75bee 100644
--- a/doc/src/images/qpainter-compositiondemo.png
+++ b/src/gui/doc/images/qpainter-compositiondemo.png
diff --git a/doc/src/images/qpainter-compositionmode1.png b/src/gui/doc/images/qpainter-compositionmode1.png
index 67530935212..67530935212 100644
--- a/doc/src/images/qpainter-compositionmode1.png
+++ b/src/gui/doc/images/qpainter-compositionmode1.png
diff --git a/doc/src/images/qpainter-compositionmode2.png b/src/gui/doc/images/qpainter-compositionmode2.png
index fc05afbd8c8..fc05afbd8c8 100644
--- a/doc/src/images/qpainter-compositionmode2.png
+++ b/src/gui/doc/images/qpainter-compositionmode2.png
diff --git a/doc/src/images/qpainter-concentriccircles.png b/src/gui/doc/images/qpainter-concentriccircles.png
index 4889dcd76d3..4889dcd76d3 100644
--- a/doc/src/images/qpainter-concentriccircles.png
+++ b/src/gui/doc/images/qpainter-concentriccircles.png
diff --git a/doc/src/images/qpainter-ellipse.png b/src/gui/doc/images/qpainter-ellipse.png
index e7e78c3dac6..e7e78c3dac6 100644
--- a/doc/src/images/qpainter-ellipse.png
+++ b/src/gui/doc/images/qpainter-ellipse.png
diff --git a/doc/src/images/qpainter-gradients.png b/src/gui/doc/images/qpainter-gradients.png
index b7bc6a32706..b7bc6a32706 100644
--- a/doc/src/images/qpainter-gradients.png
+++ b/src/gui/doc/images/qpainter-gradients.png
diff --git a/doc/src/images/qpainter-line.png b/src/gui/doc/images/qpainter-line.png
index 5f1cd97effd..5f1cd97effd 100644
--- a/doc/src/images/qpainter-line.png
+++ b/src/gui/doc/images/qpainter-line.png
diff --git a/doc/src/images/qpainter-painterpaths.png b/src/gui/doc/images/qpainter-painterpaths.png
index 0762ca93f32..0762ca93f32 100644
--- a/doc/src/images/qpainter-painterpaths.png
+++ b/src/gui/doc/images/qpainter-painterpaths.png
diff --git a/doc/src/images/qpainter-path.png b/src/gui/doc/images/qpainter-path.png
index 3570b16d7a1..3570b16d7a1 100644
--- a/doc/src/images/qpainter-path.png
+++ b/src/gui/doc/images/qpainter-path.png
diff --git a/doc/src/images/qpainter-pathstroking.png b/src/gui/doc/images/qpainter-pathstroking.png
index ab73c6ae015..ab73c6ae015 100644
--- a/doc/src/images/qpainter-pathstroking.png
+++ b/src/gui/doc/images/qpainter-pathstroking.png
diff --git a/doc/src/images/qpainter-pie.png b/src/gui/doc/images/qpainter-pie.png
index 78039013e01..78039013e01 100644
--- a/doc/src/images/qpainter-pie.png
+++ b/src/gui/doc/images/qpainter-pie.png
diff --git a/doc/src/images/qpainter-polygon.png b/src/gui/doc/images/qpainter-polygon.png
index 3b6ea3c797b..3b6ea3c797b 100644
--- a/doc/src/images/qpainter-polygon.png
+++ b/src/gui/doc/images/qpainter-polygon.png
diff --git a/doc/src/images/qpainter-rectangle.png b/src/gui/doc/images/qpainter-rectangle.png
index 05fdc883002..05fdc883002 100644
--- a/doc/src/images/qpainter-rectangle.png
+++ b/src/gui/doc/images/qpainter-rectangle.png
diff --git a/doc/src/images/qpainter-rotation.png b/src/gui/doc/images/qpainter-rotation.png
index 6e24a0e040d..6e24a0e040d 100644
--- a/doc/src/images/qpainter-rotation.png
+++ b/src/gui/doc/images/qpainter-rotation.png
diff --git a/doc/src/images/qpainter-roundrect.png b/src/gui/doc/images/qpainter-roundrect.png
index 876a2778119..876a2778119 100644
--- a/doc/src/images/qpainter-roundrect.png
+++ b/src/gui/doc/images/qpainter-roundrect.png
diff --git a/doc/src/images/qpainter-scale.png b/src/gui/doc/images/qpainter-scale.png
index 4fe582eb134..4fe582eb134 100644
--- a/doc/src/images/qpainter-scale.png
+++ b/src/gui/doc/images/qpainter-scale.png
diff --git a/doc/src/images/qpainter-text.png b/src/gui/doc/images/qpainter-text.png
index e95c965d7bd..e95c965d7bd 100644
--- a/doc/src/images/qpainter-text.png
+++ b/src/gui/doc/images/qpainter-text.png
diff --git a/doc/src/images/qpainter-translation.png b/src/gui/doc/images/qpainter-translation.png
index b3716ca3f64..b3716ca3f64 100644
--- a/doc/src/images/qpainter-translation.png
+++ b/src/gui/doc/images/qpainter-translation.png
diff --git a/doc/src/images/qpainter-vectordeformation.png b/src/gui/doc/images/qpainter-vectordeformation.png
index aff95f404cc..aff95f404cc 100644
--- a/doc/src/images/qpainter-vectordeformation.png
+++ b/src/gui/doc/images/qpainter-vectordeformation.png
diff --git a/doc/src/images/qpainterpath-addellipse.png b/src/gui/doc/images/qpainterpath-addellipse.png
index 98f85174ef8..98f85174ef8 100644
--- a/doc/src/images/qpainterpath-addellipse.png
+++ b/src/gui/doc/images/qpainterpath-addellipse.png
diff --git a/doc/src/images/qpainterpath-addpolygon.png b/src/gui/doc/images/qpainterpath-addpolygon.png
index d36bde8adad..d36bde8adad 100644
--- a/doc/src/images/qpainterpath-addpolygon.png
+++ b/src/gui/doc/images/qpainterpath-addpolygon.png
diff --git a/doc/src/images/qpainterpath-addrectangle.png b/src/gui/doc/images/qpainterpath-addrectangle.png
index be9283e46df..be9283e46df 100644
--- a/doc/src/images/qpainterpath-addrectangle.png
+++ b/src/gui/doc/images/qpainterpath-addrectangle.png
diff --git a/doc/src/images/qpainterpath-addtext.png b/src/gui/doc/images/qpainterpath-addtext.png
index 803a9581aca..803a9581aca 100644
--- a/doc/src/images/qpainterpath-addtext.png
+++ b/src/gui/doc/images/qpainterpath-addtext.png
diff --git a/doc/src/images/qpainterpath-arcto.png b/src/gui/doc/images/qpainterpath-arcto.png
index fe60b08d317..fe60b08d317 100644
--- a/doc/src/images/qpainterpath-arcto.png
+++ b/src/gui/doc/images/qpainterpath-arcto.png
diff --git a/doc/src/images/qpainterpath-construction.png b/src/gui/doc/images/qpainterpath-construction.png
index 4beeba1dd8a..4beeba1dd8a 100644
--- a/doc/src/images/qpainterpath-construction.png
+++ b/src/gui/doc/images/qpainterpath-construction.png
diff --git a/doc/src/images/qpainterpath-cubicto.png b/src/gui/doc/images/qpainterpath-cubicto.png
index 465bfeca296..465bfeca296 100644
--- a/doc/src/images/qpainterpath-cubicto.png
+++ b/src/gui/doc/images/qpainterpath-cubicto.png
diff --git a/doc/src/images/qpainterpath-demo.png b/src/gui/doc/images/qpainterpath-demo.png
index ceeed2f170a..ceeed2f170a 100644
--- a/doc/src/images/qpainterpath-demo.png
+++ b/src/gui/doc/images/qpainterpath-demo.png
diff --git a/doc/src/images/qpainterpath-example.png b/src/gui/doc/images/qpainterpath-example.png
index f2bd359aba6..f2bd359aba6 100644
--- a/doc/src/images/qpainterpath-example.png
+++ b/src/gui/doc/images/qpainterpath-example.png
diff --git a/src/gui/doc/images/qpen-bevel.png b/src/gui/doc/images/qpen-bevel.png
new file mode 100644
index 00000000000..8a30779e3b2
--- /dev/null
+++ b/src/gui/doc/images/qpen-bevel.png
diff --git a/src/gui/doc/images/qpen-custom.png b/src/gui/doc/images/qpen-custom.png
new file mode 100644
index 00000000000..a2a038abe09
--- /dev/null
+++ b/src/gui/doc/images/qpen-custom.png
diff --git a/src/gui/doc/images/qpen-dash.png b/src/gui/doc/images/qpen-dash.png
new file mode 100644
index 00000000000..67082c37587
--- /dev/null
+++ b/src/gui/doc/images/qpen-dash.png
diff --git a/src/gui/doc/images/qpen-dashdot.png b/src/gui/doc/images/qpen-dashdot.png
new file mode 100644
index 00000000000..64b384660f7
--- /dev/null
+++ b/src/gui/doc/images/qpen-dashdot.png
diff --git a/src/gui/doc/images/qpen-dashdotdot.png b/src/gui/doc/images/qpen-dashdotdot.png
new file mode 100644
index 00000000000..ff1b2e69cd1
--- /dev/null
+++ b/src/gui/doc/images/qpen-dashdotdot.png
diff --git a/doc/src/images/qpen-dashpattern.png b/src/gui/doc/images/qpen-dashpattern.png
index e33cf58d491..e33cf58d491 100644
--- a/doc/src/images/qpen-dashpattern.png
+++ b/src/gui/doc/images/qpen-dashpattern.png
diff --git a/doc/src/images/qpen-demo.png b/src/gui/doc/images/qpen-demo.png
index 3ea51088028..3ea51088028 100644
--- a/doc/src/images/qpen-demo.png
+++ b/src/gui/doc/images/qpen-demo.png
diff --git a/src/gui/doc/images/qpen-dot.png b/src/gui/doc/images/qpen-dot.png
new file mode 100644
index 00000000000..54e81c94698
--- /dev/null
+++ b/src/gui/doc/images/qpen-dot.png
diff --git a/src/gui/doc/images/qpen-flat.png b/src/gui/doc/images/qpen-flat.png
new file mode 100644
index 00000000000..06e2195f733
--- /dev/null
+++ b/src/gui/doc/images/qpen-flat.png
diff --git a/src/gui/doc/images/qpen-miter.png b/src/gui/doc/images/qpen-miter.png
new file mode 100644
index 00000000000..025e0039799
--- /dev/null
+++ b/src/gui/doc/images/qpen-miter.png
diff --git a/doc/src/images/qpen-miterlimit.png b/src/gui/doc/images/qpen-miterlimit.png
index 17a90725fbf..17a90725fbf 100644
--- a/doc/src/images/qpen-miterlimit.png
+++ b/src/gui/doc/images/qpen-miterlimit.png
diff --git a/src/gui/doc/images/qpen-roundcap.png b/src/gui/doc/images/qpen-roundcap.png
new file mode 100644
index 00000000000..77b22b2babd
--- /dev/null
+++ b/src/gui/doc/images/qpen-roundcap.png
diff --git a/src/gui/doc/images/qpen-roundjoin.png b/src/gui/doc/images/qpen-roundjoin.png
new file mode 100644
index 00000000000..155e2aa8cc5
--- /dev/null
+++ b/src/gui/doc/images/qpen-roundjoin.png
diff --git a/src/gui/doc/images/qpen-solid.png b/src/gui/doc/images/qpen-solid.png
new file mode 100644
index 00000000000..e042b18017e
--- /dev/null
+++ b/src/gui/doc/images/qpen-solid.png
diff --git a/src/gui/doc/images/qpen-square.png b/src/gui/doc/images/qpen-square.png
new file mode 100644
index 00000000000..ebc5d1e329c
--- /dev/null
+++ b/src/gui/doc/images/qpen-square.png
diff --git a/doc/src/images/qradialgradient-pad.png b/src/gui/doc/images/qradialgradient-pad.png
index 6c1a6cb268a..6c1a6cb268a 100644
--- a/doc/src/images/qradialgradient-pad.png
+++ b/src/gui/doc/images/qradialgradient-pad.png
diff --git a/doc/src/images/qradialgradient-reflect.png b/src/gui/doc/images/qradialgradient-reflect.png
index 5122b180b1f..5122b180b1f 100644
--- a/doc/src/images/qradialgradient-reflect.png
+++ b/src/gui/doc/images/qradialgradient-reflect.png
diff --git a/doc/src/images/qradialgradient-repeat.png b/src/gui/doc/images/qradialgradient-repeat.png
index aa639b7779d..aa639b7779d 100644
--- a/doc/src/images/qradialgradient-repeat.png
+++ b/src/gui/doc/images/qradialgradient-repeat.png
diff --git a/doc/src/images/qstatustipevent-action.png b/src/gui/doc/images/qstatustipevent-action.png
index c5dcfd25f55..c5dcfd25f55 100644
--- a/doc/src/images/qstatustipevent-action.png
+++ b/src/gui/doc/images/qstatustipevent-action.png
diff --git a/doc/src/images/qstatustipevent-widget.png b/src/gui/doc/images/qstatustipevent-widget.png
index 3cc0a1f01b0..3cc0a1f01b0 100644
--- a/doc/src/images/qstatustipevent-widget.png
+++ b/src/gui/doc/images/qstatustipevent-widget.png
diff --git a/doc/src/images/qt-fillrule-oddeven.png b/src/gui/doc/images/qt-fillrule-oddeven.png
index f39d1056f54..f39d1056f54 100644
--- a/doc/src/images/qt-fillrule-oddeven.png
+++ b/src/gui/doc/images/qt-fillrule-oddeven.png
diff --git a/doc/src/images/qt-fillrule-winding.png b/src/gui/doc/images/qt-fillrule-winding.png
index 80182483314..80182483314 100644
--- a/doc/src/images/qt-fillrule-winding.png
+++ b/src/gui/doc/images/qt-fillrule-winding.png
diff --git a/doc/src/images/qtexttableformat-cell.png b/src/gui/doc/images/qtexttableformat-cell.png
index bbf85ffe465..bbf85ffe465 100644
--- a/doc/src/images/qtexttableformat-cell.png
+++ b/src/gui/doc/images/qtexttableformat-cell.png
diff --git a/doc/src/images/qtransform-combinedtransformation.png b/src/gui/doc/images/qtransform-combinedtransformation.png
index df1e2267464..df1e2267464 100644
--- a/doc/src/images/qtransform-combinedtransformation.png
+++ b/src/gui/doc/images/qtransform-combinedtransformation.png
diff --git a/doc/src/images/qtransform-combinedtransformation2.png b/src/gui/doc/images/qtransform-combinedtransformation2.png
index c037a0d5654..c037a0d5654 100644
--- a/doc/src/images/qtransform-combinedtransformation2.png
+++ b/src/gui/doc/images/qtransform-combinedtransformation2.png
diff --git a/doc/src/images/qtransform-representation.png b/src/gui/doc/images/qtransform-representation.png
index 883d5dc4872..883d5dc4872 100644
--- a/doc/src/images/qtransform-representation.png
+++ b/src/gui/doc/images/qtransform-representation.png
diff --git a/doc/src/images/qtransform-simpletransformation.png b/src/gui/doc/images/qtransform-simpletransformation.png
index 743e4e3e076..743e4e3e076 100644
--- a/doc/src/images/qtransform-simpletransformation.png
+++ b/src/gui/doc/images/qtransform-simpletransformation.png
diff --git a/doc/src/images/texttable-merge.png b/src/gui/doc/images/texttable-merge.png
index 3b32239a428..3b32239a428 100644
--- a/doc/src/images/texttable-merge.png
+++ b/src/gui/doc/images/texttable-merge.png
diff --git a/doc/src/images/texttable-split.png b/src/gui/doc/images/texttable-split.png
index 2fa17b85a32..2fa17b85a32 100644
--- a/doc/src/images/texttable-split.png
+++ b/src/gui/doc/images/texttable-split.png
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
new file mode 100644
index 00000000000..85772bbc3ea
--- /dev/null
+++ b/src/gui/doc/qtgui.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project                 = QtGui
+description             = Qt GUI Reference Documentation
+url                     = http://qt-project.org/doc/qt-5.0/qtgui
+version                 = 5.0.0
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = en_US
+qhp.projects            = QtGui
+
+qhp.QtGui.file         = qtgui.qhp
+qhp.QtGui.namespace           = org.qt-project.qtgui.500
+qhp.QtGui.virtualFolder       = qdoc
+qhp.QtGui.indexTitle          = Qt GUI Reference Documentation
+qhp.QtGui.indexRoot           =
+
+qhp.QtGui.filterAttributes    = qtgui 5.0.0 qtrefdoc
+qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.0
+qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.0
+qhp.QtGui.subprojects         = classes overviews examples
+qhp.QtGui.subprojects.classes.title = Classes
+qhp.QtGui.subprojects.classes.indexTitle = Qt GUI's Classes
+qhp.QtGui.subprojects.classes.selectors = class fake:headerfile
+qhp.QtGui.subprojects.classes.sortPages = true
+qhp.QtGui.subprojects.overviews.title = Overviews
+qhp.QtGui.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtGui.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtGui.subprojects.examples.title = Qt GUI Examples
+qhp.QtGui.subprojects.examples.indexTitle = Qt GUI Examples
+qhp.QtGui.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author      = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher   = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir               = ../../../doc/qtgui
+tagfile                 = ../../../doc/qtgui/qtgui.tags
+
+HTML.generatemacrefs    = "true"
+HTML.nobreadcrumbs      = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+    "</head>\n" \
+
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT_NO_EGL \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          QT_DEPRECATED_* \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus \
+                          Q_COMPILER_INITIALIZER_LISTS
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
+
+depends                 += qtcore
+
+headerdirs  += ..
+
+sourcedirs  += ..
+
+exampledirs += ../../../examples \
+               ../ \
+               snippets
+
+imagedirs   += images
diff --git a/doc/src/snippets/brush/brush.cpp b/src/gui/doc/snippets/brush/brush.cpp
index a92223ee939..a92223ee939 100644
--- a/doc/src/snippets/brush/brush.cpp
+++ b/src/gui/doc/snippets/brush/brush.cpp
diff --git a/doc/src/snippets/brush/gradientcreationsnippet.cpp b/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
index 9ec8c3f07a0..9ec8c3f07a0 100644
--- a/doc/src/snippets/brush/gradientcreationsnippet.cpp
+++ b/src/gui/doc/snippets/brush/gradientcreationsnippet.cpp
diff --git a/doc/src/snippets/code/doc_src_qtgui.pro b/src/gui/doc/snippets/code/doc_src_qtgui.pro
index 51bb6c74ff5..51bb6c74ff5 100644
--- a/doc/src/snippets/code/doc_src_qtgui.pro
+++ b/src/gui/doc/snippets/code/doc_src_qtgui.pro
diff --git a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp b/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
index f12f55051e0..f12f55051e0 100644
--- a/doc/src/snippets/code/src_gui_accessible_qaccessible.cpp
+++ b/src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qimage.cpp b/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
index 0c39e22eb64..0c39e22eb64 100644
--- a/doc/src/snippets/code/src_gui_image_qimage.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimage.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qimagereader.cpp b/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
index 92f528e6c0d..92f528e6c0d 100644
--- a/doc/src/snippets/code/src_gui_image_qimagereader.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qimagewriter.cpp b/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
index d0f11929d3b..d0f11929d3b 100644
--- a/doc/src/snippets/code/src_gui_image_qimagewriter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qmovie.cpp b/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
index 5d57d19204e..5d57d19204e 100644
--- a/doc/src/snippets/code/src_gui_image_qmovie.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qmovie.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qpixmap.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
index b8c0fcfbd53..b8c0fcfbd53 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmap.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
index 9d42f6b330a..9d42f6b330a 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmapcache.cpp
+++ b/src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
index b32e8c3f398..b32e8c3f398 100644
--- a/doc/src/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication_x11.cpp
index 1d37765e3c3..1d37765e3c3 100644
--- a/doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication_x11.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
index 4cf8f33c02e..4cf8f33c02e 100644
--- a/doc/src/snippets/code/src_gui_kernel_qclipboard.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qevent.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
index d8bdeebe849..d8bdeebe849 100644
--- a/doc/src/snippets/code/src_gui_kernel_qevent.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
index 79dc967cf3f..79dc967cf3f 100644
--- a/doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
index d761e31d3d3..d761e31d3d3 100644
--- a/doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp
+++ b/src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qbrush.cpp b/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
index 8678c48d62a..8678c48d62a 100644
--- a/doc/src/snippets/code/src_gui_painting_qbrush.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qcolor.cpp b/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
index 8954fed6042..8954fed6042 100644
--- a/doc/src/snippets/code/src_gui_painting_qcolor.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qmatrix.cpp b/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
index d4e1b57b3cf..d4e1b57b3cf 100644
--- a/doc/src/snippets/code/src_gui_painting_qmatrix.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
index 8caffa46f4f..8caffa46f4f 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
index b23f8cea238..b23f8cea238 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainterpath.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qpen.cpp b/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
index 4da729b88d1..4da729b88d1 100644
--- a/doc/src/snippets/code/src_gui_painting_qpen.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qpen.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qregion.cpp b/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
index 8f334c5695f..8f334c5695f 100644
--- a/doc/src/snippets/code/src_gui_painting_qregion.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qregion.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp b/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
index 63b9de19d15..63b9de19d15 100644
--- a/doc/src/snippets/code/src_gui_painting_qregion_unix.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qtransform.cpp b/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
index f54e0a07ca4..f54e0a07ca4 100644
--- a/doc/src/snippets/code/src_gui_painting_qtransform.cpp
+++ b/src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp
diff --git a/doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp b/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
index 637527036fa..637527036fa 100644
--- a/doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp
+++ b/src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qfont.cpp b/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
index fab550cbc7c..fab550cbc7c 100644
--- a/doc/src/snippets/code/src_gui_text_qfont.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qfont.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp b/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
index b864b4ddcc8..b864b4ddcc8 100644
--- a/doc/src/snippets/code/src_gui_text_qfontmetrics.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp b/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
index 3fb6b35bb94..3fb6b35bb94 100644
--- a/doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qtextcursor.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
index 7954f66cbdd..7954f66cbdd 100644
--- a/doc/src/snippets/code/src_gui_text_qtextcursor.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
index 23ebf8b2d23..23ebf8b2d23 100644
--- a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp
diff --git a/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
index 59ef46c422b..59ef46c422b 100644
--- a/doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp
diff --git a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp b/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
index c8e1d2e0102..c8e1d2e0102 100644
--- a/doc/src/snippets/code/src_gui_text_qtextlayout.cpp
+++ b/src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp
diff --git a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp b/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
index 0b4739841b8..0b4739841b8 100644
--- a/doc/src/snippets/code/src_gui_util_qdesktopservices.cpp
+++ b/src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp b/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
index 2f769c5860d..2f769c5860d 100644
--- a/doc/src/snippets/code/src_gui_widgets_qvalidator.cpp
+++ b/src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp
diff --git a/doc/src/snippets/dragging/mainwindow.cpp b/src/gui/doc/snippets/dragging/mainwindow.cpp
index 57f1abc22dc..57f1abc22dc 100644
--- a/doc/src/snippets/dragging/mainwindow.cpp
+++ b/src/gui/doc/snippets/dragging/mainwindow.cpp
diff --git a/doc/src/snippets/droparea.cpp b/src/gui/doc/snippets/droparea.cpp
index 27d52d1b89b..27d52d1b89b 100644
--- a/doc/src/snippets/droparea.cpp
+++ b/src/gui/doc/snippets/droparea.cpp
diff --git a/doc/src/snippets/image/image.cpp b/src/gui/doc/snippets/image/image.cpp
index 1dfe41f8cd0..1dfe41f8cd0 100644
--- a/doc/src/snippets/image/image.cpp
+++ b/src/gui/doc/snippets/image/image.cpp
diff --git a/doc/src/snippets/image/supportedformat.cpp b/src/gui/doc/snippets/image/supportedformat.cpp
index 6d481908e8c..6d481908e8c 100644
--- a/doc/src/snippets/image/supportedformat.cpp
+++ b/src/gui/doc/snippets/image/supportedformat.cpp
diff --git a/doc/src/snippets/matrix/matrix.cpp b/src/gui/doc/snippets/matrix/matrix.cpp
index 2aa2606fc66..2aa2606fc66 100644
--- a/doc/src/snippets/matrix/matrix.cpp
+++ b/src/gui/doc/snippets/matrix/matrix.cpp
diff --git a/doc/src/snippets/picture/picture.cpp b/src/gui/doc/snippets/picture/picture.cpp
index 8de5e323234..8de5e323234 100644
--- a/doc/src/snippets/picture/picture.cpp
+++ b/src/gui/doc/snippets/picture/picture.cpp
diff --git a/doc/src/snippets/polygon/polygon.cpp b/src/gui/doc/snippets/polygon/polygon.cpp
index 432156f8e65..432156f8e65 100644
--- a/doc/src/snippets/polygon/polygon.cpp
+++ b/src/gui/doc/snippets/polygon/polygon.cpp
diff --git a/doc/src/snippets/qfontdatabase/main.cpp b/src/gui/doc/snippets/qfontdatabase/main.cpp
index 8e98e309a05..8e98e309a05 100644
--- a/doc/src/snippets/qfontdatabase/main.cpp
+++ b/src/gui/doc/snippets/qfontdatabase/main.cpp
diff --git a/doc/src/snippets/qstatustipevent/main.cpp b/src/gui/doc/snippets/qstatustipevent/main.cpp
index 9a1948f4e80..9a1948f4e80 100644
--- a/doc/src/snippets/qstatustipevent/main.cpp
+++ b/src/gui/doc/snippets/qstatustipevent/main.cpp
diff --git a/doc/src/snippets/separations/finalwidget.cpp b/src/gui/doc/snippets/separations/finalwidget.cpp
index 81a4aa1c429..81a4aa1c429 100644
--- a/doc/src/snippets/separations/finalwidget.cpp
+++ b/src/gui/doc/snippets/separations/finalwidget.cpp
diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.cpp b/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
index cd9beadd00b..cd9beadd00b 100644
--- a/doc/src/snippets/textblock-fragments/xmlwriter.cpp
+++ b/src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp
diff --git a/doc/src/snippets/textdocument-css/main.cpp b/src/gui/doc/snippets/textdocument-css/main.cpp
index 55b85712246..55b85712246 100644
--- a/doc/src/snippets/textdocument-css/main.cpp
+++ b/src/gui/doc/snippets/textdocument-css/main.cpp
diff --git a/doc/src/snippets/textdocument-listitemstyles/main.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
index 223ec22baec..223ec22baec 100644
--- a/doc/src/snippets/textdocument-listitemstyles/main.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/main.cpp
diff --git a/doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
index 029695eca33..029695eca33 100644
--- a/doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-listitemstyles/mainwindow.h b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
index fc5c6db2a7a..fc5c6db2a7a 100644
--- a/doc/src/snippets/textdocument-listitemstyles/mainwindow.h
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h
diff --git a/doc/src/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro b/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro
index 5da8d6e1a19..5da8d6e1a19 100644
--- a/doc/src/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro
+++ b/src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro
diff --git a/doc/src/snippets/textdocument-lists/mainwindow.cpp b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
index 7ae36b0cedf..7ae36b0cedf 100644
--- a/doc/src/snippets/textdocument-lists/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-lists/mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-resources/main.cpp b/src/gui/doc/snippets/textdocument-resources/main.cpp
index ed26793d78e..ed26793d78e 100644
--- a/doc/src/snippets/textdocument-resources/main.cpp
+++ b/src/gui/doc/snippets/textdocument-resources/main.cpp
diff --git a/doc/src/snippets/textdocument-resources/textdocument-resources.pro b/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro
index 16181f21cfd..16181f21cfd 100644
--- a/doc/src/snippets/textdocument-resources/textdocument-resources.pro
+++ b/src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro
diff --git a/doc/src/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
index 79e5f03df41..79e5f03df41 100644
--- a/doc/src/snippets/textdocument-tables/mainwindow.cpp
+++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp
diff --git a/doc/src/snippets/textdocument-texttable/main.cpp b/src/gui/doc/snippets/textdocument-texttable/main.cpp
index ca5338533c4..ca5338533c4 100644
--- a/doc/src/snippets/textdocument-texttable/main.cpp
+++ b/src/gui/doc/snippets/textdocument-texttable/main.cpp
diff --git a/doc/src/snippets/textdocumentendsnippet.cpp b/src/gui/doc/snippets/textdocumentendsnippet.cpp
index caec20dc9b0..caec20dc9b0 100644
--- a/doc/src/snippets/textdocumentendsnippet.cpp
+++ b/src/gui/doc/snippets/textdocumentendsnippet.cpp
diff --git a/doc/src/snippets/transform/main.cpp b/src/gui/doc/snippets/transform/main.cpp
index d1c600828da..d1c600828da 100644
--- a/doc/src/snippets/transform/main.cpp
+++ b/src/gui/doc/snippets/transform/main.cpp
diff --git a/doc/src/gui/coordsys.qdoc b/src/gui/doc/src/coordsys.qdoc
index 655dbf7cf3e..655dbf7cf3e 100644
--- a/doc/src/gui/coordsys.qdoc
+++ b/src/gui/doc/src/coordsys.qdoc
diff --git a/doc/src/gui/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc
index 4b33e4fed3f..4b33e4fed3f 100644
--- a/doc/src/gui/paintsystem.qdoc
+++ b/src/gui/doc/src/paintsystem.qdoc
diff --git a/doc/src/gui/qtgui.qdoc b/src/gui/doc/src/qtgui.qdoc
index bffe07889af..7e11aa52339 100644
--- a/doc/src/gui/qtgui.qdoc
+++ b/src/gui/doc/src/qtgui.qdoc
@@ -35,5 +35,5 @@
     To include the definitions of both modules' classes, use the
     following directive:
 
-    \snippet doc/src/snippets/code/doc_src_qtgui.pro 0
+    \snippet code/doc_src_qtgui.pro 0
 */
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index b8ec7de8518..64decd0fd74 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -441,7 +441,7 @@ bool QImageData::checkForAlphaPixels() const
     \row
     \li \inlineimage qimage-32bit_scaled.png
     \li
-    \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 0
+    \snippet code/src_gui_image_qimage.cpp 0
     \endtable
 
     In case of a 8-bit and monchrome images, the pixel value is only
@@ -462,7 +462,7 @@ bool QImageData::checkForAlphaPixels() const
     \row
     \li \inlineimage qimage-8bit_scaled.png
     \li
-    \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 1
+    \snippet code/src_gui_image_qimage.cpp 1
     \endtable
 
     QImage also provide the scanLine() function which returns a
@@ -949,7 +949,7 @@ extern bool qt_read_xpm_image_or_array(QIODevice *device, const char * const *so
     Note that it's possible to squeeze the XPM variable a little bit
     by using an unusual declaration:
 
-    \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 2
+    \snippet code/src_gui_image_qimage.cpp 2
 
     The extra \c const makes the entire definition read-only, which is
     slightly more efficient (e.g., when the code is in a shared
@@ -4478,7 +4478,7 @@ bool QImage::save(const QString &fileName, const char *format, int quality) cons
     This can, for example, be used to save an image directly into a
     QByteArray:
 
-    \snippet doc/src/snippets/image/image.cpp 0
+    \snippet image/image.cpp 0
 */
 
 bool QImage::save(QIODevice* device, const char* format, int quality) const
@@ -4801,7 +4801,7 @@ QString QImage::text(const QString &key) const
     if a specific image or format supports embedding text
     by using QImageWriter::supportsOption(). We give an example:
 
-    \snippet doc/src/snippets/image/supportedformat.cpp 0
+    \snippet image/supportedformat.cpp 0
 
     You can use QImageWriter::supportedImageFormats() to find out
     which image formats are available to you.
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index fe14a45dcb7..c08ac0593b3 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -653,7 +653,7 @@ QImageReader::~QImageReader()
     Sets the format QImageReader will use when reading images, to \a
     format. \a format is a case insensitive text string. Example:
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 0
+    \snippet code/src_gui_image_qimagereader.cpp 0
 
     You can call supportedImageFormats() for the full list of formats
     QImageReader supports.
@@ -671,7 +671,7 @@ void QImageReader::setFormat(const QByteArray &format)
     You can call this function after assigning a device to the
     reader to determine the format of the device. For example:
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 1
+    \snippet code/src_gui_image_qimagereader.cpp 1
 
     If the reader cannot read any image from the device (e.g., there is no
     image there, or the image has already been read), or if the format is
@@ -1131,7 +1131,7 @@ QImage QImageReader::read()
     which always constructs a new image; especially when reading several
     images with the same format and size.
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 2
+    \snippet code/src_gui_image_qimagereader.cpp 2
 
     For image formats that support animation, calling read() repeatedly will
     return the next frame. When all frames have been read, a null image will
@@ -1371,7 +1371,7 @@ QString QImageReader::errorString() const
     (see text()), and the BMP format allows you to determine the image's size
     without loading the whole image into memory (see size()).
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagereader.cpp 3
+    \snippet code/src_gui_image_qimagereader.cpp 3
 
     \sa QImageWriter::supportsOption()
 */
diff --git a/src/gui/image/qimagewriter.cpp b/src/gui/image/qimagewriter.cpp
index 8395f9d2163..56c459ee4db 100644
--- a/src/gui/image/qimagewriter.cpp
+++ b/src/gui/image/qimagewriter.cpp
@@ -323,7 +323,7 @@ QImageWriter::~QImageWriter()
     Sets the format QImageWriter will use when writing images, to \a
     format. \a format is a case insensitive text string. Example:
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 0
+    \snippet code/src_gui_image_qimagewriter.cpp 0
 
     You can call supportedImageFormats() for the full list of formats
     QImageWriter supports.
@@ -522,7 +522,7 @@ QString QImageWriter::description() const
     \a text. This is useful for storing copyright information
     or other information about the image. Example:
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 1
+    \snippet code/src_gui_image_qimagewriter.cpp 1
 
     If you want to store a single block of data
     (e.g., a comment), you can pass an empty key, or use
@@ -629,7 +629,7 @@ QString QImageWriter::errorString() const
     example, the PNG format allows you to embed text into the image's metadata
     (see text()).
 
-    \snippet doc/src/snippets/code/src_gui_image_qimagewriter.cpp 2
+    \snippet code/src_gui_image_qimagewriter.cpp 2
 
     Options can be tested after the writer has been associated with a format.
 
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp
index 8dfcf57dfdf..e1ddcf1a0c5 100644
--- a/src/gui/image/qmovie.cpp
+++ b/src/gui/image/qmovie.cpp
@@ -61,7 +61,7 @@
     To display the movie in your application, you can pass your QMovie object
     to QLabel::setMovie(). Example:
 
-    \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 0
+    \snippet code/src_gui_image_qmovie.cpp 0
 
     Whenever a new frame is available in the movie, QMovie will emit
     updated(). If the size of the frame changes, resized() is emitted. You can
@@ -883,7 +883,7 @@ void QMovie::setPaused(bool paused)
     The default speed is 100%.
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_image_qmovie.cpp 1
+    \snippet code/src_gui_image_qmovie.cpp 1
 */
 void QMovie::setSpeed(int percentSpeed)
 {
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp
index 8bb9f211e8c..283002b1d33 100644
--- a/src/gui/image/qpicture.cpp
+++ b/src/gui/image/qpicture.cpp
@@ -92,13 +92,13 @@ void qt_format_text(const QFont &fnt, const QRectF &_r,
     depending on the window system.
 
     Example of how to record a picture:
-    \snippet doc/src/snippets/picture/picture.cpp 0
+    \snippet picture/picture.cpp 0
 
     Note that the list of painter commands is reset on each call to
     the QPainter::begin() function.
 
     Example of how to replay a picture:
-    \snippet doc/src/snippets/picture/picture.cpp 1
+    \snippet picture/picture.cpp 1
 
     Pictures can also be drawn using play(). Some basic data about a
     picture is available, for example, size(), isNull() and
@@ -1226,7 +1226,7 @@ static QStringList qToStringList(const QList<QByteArray> arr)
 
     Note that if you want to iterate over the list, you should iterate
     over a copy, e.g.
-    \snippet doc/src/snippets/picture/picture.cpp 2
+    \snippet picture/picture.cpp 2
 
     \sa outputFormatList() inputFormats() QPictureIO
 */
@@ -1244,7 +1244,7 @@ QStringList QPicture::inputFormatList()
 
     Note that if you want to iterate over the list, you should iterate
     over a copy, e.g.
-    \snippet doc/src/snippets/picture/picture.cpp 3
+    \snippet picture/picture.cpp 3
 
     \sa inputFormatList() outputFormats() QPictureIO
 */
@@ -1464,11 +1464,11 @@ static QPictureHandler *get_picture_handler(const char *format)
     both are null, the QPictureIO object is valid but useless.
 
     Example:
-    \snippet doc/src/snippets/picture/picture.cpp 6
+    \snippet picture/picture.cpp 6
     \codeline
-    \snippet doc/src/snippets/picture/picture.cpp 7
+    \snippet picture/picture.cpp 7
     \codeline
-    \snippet doc/src/snippets/picture/picture.cpp 8
+    \snippet picture/picture.cpp 8
 
     Before the regular expression test, all the 0 bytes in the file header are
     converted to 1 bytes. This is done because when Qt was ASCII-based, QRegExp
@@ -1833,7 +1833,7 @@ QList<QByteArray> QPictureIO::outputFormats()
 
     Example:
 
-    \snippet doc/src/snippets/picture/picture.cpp 4
+    \snippet picture/picture.cpp 4
 
     \sa setIODevice() setFileName() setFormat() write() QPixmap::load()
 */
@@ -1902,7 +1902,7 @@ bool QPictureIO::read()
     The picture will be written using the specified picture format.
 
     Example:
-    \snippet doc/src/snippets/picture/picture.cpp 5
+    \snippet picture/picture.cpp 5
 
     \sa setIODevice() setFileName() setFormat() read() QPixmap::save()
 */
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index cefb8edf74d..377d7e036a0 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -241,7 +241,7 @@ QPixmap::QPixmap(const QPixmap &pixmap)
     Note that it's possible to squeeze the XPM variable a little bit
     by using an unusual declaration:
 
-    \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 0
+    \snippet code/src_gui_image_qpixmap.cpp 0
 
     The extra \c const makes the entire definition read-only, which is
     slightly more efficient (for example, when the code is in a shared
@@ -334,7 +334,7 @@ QPixmap QPixmap::copy(const QRect &rect) const
     region is left unchanged. You can optionally pass a pointer to an empty
     QRegion to get the region that is \a exposed by the scroll operation.
 
-    \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 2
+    \snippet code/src_gui_image_qpixmap.cpp 2
 
     You cannot scroll while there is an active painter on the pixmap.
 
@@ -651,7 +651,7 @@ void QPixmap::setMask(const QBitmap &mask)
     The mask may not be perfect but it should be reasonable, so you
     can do things such as the following:
 
-    \snippet doc/src/snippets/code/src_gui_image_qpixmap.cpp 1
+    \snippet code/src_gui_image_qpixmap.cpp 1
 
     This function is slow because it involves converting to/from a
     QImage, and non-trivial computations.
@@ -810,7 +810,7 @@ bool QPixmap::save(const QString &fileName, const char *format, int quality) con
     specified image file \a format and \a quality factor. This can be
     used, for example, to save a pixmap directly into a QByteArray:
 
-    \snippet doc/src/snippets/image/image.cpp 1
+    \snippet image/image.cpp 1
 */
 
 bool QPixmap::save(QIODevice* device, const char* format, int quality) const
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index 7769c45b2ef..b0e5b7e1e3f 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -472,7 +472,7 @@ QPixmapCacheEntry::~QPixmapCacheEntry()
     bool find(const QString&, QPixmap*) instead.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_image_qpixmapcache.cpp 0
+    \snippet code/src_gui_image_qpixmapcache.cpp 0
 */
 
 QPixmap *QPixmapCache::find(const QString &key)
@@ -500,7 +500,7 @@ bool QPixmapCache::find(const QString &key, QPixmap& pixmap)
     \since 4.6
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_image_qpixmapcache.cpp 1
+    \snippet code/src_gui_image_qpixmapcache.cpp 1
 */
 
 bool QPixmapCache::find(const QString &key, QPixmap* pixmap)
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index ef5e4f9c184..90fd63ee625 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE
     as QApplication::clipboard().
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_kernel_qclipboard.cpp 0
+    \snippet code/src_gui_kernel_qclipboard.cpp 0
 
     QClipboard features some convenience functions to access common
     data types: setText() allows the exchange of Unicode text and
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
 
     A typical example of the use of these functions follows:
 
-    \snippet doc/src/snippets/droparea.cpp 0
+    \snippet droparea.cpp 0
 
     \section1 Notes for X11 Users
 
@@ -366,7 +366,7 @@ QImage QClipboard::image(Mode mode) const
 
     This is shorthand for:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qclipboard.cpp 1
+    \snippet code/src_gui_kernel_qclipboard.cpp 1
 
     \sa image(), setPixmap() setMimeData()
 */
diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 40015c87061..e20401c67b9 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
     QMimeData object. This is specified with the setMimeData() function in the
     following way:
 
-    \snippet doc/src/snippets/dragging/mainwindow.cpp 1
+    \snippet dragging/mainwindow.cpp 1
 
     Note that setMimeData() assigns ownership of the QMimeData object to the
     QDrag object. The QDrag must be constructed on the heap with a parent QObject
@@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE
     that the cursor's hot spot points to the center of its bottom
     edge:
 
-    \snippet doc/src/snippets/separations/finalwidget.cpp 2
+    \snippet separations/finalwidget.cpp 2
 
     \note On X11, the pixmap may not be able to keep up with the mouse
     movements if the hot spot causes the pixmap to be displayed
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 266eb143e56..eeedd32fd9c 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -582,7 +582,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0
+    \snippet code/src_gui_kernel_qevent.cpp 0
 */
 
 /*!
@@ -604,7 +604,7 @@ QWheelEvent::QWheelEvent(const QPointF &pos, const QPointF& globalPos,
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qevent.cpp 0
+    \snippet code/src_gui_kernel_qevent.cpp 0
 */
 
 /*!
@@ -2557,9 +2557,9 @@ QHelpEvent::~QHelpEvent()
     \table 100%
     \row
     \li
-    \snippet doc/src/snippets/qstatustipevent/main.cpp 1
+    \snippet qstatustipevent/main.cpp 1
     \dots
-    \snippet doc/src/snippets/qstatustipevent/main.cpp 3
+    \snippet qstatustipevent/main.cpp 3
     \li
     \image qstatustipevent-widget.png Widget with status tip.
     \endtable
@@ -2570,10 +2570,10 @@ QHelpEvent::~QHelpEvent()
     \table 100%
     \row
     \li
-    \snippet doc/src/snippets/qstatustipevent/main.cpp 0
-    \snippet doc/src/snippets/qstatustipevent/main.cpp 2
+    \snippet qstatustipevent/main.cpp 0
+    \snippet qstatustipevent/main.cpp 2
     \dots
-    \snippet doc/src/snippets/qstatustipevent/main.cpp 3
+    \snippet qstatustipevent/main.cpp 3
     \li
     \image qstatustipevent-action.png Action with status tip.
     \endtable
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 27e84b71a96..b63ed78c4b5 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -2078,7 +2078,7 @@ static inline void applyCursor(const QList<QWindow *> &l, const QCursor &c)
     restoreOverrideCursor(), otherwise the stack will never be emptied.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication_x11.cpp 0
+    \snippet code/src_gui_kernel_qapplication_x11.cpp 0
 
     \sa overrideCursor(), restoreOverrideCursor(), changeOverrideCursor(),
     QWidget::setCursor()
@@ -2134,7 +2134,7 @@ QStyleHints *QGuiApplication::styleHints()
     This function must be called before creating the QGuiApplication object, like
     this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 6
+    \snippet code/src_gui_kernel_qapplication.cpp 6
 
     \sa desktopSettingsAware()
 */
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 4946a1dc183..635e3dadca4 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -181,7 +181,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
     printing a document, and can be specified in any of the following
     ways:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 0
+    \snippet code/src_gui_kernel_qkeysequence.cpp 0
 
     Note that, for letters, the case used in the specification string
     does not matter. In the above examples, the user does not need to
@@ -354,7 +354,7 @@ void Q_GUI_EXPORT qt_set_sequence_auto_mnemonic(bool b) { qt_sequence_no_mnemoni
     For example, the key sequence, \key{Ctrl X} followed by \key{Ctrl C}, can
     be specified using either of the following ways:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 1
+    \snippet code/src_gui_kernel_qkeysequence.cpp 1
 
     \warning A QApplication instance must have been constructed before a
              QKeySequence is created; otherwise, your application may crash.
@@ -929,7 +929,7 @@ QKeySequence::QKeySequence()
     \endlink(), so that shortcut keys can be replaced in
     translations:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qkeysequence.cpp 2
+    \snippet code/src_gui_kernel_qkeysequence.cpp 2
 
     Note the "File|Open" translator comment. It is by no means
     necessary, but it provides some context for the human translator.
diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp
index ab62ec0992a..cb18b0d22f1 100644
--- a/src/gui/kernel/qpalette.cpp
+++ b/src/gui/kernel/qpalette.cpp
@@ -499,7 +499,7 @@ static void qt_palette_from_color(QPalette &pal, const QColor &button)
     and the QTextDocument::setDefaultStyleSheet() function to alter
     the appearance of links. For example:
 
-    \snippet doc/src/snippets/textdocument-css/main.cpp 0
+    \snippet textdocument-css/main.cpp 0
 
     \value NoRole No role; this special role is often used to indicate that a
     role has not been assigned.
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index a7500822197..267f528ca0c 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -528,7 +528,7 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e)
 /*! \internal
     Clears \a seq to an empty QKeySequence.
     Same as doing (the slower)
-    \snippet doc/src/snippets/code/src_gui_kernel_qshortcutmap.cpp 0
+    \snippet code/src_gui_kernel_qshortcutmap.cpp 0
 */
 void QShortcutMap::clearSequence(QVector<QKeySequence> &ksl)
 {
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp
index c0899e5a411..e9973be2abd 100644
--- a/src/gui/opengl/qopenglshaderprogram.cpp
+++ b/src/gui/opengl/qopenglshaderprogram.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     program is activated in the current QOpenGLContext by calling
     QOpenGLShaderProgram::bind():
 
-    \snippet doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp 0
+    \snippet code/src_gui_qopenglshaderprogram.cpp 0
 
     \section1 Writing portable shaders
 
@@ -99,12 +99,12 @@ QT_BEGIN_NAMESPACE
 
     \section1 Simple shader example
 
-    \snippet doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp 1
+    \snippet code/src_gui_qopenglshaderprogram.cpp 1
 
     With the above shader program active, we can draw a green triangle
     as follows:
 
-    \snippet doc/src/snippets/code/src_gui_qopenglshaderprogram.cpp 2
+    \snippet code/src_gui_qopenglshaderprogram.cpp 2
 
     \section1 Binary shaders and programs
 
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 2f0fb9f96c1..6ee28a42b91 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -292,7 +292,7 @@ struct QBrushDataPointerDeleter
     gradients: QLinearGradient, QConicalGradient, and QRadialGradient
     - all of which inherit QGradient.
 
-    \snippet doc/src/snippets/brush/gradientcreationsnippet.cpp 0
+    \snippet brush/gradientcreationsnippet.cpp 0
 
     The texture() defines the pixmap used when the current style is
     Qt::TexturePattern.  You can create a brush with a texture by
@@ -323,7 +323,7 @@ struct QBrushDataPointerDeleter
     QPainter's \l {QPen}{pen} combined with Qt::PenStyle and
     Qt::GlobalColor:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qbrush.cpp 0
+    \snippet code/src_gui_painting_qbrush.cpp 0
 
     Note that, by default, QPainter renders the outline (using the
     currently set pen) when drawing shapes. Use \l {Qt::NoPen}{\c
@@ -1214,13 +1214,13 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
     A diagonal linear gradient from black at (100, 100) to white at
     (200, 200) could be specified like this:
 
-    \snippet doc/src/snippets/brush/brush.cpp 0
+    \snippet brush/brush.cpp 0
 
     A gradient can have an arbitrary number of stop points. The
     following would create a radial gradient starting with
     red in the center, blue and then green on the edges:
 
-    \snippet doc/src/snippets/brush/brush.cpp 1
+    \snippet brush/brush.cpp 1
 
     It is possible to repeat or reflect the gradient outside its area
     by specifiying the \l {QGradient::Spread}{spread method} using the
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 75122571d6b..81f5a7438a8 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -148,7 +148,7 @@ QT_BEGIN_NAMESPACE
     represents a fully transparent color, while 255 represents a fully
     opaque color. For example:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qcolor.cpp 0
+    \snippet code/src_gui_painting_qcolor.cpp 0
 
     The code above produces the following output:
 
diff --git a/src/gui/painting/qmatrix.cpp b/src/gui/painting/qmatrix.cpp
index c26d7e5d980..afefb1787c8 100644
--- a/src/gui/painting/qmatrix.cpp
+++ b/src/gui/painting/qmatrix.cpp
@@ -114,7 +114,7 @@ QT_BEGIN_NAMESPACE
     \row
     \li \inlineimage qmatrix-simpletransformation.png
     \li
-    \snippet doc/src/snippets/matrix/matrix.cpp 0
+    \snippet matrix/matrix.cpp 0
     \endtable
 
     Although these functions are very convenient, it can be more
@@ -126,7 +126,7 @@ QT_BEGIN_NAMESPACE
     \row
     \li \inlineimage qmatrix-combinedtransformation.png
     \li
-    \snippet doc/src/snippets/matrix/matrix.cpp 1
+    \snippet matrix/matrix.cpp 1
     \endtable
 
     \section1 Basic Matrix Operations
@@ -142,7 +142,7 @@ QT_BEGIN_NAMESPACE
     QMatrix transforms a point in the plane to another point using the
     following formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 0
+    \snippet code/src_gui_painting_qmatrix.cpp 0
 
     The point \e (x, y) is the original point, and \e (x', y') is the
     transformed point. \e (x', y') can be transformed back to \e (x,
@@ -174,7 +174,7 @@ QT_BEGIN_NAMESPACE
     \row
     \li \inlineimage qmatrix-combinedtransformation.png
     \li
-    \snippet doc/src/snippets/matrix/matrix.cpp 2
+    \snippet matrix/matrix.cpp 2
     \endtable
 
     \sa QPainter, QTransform, {Coordinate System}, 
@@ -342,7 +342,7 @@ void QMatrix::setMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qr
 
     The coordinates are transformed using the following formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 1
+    \snippet code/src_gui_painting_qmatrix.cpp 1
 
     The point (x, y) is the original point, and (x', y') is the
     transformed point.
@@ -427,7 +427,7 @@ QRect QMatrix::mapRect(const QRect &rect) const
     The rectangle's coordinates are transformed using the following
     formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 2
+    \snippet code/src_gui_painting_qmatrix.cpp 2
 
     If rotation or shearing has been specified, this function returns
     the \e bounding rectangle. To retrieve the exact region the given
@@ -741,7 +741,7 @@ QPainterPath QMatrix::map(const QPainterPath &path) const
     The rectangle's coordinates are transformed using the following
     formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qmatrix.cpp 3
+    \snippet code/src_gui_painting_qmatrix.cpp 3
 
     Polygons and rectangles behave slightly differently when
     transformed (due to integer rounding), so
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 68e60ed5485..e622fe46a76 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -941,7 +941,7 @@ void QPainterPrivate::updateState(QPainterState *newState)
     painter. Then draw. Remember to destroy the QPainter object after
     drawing. For example:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 0
+    \snippet code/src_gui_painting_qpainter.cpp 0
 
     The core functionality of QPainter is drawing, but the class also
     provide several functions that allows you to customize QPainter's
@@ -1446,10 +1446,10 @@ QPainter::QPainter()
     automatically calls end().
 
     Here's an example using begin() and end():
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 1
+    \snippet code/src_gui_painting_qpainter.cpp 1
 
     The same example using this constructor:
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 2
+    \snippet code/src_gui_painting_qpainter.cpp 2
 
     Since the constructor cannot provide feedback when the initialization
     of the painter failed you should rather use begin() and end() to paint
@@ -1667,7 +1667,7 @@ void QPainter::restore()
 
     The errors that can occur are serious problems, such as these:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 3
+    \snippet code/src_gui_painting_qpainter.cpp 3
 
     Note that most of the time, you can use one of the constructors
     instead of begin(), and that end() is automatically done at
@@ -1956,7 +1956,7 @@ QPaintEngine *QPainter::paintEngine() const
     default state by endNativePainting(). Here is an example that shows
     intermixing of painter commands and raw OpenGL commands:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 21
+    \snippet code/src_gui_painting_qpainter.cpp 21
 
     \sa endNativePainting()
 */
@@ -2871,7 +2871,7 @@ void QPainter::setClipRegion(const QRegion &r, Qt::ClipOperation op)
 
     They operate on the painter's worldMatrix() and are implemented like this:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 4
+    \snippet code/src_gui_painting_qpainter.cpp 4
 
     Note that when using setWorldMatrix() function you should always have
     \a combine be true when you are drawing into a QPicture. Otherwise
@@ -3340,7 +3340,7 @@ void QPainter::fillPath(const QPainterPath &path, const QBrush &brush)
     \row
     \li \inlineimage qpainter-path.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 5
+    \snippet code/src_gui_painting_qpainter.cpp 5
     \endtable
 
     \sa {painting/painterpaths}{the Painter Paths
@@ -3385,7 +3385,7 @@ void QPainter::drawPath(const QPainterPath &path)
     \row
     \li \inlineimage qpainter-line.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 6
+    \snippet code/src_gui_painting_qpainter.cpp 6
     \endtable
 
     \sa drawLines(), drawPolyline(), {Coordinate System}
@@ -3432,7 +3432,7 @@ void QPainter::drawPath(const QPainterPath &path)
     \row
     \li \inlineimage qpainter-rectangle.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 7
+    \snippet code/src_gui_painting_qpainter.cpp 7
     \endtable
 
     \sa drawRects(), drawPolygon(), {Coordinate System}
@@ -4101,7 +4101,7 @@ const QFont &QPainter::font() const
     \row
     \li \inlineimage qpainter-roundrect.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 8
+    \snippet code/src_gui_painting_qpainter.cpp 8
     \endtable
 
     \sa drawRect(), QPen
@@ -4201,7 +4201,7 @@ void QPainter::drawRoundRect(const QRectF &r, int xRnd, int yRnd)
     \row
     \li \inlineimage qpainter-ellipse.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 9
+    \snippet code/src_gui_painting_qpainter.cpp 9
     \endtable
 
     \sa drawPie(), {Coordinate System}
@@ -4327,7 +4327,7 @@ void QPainter::drawEllipse(const QRect &r)
     \row
     \li \inlineimage qpainter-arc.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 10
+    \snippet code/src_gui_painting_qpainter.cpp 10
     \endtable
 
     \sa drawPie(), drawChord(), {Coordinate System}
@@ -4391,7 +4391,7 @@ void QPainter::drawArc(const QRectF &r, int a, int alen)
     \row
     \li \inlineimage qpainter-pie.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 11
+    \snippet code/src_gui_painting_qpainter.cpp 11
     \endtable
 
     \sa drawEllipse(), drawChord(), {Coordinate System}
@@ -4460,7 +4460,7 @@ void QPainter::drawPie(const QRectF &r, int a, int alen)
     \row
     \li \inlineimage qpainter-chord.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 12
+    \snippet code/src_gui_painting_qpainter.cpp 12
     \endtable
 
     \sa drawArc(), drawPie(), {Coordinate System}
@@ -4675,7 +4675,7 @@ void QPainter::drawLines(const QPoint *pointPairs, int lineCount)
     \table 100%
     \row
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 13
+    \snippet code/src_gui_painting_qpainter.cpp 13
     \endtable
 
     \sa drawLines(), drawPolygon(), {Coordinate System}
@@ -4782,7 +4782,7 @@ void QPainter::drawPolyline(const QPoint *points, int pointCount)
     \row
     \li \inlineimage qpainter-polygon.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 14
+    \snippet code/src_gui_painting_qpainter.cpp 14
     \endtable
 
     The first point is implicitly connected to the last point, and the
@@ -4895,7 +4895,7 @@ void QPainter::drawPolygon(const QPoint *points, int pointCount, Qt::FillRule fi
     \row
     \li \inlineimage qpainter-polygon.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 15
+    \snippet code/src_gui_painting_qpainter.cpp 15
     \endtable
 
     The first point is implicitly connected to the last point, and the
@@ -5018,7 +5018,7 @@ static inline QPointF roundInDeviceCoordinates(const QPointF &p, const QTransfor
     \table 100%
     \row
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 16
+    \snippet code/src_gui_painting_qpainter.cpp 16
     \endtable
 
     If \a pixmap is a QBitmap it is drawn with the bits that are "set"
@@ -5928,7 +5928,7 @@ void QPainter::drawText(const QRect &r, int flags, const QString &str, QRect *br
     \row
     \li \inlineimage qpainter-text.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 17
+    \snippet code/src_gui_painting_qpainter.cpp 17
     \endtable
 
     The \a boundingRect (if not null) is set to the what the bounding rectangle
@@ -6682,7 +6682,7 @@ void QPainter::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPo
     \table 100%
     \row
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 18
+    \snippet code/src_gui_painting_qpainter.cpp 18
     \endtable
 
     \sa QPicture::play()
@@ -6725,7 +6725,7 @@ void QPainter::drawPicture(const QPointF &p, const QPicture &picture)
 
     Erases the area inside the given \a rectangle. Equivalent to
     calling
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 19
+    \snippet code/src_gui_painting_qpainter.cpp 19
 
     \sa fillRect()
 */
@@ -7669,7 +7669,7 @@ void QPainterState::init(QPainter *p) {
     \table 100%
     \row
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainter.cpp 20
+    \snippet code/src_gui_painting_qpainter.cpp 20
     \endtable
 
     \sa drawPixmap()
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 0e8811b934c..dc310520e08 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -229,7 +229,7 @@ static void qt_debug_path(const QPainterPath &path)
     \row
     \li \inlineimage qpainterpath-construction.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 0
+    \snippet code/src_gui_painting_qpainterpath.cpp 0
     \endtable
 
     The painter path is initially empty when constructed. We first add
@@ -763,7 +763,7 @@ void QPainterPath::lineTo(const QPointF &p)
     \row
     \li \inlineimage qpainterpath-cubicto.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 1
+    \snippet code/src_gui_painting_qpainterpath.cpp 1
     \endtable
 
     \sa quadTo(), {QPainterPath#Composing a QPainterPath}{Composing
@@ -890,7 +890,7 @@ void QPainterPath::quadTo(const QPointF &c, const QPointF &e)
     \row
     \li \inlineimage qpainterpath-arcto.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 2
+    \snippet code/src_gui_painting_qpainterpath.cpp 2
     \endtable
 
     \sa arcMoveTo(), addEllipse(), QPainter::drawArc(), QPainter::drawPie(),
@@ -1002,7 +1002,7 @@ QPointF QPainterPath::currentPosition() const
     \row
     \li \inlineimage qpainterpath-addrectangle.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 3
+    \snippet code/src_gui_painting_qpainterpath.cpp 3
     \endtable
 
     \sa addRegion(), lineTo(), {QPainterPath#Composing a
@@ -1049,7 +1049,7 @@ void QPainterPath::addRect(const QRectF &r)
     \row
     \li \inlineimage qpainterpath-addpolygon.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 4
+    \snippet code/src_gui_painting_qpainterpath.cpp 4
     \endtable
 
     \sa lineTo(), {QPainterPath#Composing a QPainterPath}{Composing
@@ -1085,7 +1085,7 @@ void QPainterPath::addPolygon(const QPolygonF &polygon)
     \row
     \li \inlineimage qpainterpath-addellipse.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 5
+    \snippet code/src_gui_painting_qpainterpath.cpp 5
     \endtable
 
     \sa arcTo(), QPainter::drawEllipse(), {QPainterPath#Composing a
@@ -1137,7 +1137,7 @@ void QPainterPath::addEllipse(const QRectF &boundingRect)
     \row
     \li \inlineimage qpainterpath-addtext.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpainterpath.cpp 6
+    \snippet code/src_gui_painting_qpainterpath.cpp 6
     \endtable
 
     \sa QPainter::drawText(), {QPainterPath#Composing a
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index 77f0edc52ff..2c95a9f146c 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -79,11 +79,11 @@ typedef QPenPrivate QPenData;
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 0
+    \snippet code/src_gui_painting_qpen.cpp 0
 
     which is equivalent to
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 1
+    \snippet code/src_gui_painting_qpen.cpp 1
 
     The default pen is a solid black brush with 0 width, square
     cap style (Qt::SquareCap), and  bevel join style (Qt::BevelJoin).
@@ -135,7 +135,7 @@ typedef QPenPrivate QPenData;
     spaces. For example, the custom pattern shown above is created
     using the following code:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 2
+    \snippet code/src_gui_painting_qpen.cpp 2
 
     Note that the dash pattern is specified in units of the pens
     width, e.g. a dash of length 5 in width 10 is 50 pixels long.
@@ -476,7 +476,7 @@ QVector<qreal> QPen::dashPattern() const
     \row
     \li \inlineimage qpen-custom.png
     \li
-    \snippet doc/src/snippets/code/src_gui_painting_qpen.cpp 3
+    \snippet code/src_gui_painting_qpen.cpp 3
     \endtable
 
     The dash pattern is specified in units of the pens width; e.g. a
diff --git a/src/gui/painting/qpolygon.cpp b/src/gui/painting/qpolygon.cpp
index ee1f7967cb7..b7dee7ff2a9 100644
--- a/src/gui/painting/qpolygon.cpp
+++ b/src/gui/painting/qpolygon.cpp
@@ -98,7 +98,7 @@ static void qt_polygon_isect_line(const QPointF &p1, const QPointF &p2, const QP
     points to a QPolygon is to use QVector's streaming operator, as
     illustrated below:
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 0
+    \snippet polygon/polygon.cpp 0
 
     In addition to the functions provided by QVector, QPolygon
     provides some point-specific functions.
@@ -304,7 +304,7 @@ void QPolygon::point(int index, int *x, int *y) const
     The example code creates a polygon with two points (10, 20) and
     (30, 40):
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 2
+    \snippet polygon/polygon.cpp 2
 
     \sa setPoint() putPoints()
 */
@@ -330,7 +330,7 @@ void QPolygon::setPoints(int nPoints, const int *points)
     The example code creates a polygon with two points (10, 20) and
     (30, 40):
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 3
+    \snippet polygon/polygon.cpp 3
 */
 
 void QPolygon::setPoints(int nPoints, int firstx, int firsty, ...)
@@ -381,12 +381,12 @@ void QPolygon::putPoints(int index, int nPoints, const int *points)
     The example code creates a polygon with three points (4,5), (6,7)
     and (8,9), by expanding the polygon from 1 to 3 points:
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 4
+    \snippet polygon/polygon.cpp 4
 
     The following code has the same result, but here the putPoints()
     function overwrites rather than extends:
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 5
+    \snippet polygon/polygon.cpp 5
 
     \sa setPoints()
 */
@@ -418,7 +418,7 @@ void QPolygon::putPoints(int index, int nPoints, int firstx, int firsty, ...)
     default) in \a fromPolygon into this polygon, starting at the
     specified \a index. For example:
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 6
+    \snippet polygon/polygon.cpp 6
 */
 
 void QPolygon::putPoints(int index, int nPoints, const QPolygon & from, int fromIndex)
@@ -490,7 +490,7 @@ QDebug operator<<(QDebug dbg, const QPolygon &a)
     to a QPolygonF is to use its streaming operator, as illustrated
     below:
 
-    \snippet doc/src/snippets/polygon/polygon.cpp 1
+    \snippet polygon/polygon.cpp 1
 
     In addition to the functions provided by QVector, QPolygonF
     provides the boundingRect() and translate() functions for geometry
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index ebca1edddc4..f250150b06e 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
     rectangles.
 
     Example of using complex regions:
-    \snippet doc/src/snippets/code/src_gui_painting_qregion.cpp 0
+    \snippet code/src_gui_painting_qregion.cpp 0
 
     \section1 Additional License Information
 
@@ -725,7 +725,7 @@ QRegion QRegion::intersect(const QRect &r) const
     empty region is a region that contains no points.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_painting_qregion_unix.cpp 0
+    \snippet code/src_gui_painting_qregion_unix.cpp 0
 */
 
 /*!
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index ba971d454dc..924a444805b 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -159,7 +159,7 @@ QT_BEGIN_NAMESPACE
     \row
     \li \inlineimage qtransform-simpletransformation.png
     \li
-    \snippet doc/src/snippets/transform/main.cpp 0
+    \snippet transform/main.cpp 0
     \endtable
 
     Although these functions are very convenient, it can be more
@@ -171,7 +171,7 @@ QT_BEGIN_NAMESPACE
     \row
     \li \inlineimage qtransform-combinedtransformation.png
     \li
-    \snippet doc/src/snippets/transform/main.cpp 1
+    \snippet transform/main.cpp 1
     \endtable
 
     \section1 Basic Matrix Operations
@@ -188,7 +188,7 @@ QT_BEGIN_NAMESPACE
     QTransform transforms a point in the plane to another point using the
     following formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 0
+    \snippet code/src_gui_painting_qtransform.cpp 0
 
     The point \e (x, y) is the original point, and \e (x', y') is the
     transformed point. \e (x', y') can be transformed back to \e (x,
@@ -221,7 +221,7 @@ QT_BEGIN_NAMESPACE
     \row
     \li \inlineimage qtransform-combinedtransformation2.png
     \li
-    \snippet doc/src/snippets/transform/main.cpp 2
+    \snippet transform/main.cpp 2
     \endtable
 
     \sa QPainter, {Coordinate System}, {painting/affine}{Affine
@@ -1662,7 +1662,7 @@ QPainterPath QTransform::map(const QPainterPath &path) const
     The rectangle's coordinates are transformed using the following
     formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 1
+    \snippet code/src_gui_painting_qtransform.cpp 1
 
     Polygons and rectangles behave slightly differently when
     transformed (due to integer rounding), so
@@ -1915,7 +1915,7 @@ QRect QTransform::mapRect(const QRect &rect) const
     The rectangle's coordinates are transformed using the following
     formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 2
+    \snippet code/src_gui_painting_qtransform.cpp 2
 
     If rotation or shearing has been specified, this function returns
     the \e bounding rectangle. To retrieve the exact region the given
@@ -1991,7 +1991,7 @@ QRectF QTransform::mapRect(const QRectF &rect) const
 
     The coordinates are transformed using the following formulas:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qtransform.cpp 3
+    \snippet code/src_gui_painting_qtransform.cpp 3
 
     The point (x, y) is the original point, and (x', y') is the
     transformed point.
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 161bb4e23dc..cd1556070e4 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -367,7 +367,7 @@ QFontEngineData::~QFontEngineData()
 
     Create QFonts like this:
 
-    \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 0
+    \snippet code/src_gui_text_qfont.cpp 0
 
     The attributes set in the constructor can also be set later, e.g.
     setFamily(), setPointSize(), setPointSizeFloat(), setWeight() and
@@ -464,11 +464,11 @@ QFontEngineData::~QFontEngineData()
 
     Examples:
 
-    \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 1
+    \snippet code/src_gui_text_qfont.cpp 1
     If you had both an Adobe and a Cronyx Helvetica, you might get
     either.
 
-    \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 2
+    \snippet code/src_gui_text_qfont.cpp 2
 
     You can specify the foundry you want in the family name. The font f
     in the above example will be set to "Helvetica
@@ -477,11 +477,11 @@ QFontEngineData::~QFontEngineData()
     To determine the attributes of the font actually used in the window
     system, use a QFontInfo object, e.g.
 
-    \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 3
+    \snippet code/src_gui_text_qfont.cpp 3
 
     To find out font metrics use a QFontMetrics object, e.g.
 
-    \snippet doc/src/snippets/code/src_gui_text_qfont.cpp 4
+    \snippet code/src_gui_text_qfont.cpp 4
 
     For more general information on fonts, see the
     \link http://nwalsh.com/comp.fonts/FAQ/ comp.fonts FAQ.\endlink
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index a1af8569926..42096d9ae79 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1197,8 +1197,8 @@ QString QFontDatabase::styleString(const QFontInfo &fontInfo)
 
     Example:
 
-    \snippet doc/src/snippets/qfontdatabase/main.cpp 0
-    \snippet doc/src/snippets/qfontdatabase/main.cpp 1
+    \snippet qfontdatabase/main.cpp 0
+    \snippet qfontdatabase/main.cpp 1
 
     This example gets the list of font families, the list of
     styles for each family, and the point sizes that are available for
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index fe9e1d16c71..cc6fa4bfeea 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -122,7 +122,7 @@ extern void qt_format_text(const QFont& font, const QRectF &_r,
     and size(), to return the size of that rectangle.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_text_qfontmetrics.cpp 0
+    \snippet code/src_gui_text_qfontmetrics.cpp 0
 
     \sa QFont, QFontInfo, QFontDatabase, QFontComboBox, {Character Map Example}
 */
@@ -976,7 +976,7 @@ int QFontMetrics::lineWidth() const
     and size(), to return the size of that rectangle.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_text_qfontmetrics.cpp 1
+    \snippet code/src_gui_text_qfontmetrics.cpp 1
 
     \sa QFont QFontInfo QFontDatabase
 */
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index c6810ad61f1..c3720710196 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -253,7 +253,7 @@ void QSyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
     pass it the QTextEdit or QTextDocument that you want the syntax
     highlighting to be applied to. For example:
 
-    \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 0
+    \snippet code/src_gui_text_qsyntaxhighlighter.cpp 0
 
     After this your highlightBlock() function will be called
     automatically whenever necessary. Use your highlightBlock()
@@ -262,7 +262,7 @@ void QSyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
     setFormat() function which applies a given QTextCharFormat on
     the current text block. For example:
 
-    \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 1
+    \snippet code/src_gui_text_qsyntaxhighlighter.cpp 1
 
     Some syntaxes can have constructs that span several text
     blocks. For example, a C++ syntax highlighter should be able to
@@ -285,7 +285,7 @@ void QSyntaxHighlighterPrivate::reformatBlock(const QTextBlock &block)
     For example, if you're writing a simple C++ syntax highlighter,
     you might designate 1 to signify "in comment":
 
-    \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 2
+    \snippet code/src_gui_text_qsyntaxhighlighter.cpp 2
 
     In the example above, we first set the current block state to
     0. Then, if the previous block ended within a comment, we higlight
@@ -432,7 +432,7 @@ void QSyntaxHighlighter::rehighlightBlock(const QTextBlock &block)
     setFormat() as often as necessary to apply any font and color
     changes that you require. For example:
 
-    \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 3
+    \snippet code/src_gui_text_qsyntaxhighlighter.cpp 3
 
     Some syntaxes can have constructs that span several text
     blocks. For example, a C++ syntax highlighter should be able to
@@ -602,7 +602,7 @@ void QSyntaxHighlighter::setCurrentBlockState(int newState)
     and store their relative position and the actual QChar in a simple
     class derived from QTextBlockUserData:
 
-    \snippet doc/src/snippets/code/src_gui_text_qsyntaxhighlighter.cpp 4
+    \snippet code/src_gui_text_qsyntaxhighlighter.cpp 4
 
     During cursor navigation in the associated editor, you can ask the
     current QTextBlock (retrieved using the QTextCursor::block()
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 02fd921fac0..ce46ec2e59b 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -972,7 +972,7 @@ QTextLayout *QTextCursorPrivate::blockLayout(QTextBlock &block) const{
     diacritics).  Functions such as movePosition() and deleteChar()
     limit cursor movement to these valid positions.
 
-    \sa \link richtext.html Rich Text Processing\endlink
+    \sa {Rich Text Processing}
 
 */
 
@@ -1380,7 +1380,7 @@ void QTextCursor::setKeepPositionOnInsert(bool b)
 
     If there is a selection, the selection is deleted and replaced by
     \a text, for example:
-    \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 0
+    \snippet code/src_gui_text_qtextcursor.cpp 0
     This clears any existing selection, selects the word at the cursor
     (i.e. from position() forward), and replaces the selection with
     the phrase "Hello World".
@@ -2301,7 +2301,7 @@ void QTextCursor::insertImage(const QTextImageFormat &format)
     Convenience method for inserting the image with the given \a name at the
     current position().
 
-    \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 1
+    \snippet code/src_gui_text_qtextcursor.cpp 1
 */
 void QTextCursor::insertImage(const QString &name)
 {
@@ -2445,7 +2445,7 @@ bool QTextCursor::operator>(const QTextCursor &rhs) const
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 2
+    \snippet code/src_gui_text_qtextcursor.cpp 2
 
     The call to undo() will cause both insertions to be undone,
     causing both "World" and "Hello" to be removed.
@@ -2474,7 +2474,7 @@ void QTextCursor::beginEditBlock()
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_text_qtextcursor.cpp 3
+    \snippet code/src_gui_text_qtextcursor.cpp 3
 
     The call to undo() will cause all three insertions to be undone.
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index ec660dd0505..f0546566d4a 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1511,7 +1511,7 @@ QTextBlock QTextDocument::begin() const
     This function returns a block to test for the end of the document
     while iterating over it.
 
-    \snippet doc/src/snippets/textdocumentendsnippet.cpp 0
+    \snippet textdocumentendsnippet.cpp 0
 
     The block returned is invalid and represents the block after the
     last block in the document. You can use lastBlock() to retrieve the
@@ -1868,15 +1868,15 @@ QVariant QTextDocument::resource(int type, const QUrl &name) const
     For example, you can add an image as a resource in order to reference it
     from within the document:
 
-    \snippet snippets/textdocument-resources/main.cpp Adding a resource
+    \snippet textdocument-resources/main.cpp Adding a resource
 
     The image can be inserted into the document using the QTextCursor API:
 
-    \snippet snippets/textdocument-resources/main.cpp Inserting an image with a cursor
+    \snippet textdocument-resources/main.cpp Inserting an image with a cursor
 
     Alternatively, you can insert images using the HTML \c img tag:
 
-    \snippet snippets/textdocument-resources/main.cpp Inserting an image using HTML
+    \snippet textdocument-resources/main.cpp Inserting an image using HTML
 */
 void QTextDocument::addResource(int type, const QUrl &name, const QVariant &resource)
 {
@@ -2967,7 +2967,7 @@ void QTextHtmlExporter::emitFrameStyle(const QTextFrameFormat &format, FrameType
     The \a encoding parameter specifies the value for the charset attribute
     in the html header. For example if 'utf-8' is specified then the
     beginning of the generated html will look like this:
-    \snippet doc/src/snippets/code/src_gui_text_qtextdocument.cpp 0
+    \snippet code/src_gui_text_qtextdocument.cpp 0
 
     If no encoding is specified then no such meta information is generated.
 
diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp
index b0bbeb7a476..2894c280e85 100644
--- a/src/gui/text/qtextdocumentwriter.cpp
+++ b/src/gui/text/qtextdocumentwriter.cpp
@@ -160,7 +160,7 @@ QTextDocumentWriter::~QTextDocumentWriter()
     Sets the format used to write documents to the \a format specified.
     \a format is a case insensitive text string. For example:
 
-    \snippet doc/src/snippets/code/src.gui.text.qtextdocumentwriter.cpp 0
+    \snippet code/src_gui_text_qtextdocumentwriter.cpp 0
 
     You can call supportedDocumentFormats() for the full list of formats
     QTextDocumentWriter supports.
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 9a38b1f0b2f..bb3d897ebe1 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -2269,7 +2269,7 @@ QList<QTextOption::Tab> QTextBlockFormat::tabPositions() const
     can be used to customize the numbers used in an ordered list so that they
     appear as (1), (2), (3), etc.:
 
-    \snippet doc/src/snippets/textdocument-listitemstyles/mainwindow.cpp add a styled, ordered list
+    \snippet textdocument-listitemstyles/mainwindow.cpp add a styled, ordered list
 
     \sa QTextList
 */
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 94af3edeeb8..0ab964778a4 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -282,10 +282,10 @@ Qt::LayoutDirection QTextInlineObject::textDirection() const
     created lines.
 
     Here is a code snippet that demonstrates the layout phase:
-    \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 0
+    \snippet code/src_gui_text_qtextlayout.cpp 0
 
     The text can then be rendered by calling the layout's draw() function:
-    \snippet doc/src/snippets/code/src_gui_text_qtextlayout.cpp 1
+    \snippet code/src_gui_text_qtextlayout.cpp 1
 
     For a given position in the text you can find a valid cursor position with
     isValidCursorPosition(), nextCursorPosition(), and previousCursorPosition().
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index c3c71bc0210..82d744d654b 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -75,7 +75,7 @@ public:
     The \l{QTextCursor::insertList()} function inserts an empty block into the
     document at the cursor position, and makes it the first item in a list.
 
-    \snippet doc/src/snippets/textdocument-lists/mainwindow.cpp 0
+    \snippet textdocument-lists/mainwindow.cpp 0
 
     The \l{QTextCursor::createList()} function takes the contents of the
     cursor's current block and turns it into the first item of a new list.
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index a9daf6ba563..d4e9c7d12cc 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -939,8 +939,8 @@ bool QTextBlock::isValid() const
     An iterator can be constructed and used to access the fragments within
     a text block in the following way:
 
-    \snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 4
-    \snippet doc/src/snippets/textblock-fragments/xmlwriter.cpp 7
+    \snippet textblock-fragments/xmlwriter.cpp 4
+    \snippet textblock-fragments/xmlwriter.cpp 7
 
     \sa QTextFragment
 */
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index 65bc8fde1e9..a9866187d32 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -510,9 +510,9 @@ void QTextTablePrivate::update() const
     For example, we can insert a table with three rows and two columns at the
     current cursor position in an editor using the following lines of code:
 
-    \snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 1
+    \snippet textdocument-tables/mainwindow.cpp 1
     \codeline
-    \snippet doc/src/snippets/textdocument-tables/mainwindow.cpp 3
+    \snippet textdocument-tables/mainwindow.cpp 3
 
     The table format is either defined when the table is created or changed
     later with setFormat().
@@ -545,14 +545,14 @@ void QTextTablePrivate::update() const
         \li Suppose we have a 2x3 table of names and addresses. To merge both
         columns in the first row we invoke mergeCells() with \a row = 0,
         \a column = 0, \a numRows = 1 and \a numColumns = 2.
-        \snippet doc/src/snippets/textdocument-texttable/main.cpp 0
+        \snippet textdocument-texttable/main.cpp 0
 
     \row
         \li \inlineimage texttable-merge.png
         \li  This gives us the following table. To split the first row of the table
         back into two cells, we invoke the splitCell() function with \a numRows
         and \a numCols = 1.
-        \snippet doc/src/snippets/textdocument-texttable/main.cpp 1
+        \snippet textdocument-texttable/main.cpp 1
 
     \row
         \li \inlineimage texttable-split.png Split Table
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index a941c060310..1535162735e 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -135,7 +135,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
     URLs, and by registering a handler it becomes possible to display the help text
     inside the application:
 
-    \snippet doc/src/snippets/code/src_gui_util_qdesktopservices.cpp 0
+    \snippet code/src_gui_util_qdesktopservices.cpp 0
 
     If inside the handler you decide that you can't open the requested
     URL, you can just call QDesktopServices::openUrl() again with the
@@ -155,7 +155,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
     The following example opens a file on the Windows file system residing on a path
     that contains spaces:
 
-    \snippet doc/src/snippets/code/src_gui_util_qdesktopservices.cpp 2
+    \snippet code/src_gui_util_qdesktopservices.cpp 2
 
     If a \c mailto URL is specified, the user's e-mail client will be used to open a
     composer window containing the options specified in the URL, similar to the way
@@ -164,7 +164,7 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
     For example, the following URL contains a recipient (\c{[email protected]}), a
     subject (\c{Test}), and a message body (\c{Just a test}):
 
-    \snippet doc/src/snippets/code/src_gui_util_qdesktopservices.cpp 1
+    \snippet code/src_gui_util_qdesktopservices.cpp 1
 
     \warning Although many e-mail clients can send attachments and are
     Unicode-aware, the user may have configured their client without these features.
diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp
index 3103cc74243..84a5b4c54c9 100644
--- a/src/gui/util/qvalidator.cpp
+++ b/src/gui/util/qvalidator.cpp
@@ -303,12 +303,12 @@ void QValidator::fixup(QString &) const
 
     Example of use:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 0
+    \snippet code/src_gui_util_qvalidator.cpp 0
 
     Below we present some examples of validators. In practice they would
     normally be associated with a widget as in the example above.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 1
+    \snippet code/src_gui_util_qvalidator.cpp 1
 
     Notice that the value \c 999 returns Intermediate. Values
     consisting of a number of digits equal to or less than the max
@@ -377,7 +377,7 @@ QIntValidator::~QIntValidator()
     the user might be just about to type the minus (especially for right-to-left
     languages).
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 2
+    \snippet code/src_gui_util_qvalidator.cpp 2
 
     By default, the \a pos parameter is not used by this validator.
 */
@@ -812,12 +812,12 @@ QDoubleValidator::Notation QDoubleValidator::notation() const
     For a brief introduction to Qt's regexp engine, see \l QRegExp.
 
     Example of use:
-    \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 3
+    \snippet code/src_gui_util_qvalidator.cpp 3
 
     Below we present some examples of validators. In practice they would
     normally be associated with a widget as in the example above.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qvalidator.cpp 4
+    \snippet code/src_gui_util_qvalidator.cpp 4
 
     \sa QRegExp, QIntValidator, QDoubleValidator, {Settings Editor Example}
 */