1302 files changed, 1413 insertions, 1567 deletions

diff --git a/doc/src/examples/maemovibration.qdoc b/doc/src/examples/maemovibration.qdoc
deleted file mode 100644
index 78bb7f5334..0000000000
--- a/doc/src/examples/maemovibration.qdoc
+++ /dev/null
@@ -1,164 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** GNU Free Documentation License
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example widgets/maemovibration
-    \group all-examples
-    \title Maemo Vibration Example
-
-    The Maemo Vibration example shows how to tell the Maemo Mode Control Entity
-    (MCE) to vibrate a maemo device.
-
-    The MCE is a system service on Maemo that, among other things, provides an
-    D-Bus interface to trigger vibrations. The vibrations are specified as
-    patterns and are defined in a system configuration file.
-
-    The example program reads the configuration file to look for possible
-    vibration patterns and display a button for each. Pressing a button will
-    make the device vibrate accordingly, until the application closes, or
-    another pattern is started.
-
-    \image maemovibration-example.png Screenshot of the Maemo Vibration Example
-
-    The code makes use of two classes:
-
-    \list
-    \li \c MceVibrator connects to the MCE service and can start a certain
-       vibrator pattern. It also is responsible to parse the configuration
-       file.
-
-    \li \c ButtonWidget provides a button for each pattern. Pressing the button
-       activates the pattern in question.
-    \endlist
-
-
-    \section1 MceVibrator Class Definition
-
-    \snippet examples/widgets/maemovibration/mcevibrator.h 0
-
-    The \c MceVibrator class inherits from QObject and provides a specialized
-    and Qt friendly interface to the MCE vibration facilty. The slot \c vibrate()
-    can be called to make the device vibrate according to a specific pattern
-    name. We will connect it to a signal of a \c ButtonWidget object later. The
-    static method \c ParsePatternNames() can be called to find out which patterns
-    are available to us.
-
-    \list
-    \li \c mceInterface is our D-Bus handle to the MCE service. We use it to
-       invoke methods on the MCE request object.
-
-    \li \c lastPatternName contains the pattern that was activated last time. We
-       have to keep track of this, because the last pattern has to be
-       deactivated before activating a new pattern.
-    \endlist
-
-
-    \section1 MceVibrator Class Implementation
-
-    To connect to the service, we initialize the D-Bus interface handle. The
-    system header \c "mce/dbus-names.h" contains definitions of the D-Bus
-    service name and request object path and interface. These are passed to the
-    constructor of the handle, and Qt will automatically establish a connection
-    to it, if it is possible.
-
-    The MCE expects us to first enable the vibrator before we can use it. This
-    is done with the call to the \c MCE_ENABLE_VIBRATOR D-Bus method.
-
-    \snippet examples/widgets/maemovibration/mcevibrator.cpp 0
-
-    From now on we can activate vibration patterns. Each time a vibration
-    pattern is activated, the last pattern has to be deactivated first. In the
-    vibrate slot we use the MCE interface to call the activation method.
-
-    \snippet examples/widgets/maemovibration/mcevibrator.cpp 1
-
-    The calls to the private method deactivate simply makes sure to deactivate
-    the last pattern used, if there was one.
-
-    \snippet examples/widgets/maemovibration/mcevibrator.cpp 2
-
-    Calling either the activate or deactivate MCE D-Bus method with invalid
-    pattern names are ignored.
-
-    Finally, the destructor disables the vibrator. When the destructor of the
-    MCE interface handle is called, the connection is also closed.
-
-    \snippet examples/widgets/maemovibration/mcevibrator.cpp 3
-
-    The MCE configuration file contains options for many different things. We
-    are only interested in one line that contains the vibration patterns. It
-    has the following format:
-
-
-    \code
-    VibratorPatterns=semicolon;separated;list;of;values
-    \endcode
-
-    The static method \c ParsePatternNames looks for this line and returns a
-    QStringList containing the values, which are the pattern names we can use.
-
-    \snippet examples/widgets/maemovibration/mcevibrator.cpp 4
-
-    The helper function \c checkError() saves us some code duplication. None of the
-    called methods return anything of use to us, so we're only interested in
-    getting error messages for debugging.
-
-    \snippet examples/widgets/maemovibration/mcevibrator.cpp 5
-
-
-    \section1 ButtonWidget Class Definition
-
-    \snippet examples/widgets/maemovibration/buttonwidget.h 0
-
-    The \c ButtonWidget class inherits from QWidget and provides the main user
-    interface for the application. It creates a grid of buttons, one for each
-    string in the stringlist passed to the constructor. Pressing a button emits
-    the \c clicked() signal, where the string is the text of the button that
-    was pressed.
-
-    This class is taken from the QSignalMapper documentation. The only change
-    is the number of columns in the grid from three to two, to make the button
-    labels fit.
-
-
-    \section1 ButtonWidget Class Implementation
-
-    \snippet examples/widgets/maemovibration/buttonwidget.cpp 0
-
-
-    \section1 \c main() Function
-
-    The main function begins with looking up the patterns available to us.
-
-    \snippet examples/widgets/maemovibration/main.cpp 0
-
-    Then we create one instance of both classes, and connects the
-    \c ButtonWidget's clicked signal to the \c MceVibrator's \c vibrate() slot.
-    This works, since the button texts are the same as the pattern names.
-
-    \snippet examples/widgets/maemovibration/main.cpp 1
-*/
diff --git a/examples/examples.pro b/examples/examples.pro
index 9cf603da47..29eda7dff5 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -3,43 +3,26 @@ CONFIG += no_docs_target
 
 SUBDIRS       = \
                 network \
-                statemachine \
                 threads \
                 xml \
                 qpa
 
 !contains(QT_CONFIG, no-widgets) {
-    SUBDIRS  += \
-                animation \
-                desktop \
-                dialogs \
-                draganddrop \
-                effects \
-                graphicsview \
-                ipc \
-                layouts \
-                linguist \
-                mainwindows \
-                painting \
-                richtext \
-                scroller \
-                sql \
-                tools \
-                tutorials \
-                touch \
-                gestures
-
-    !contains(QT_CONFIG, no-widgets) {
-        SUBDIRS +=  widgets \
-                    itemviews
-    }
+    SUBDIRS += widgets \
+               ipc \
+               linguist \
+               sql \
+               tools \
+               tutorials \
+               touch \
+               gestures
 }
+
 wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
 
 contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):!contains(QT_CONFIG, no-widgets):SUBDIRS += qtestlib
 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl
 contains(QT_CONFIG, dbus): SUBDIRS += dbus
-contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
 contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
 
 # install
diff --git a/examples/animation/README b/examples/widgets/animation/README
index e723a28722..e723a28722 100644
--- a/examples/animation/README
+++ b/examples/widgets/animation/README
diff --git a/examples/animation/animatedtiles/animatedtiles.desktop b/examples/widgets/animation/animatedtiles/animatedtiles.desktop
index 97e646fdf8..97e646fdf8 100644
--- a/examples/animation/animatedtiles/animatedtiles.desktop
+++ b/examples/widgets/animation/animatedtiles/animatedtiles.desktop
diff --git a/examples/animation/animatedtiles/animatedtiles.pro b/examples/widgets/animation/animatedtiles/animatedtiles.pro
index 1bba99449c..1bba99449c 100644
--- a/examples/animation/animatedtiles/animatedtiles.pro
+++ b/examples/widgets/animation/animatedtiles/animatedtiles.pro
diff --git a/examples/animation/animatedtiles/animatedtiles.qrc b/examples/widgets/animation/animatedtiles/animatedtiles.qrc
index c43a979723..c43a979723 100644
--- a/examples/animation/animatedtiles/animatedtiles.qrc
+++ b/examples/widgets/animation/animatedtiles/animatedtiles.qrc
diff --git a/examples/animation/animatedtiles/images/Time-For-Lunch-2.jpg b/examples/widgets/animation/animatedtiles/images/Time-For-Lunch-2.jpg
index c57a555490..c57a555490 100644
--- a/examples/animation/animatedtiles/images/Time-For-Lunch-2.jpg
+++ b/examples/widgets/animation/animatedtiles/images/Time-For-Lunch-2.jpg
diff --git a/examples/animation/animatedtiles/images/centered.png b/examples/widgets/animation/animatedtiles/images/centered.png
index e416156a0e..e416156a0e 100644
--- a/examples/animation/animatedtiles/images/centered.png
+++ b/examples/widgets/animation/animatedtiles/images/centered.png
diff --git a/examples/animation/animatedtiles/images/ellipse.png b/examples/widgets/animation/animatedtiles/images/ellipse.png
index 2c3ba881c5..2c3ba881c5 100644
--- a/examples/animation/animatedtiles/images/ellipse.png
+++ b/examples/widgets/animation/animatedtiles/images/ellipse.png
diff --git a/examples/animation/animatedtiles/images/figure8.png b/examples/widgets/animation/animatedtiles/images/figure8.png
index 6b058041c4..6b058041c4 100644
--- a/examples/animation/animatedtiles/images/figure8.png
+++ b/examples/widgets/animation/animatedtiles/images/figure8.png
diff --git a/examples/animation/animatedtiles/images/kinetic.png b/examples/widgets/animation/animatedtiles/images/kinetic.png
index 55cfa5515f..55cfa5515f 100644
--- a/examples/animation/animatedtiles/images/kinetic.png
+++ b/examples/widgets/animation/animatedtiles/images/kinetic.png
diff --git a/examples/animation/animatedtiles/images/random.png b/examples/widgets/animation/animatedtiles/images/random.png
index 415d96f856..415d96f856 100644
--- a/examples/animation/animatedtiles/images/random.png
+++ b/examples/widgets/animation/animatedtiles/images/random.png
diff --git a/examples/animation/animatedtiles/images/tile.png b/examples/widgets/animation/animatedtiles/images/tile.png
index c8f39d8d40..c8f39d8d40 100644
--- a/examples/animation/animatedtiles/images/tile.png
+++ b/examples/widgets/animation/animatedtiles/images/tile.png
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/widgets/animation/animatedtiles/main.cpp
index 50bd33860e..50bd33860e 100644
--- a/examples/animation/animatedtiles/main.cpp
+++ b/examples/widgets/animation/animatedtiles/main.cpp
diff --git a/examples/animation/animation.pro b/examples/widgets/animation/animation.pro
index b17aa0e0fe..b17aa0e0fe 100644
--- a/examples/animation/animation.pro
+++ b/examples/widgets/animation/animation.pro
diff --git a/examples/animation/appchooser/accessories-dictionary.png b/examples/widgets/animation/appchooser/accessories-dictionary.png
index e9bd55d918..e9bd55d918 100644
--- a/examples/animation/appchooser/accessories-dictionary.png
+++ b/examples/widgets/animation/appchooser/accessories-dictionary.png
diff --git a/examples/animation/appchooser/akregator.png b/examples/widgets/animation/appchooser/akregator.png
index a086f45ab6..a086f45ab6 100644
--- a/examples/animation/appchooser/akregator.png
+++ b/examples/widgets/animation/appchooser/akregator.png
diff --git a/examples/animation/appchooser/appchooser.desktop b/examples/widgets/animation/appchooser/appchooser.desktop
index 8e413e96c2..8e413e96c2 100644
--- a/examples/animation/appchooser/appchooser.desktop
+++ b/examples/widgets/animation/appchooser/appchooser.desktop
diff --git a/examples/animation/appchooser/appchooser.pro b/examples/widgets/animation/appchooser/appchooser.pro
index 158a0eca9f..158a0eca9f 100644
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/widgets/animation/appchooser/appchooser.pro
diff --git a/examples/animation/appchooser/appchooser.qrc b/examples/widgets/animation/appchooser/appchooser.qrc
index 28a3e1c4c1..28a3e1c4c1 100644
--- a/examples/animation/appchooser/appchooser.qrc
+++ b/examples/widgets/animation/appchooser/appchooser.qrc
diff --git a/examples/animation/appchooser/digikam.png b/examples/widgets/animation/appchooser/digikam.png
index 9de9fb2f80..9de9fb2f80 100644
--- a/examples/animation/appchooser/digikam.png
+++ b/examples/widgets/animation/appchooser/digikam.png
diff --git a/examples/animation/appchooser/k3b.png b/examples/widgets/animation/appchooser/k3b.png
index bbcafcfba1..bbcafcfba1 100644
--- a/examples/animation/appchooser/k3b.png
+++ b/examples/widgets/animation/appchooser/k3b.png
diff --git a/examples/animation/appchooser/main.cpp b/examples/widgets/animation/appchooser/main.cpp
index c8e60c0641..c8e60c0641 100644
--- a/examples/animation/appchooser/main.cpp
+++ b/examples/widgets/animation/appchooser/main.cpp
diff --git a/examples/animation/easing/animation.h b/examples/widgets/animation/easing/animation.h
index 35cbed4555..35cbed4555 100644
--- a/examples/animation/easing/animation.h
+++ b/examples/widgets/animation/easing/animation.h
diff --git a/examples/animation/easing/easing.desktop b/examples/widgets/animation/easing/easing.desktop
index 56d122217a..56d122217a 100644
--- a/examples/animation/easing/easing.desktop
+++ b/examples/widgets/animation/easing/easing.desktop
diff --git a/examples/animation/easing/easing.pro b/examples/widgets/animation/easing/easing.pro
index 155d17d9b9..155d17d9b9 100644
--- a/examples/animation/easing/easing.pro
+++ b/examples/widgets/animation/easing/easing.pro
diff --git a/examples/animation/easing/easing.qrc b/examples/widgets/animation/easing/easing.qrc
index 7e112d3a9d..7e112d3a9d 100644
--- a/examples/animation/easing/easing.qrc
+++ b/examples/widgets/animation/easing/easing.qrc
diff --git a/examples/animation/easing/form.ui b/examples/widgets/animation/easing/form.ui
index 364aebeda6..364aebeda6 100644
--- a/examples/animation/easing/form.ui
+++ b/examples/widgets/animation/easing/form.ui
diff --git a/examples/animation/easing/images/qt-logo.png b/examples/widgets/animation/easing/images/qt-logo.png
index 14ddf2a028..14ddf2a028 100644
--- a/examples/animation/easing/images/qt-logo.png
+++ b/examples/widgets/animation/easing/images/qt-logo.png
diff --git a/examples/animation/easing/main.cpp b/examples/widgets/animation/easing/main.cpp
index 05d4014fc2..05d4014fc2 100644
--- a/examples/animation/easing/main.cpp
+++ b/examples/widgets/animation/easing/main.cpp
diff --git a/examples/animation/easing/window.cpp b/examples/widgets/animation/easing/window.cpp
index 33468db59c..33468db59c 100644
--- a/examples/animation/easing/window.cpp
+++ b/examples/widgets/animation/easing/window.cpp
diff --git a/examples/animation/easing/window.h b/examples/widgets/animation/easing/window.h
index bf5014c0cc..bf5014c0cc 100644
--- a/examples/animation/easing/window.h
+++ b/examples/widgets/animation/easing/window.h
diff --git a/examples/animation/moveblocks/main.cpp b/examples/widgets/animation/moveblocks/main.cpp
index d807bb63d9..d807bb63d9 100644
--- a/examples/animation/moveblocks/main.cpp
+++ b/examples/widgets/animation/moveblocks/main.cpp
diff --git a/examples/animation/moveblocks/moveblocks.desktop b/examples/widgets/animation/moveblocks/moveblocks.desktop
index 4100f448df..4100f448df 100644
--- a/examples/animation/moveblocks/moveblocks.desktop
+++ b/examples/widgets/animation/moveblocks/moveblocks.desktop
diff --git a/examples/animation/moveblocks/moveblocks.pro b/examples/widgets/animation/moveblocks/moveblocks.pro
index 7c242e31e6..7c242e31e6 100644
--- a/examples/animation/moveblocks/moveblocks.pro
+++ b/examples/widgets/animation/moveblocks/moveblocks.pro
diff --git a/examples/animation/states/accessories-dictionary.png b/examples/widgets/animation/states/accessories-dictionary.png
index e9bd55d918..e9bd55d918 100644
--- a/examples/animation/states/accessories-dictionary.png
+++ b/examples/widgets/animation/states/accessories-dictionary.png
diff --git a/examples/animation/states/akregator.png b/examples/widgets/animation/states/akregator.png
index a086f45ab6..a086f45ab6 100644
--- a/examples/animation/states/akregator.png
+++ b/examples/widgets/animation/states/akregator.png
diff --git a/examples/animation/states/digikam.png b/examples/widgets/animation/states/digikam.png
index 9de9fb2f80..9de9fb2f80 100644
--- a/examples/animation/states/digikam.png
+++ b/examples/widgets/animation/states/digikam.png
diff --git a/examples/animation/states/help-browser.png b/examples/widgets/animation/states/help-browser.png
index db92faa4e7..db92faa4e7 100644
--- a/examples/animation/states/help-browser.png
+++ b/examples/widgets/animation/states/help-browser.png
diff --git a/examples/animation/states/k3b.png b/examples/widgets/animation/states/k3b.png
index bbcafcfba1..bbcafcfba1 100644
--- a/examples/animation/states/k3b.png
+++ b/examples/widgets/animation/states/k3b.png
diff --git a/examples/animation/states/kchart.png b/examples/widgets/animation/states/kchart.png
index 1dd115be87..1dd115be87 100644
--- a/examples/animation/states/kchart.png
+++ b/examples/widgets/animation/states/kchart.png
diff --git a/examples/animation/states/main.cpp b/examples/widgets/animation/states/main.cpp
index faa97ccbd0..faa97ccbd0 100644
--- a/examples/animation/states/main.cpp
+++ b/examples/widgets/animation/states/main.cpp
diff --git a/examples/animation/states/states.desktop b/examples/widgets/animation/states/states.desktop
index 8429979f23..8429979f23 100644
--- a/examples/animation/states/states.desktop
+++ b/examples/widgets/animation/states/states.desktop
diff --git a/examples/animation/states/states.pro b/examples/widgets/animation/states/states.pro
index adf0e8d58c..adf0e8d58c 100644
--- a/examples/animation/states/states.pro
+++ b/examples/widgets/animation/states/states.pro
diff --git a/examples/animation/states/states.qrc b/examples/widgets/animation/states/states.qrc
index 60ab3f7a60..60ab3f7a60 100644
--- a/examples/animation/states/states.qrc
+++ b/examples/widgets/animation/states/states.qrc
diff --git a/examples/animation/stickman/animation.cpp b/examples/widgets/animation/stickman/animation.cpp
index afdfae6eca..afdfae6eca 100644
--- a/examples/animation/stickman/animation.cpp
+++ b/examples/widgets/animation/stickman/animation.cpp
diff --git a/examples/animation/stickman/animation.h b/examples/widgets/animation/stickman/animation.h
index d5dab530e6..d5dab530e6 100644
--- a/examples/animation/stickman/animation.h
+++ b/examples/widgets/animation/stickman/animation.h
diff --git a/examples/animation/stickman/animations/chilling.bin b/examples/widgets/animation/stickman/animations/chilling.bin
index a81fc7a18c..a81fc7a18c 100644
--- a/examples/animation/stickman/animations/chilling.bin
+++ b/examples/widgets/animation/stickman/animations/chilling.bin
diff --git a/examples/animation/stickman/animations/dancing.bin b/examples/widgets/animation/stickman/animations/dancing.bin
index 462f66f89b..462f66f89b 100644
--- a/examples/animation/stickman/animations/dancing.bin
+++ b/examples/widgets/animation/stickman/animations/dancing.bin
diff --git a/examples/animation/stickman/animations/dead.bin b/examples/widgets/animation/stickman/animations/dead.bin
index 9859b4b4cd..9859b4b4cd 100644
--- a/examples/animation/stickman/animations/dead.bin
+++ b/examples/widgets/animation/stickman/animations/dead.bin
diff --git a/examples/animation/stickman/animations/jumping.bin b/examples/widgets/animation/stickman/animations/jumping.bin
index 12661a15f8..12661a15f8 100644
--- a/examples/animation/stickman/animations/jumping.bin
+++ b/examples/widgets/animation/stickman/animations/jumping.bin
diff --git a/examples/animation/stickman/graphicsview.cpp b/examples/widgets/animation/stickman/graphicsview.cpp
index 134fb8acf1..134fb8acf1 100644
--- a/examples/animation/stickman/graphicsview.cpp
+++ b/examples/widgets/animation/stickman/graphicsview.cpp
diff --git a/examples/animation/stickman/graphicsview.h b/examples/widgets/animation/stickman/graphicsview.h
index 38bf6e1eb6..38bf6e1eb6 100644
--- a/examples/animation/stickman/graphicsview.h
+++ b/examples/widgets/animation/stickman/graphicsview.h
diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/widgets/animation/stickman/lifecycle.cpp
index 53249ccd6f..53249ccd6f 100644
--- a/examples/animation/stickman/lifecycle.cpp
+++ b/examples/widgets/animation/stickman/lifecycle.cpp
diff --git a/examples/animation/stickman/lifecycle.h b/examples/widgets/animation/stickman/lifecycle.h
index 8e8bb50659..8e8bb50659 100644
--- a/examples/animation/stickman/lifecycle.h
+++ b/examples/widgets/animation/stickman/lifecycle.h
diff --git a/examples/animation/stickman/main.cpp b/examples/widgets/animation/stickman/main.cpp
index 3e49da8de3..3e49da8de3 100644
--- a/examples/animation/stickman/main.cpp
+++ b/examples/widgets/animation/stickman/main.cpp
diff --git a/examples/animation/stickman/node.cpp b/examples/widgets/animation/stickman/node.cpp
index 2de34b379c..2de34b379c 100644
--- a/examples/animation/stickman/node.cpp
+++ b/examples/widgets/animation/stickman/node.cpp
diff --git a/examples/animation/stickman/node.h b/examples/widgets/animation/stickman/node.h
index ae6e2a3ed0..ae6e2a3ed0 100644
--- a/examples/animation/stickman/node.h
+++ b/examples/widgets/animation/stickman/node.h
diff --git a/examples/animation/stickman/rectbutton.cpp b/examples/widgets/animation/stickman/rectbutton.cpp
index 8b17600ef5..8b17600ef5 100644
--- a/examples/animation/stickman/rectbutton.cpp
+++ b/examples/widgets/animation/stickman/rectbutton.cpp
diff --git a/examples/animation/stickman/rectbutton.h b/examples/widgets/animation/stickman/rectbutton.h
index ead8f21420..ead8f21420 100644
--- a/examples/animation/stickman/rectbutton.h
+++ b/examples/widgets/animation/stickman/rectbutton.h
diff --git a/examples/animation/stickman/stickman.cpp b/examples/widgets/animation/stickman/stickman.cpp
index 667ed7d141..667ed7d141 100644
--- a/examples/animation/stickman/stickman.cpp
+++ b/examples/widgets/animation/stickman/stickman.cpp
diff --git a/examples/animation/stickman/stickman.desktop b/examples/widgets/animation/stickman/stickman.desktop
index 1722d4db3e..1722d4db3e 100644
--- a/examples/animation/stickman/stickman.desktop
+++ b/examples/widgets/animation/stickman/stickman.desktop
diff --git a/examples/animation/stickman/stickman.h b/examples/widgets/animation/stickman/stickman.h
index f50ed1a6c2..f50ed1a6c2 100644
--- a/examples/animation/stickman/stickman.h
+++ b/examples/widgets/animation/stickman/stickman.h
diff --git a/examples/animation/stickman/stickman.pro b/examples/widgets/animation/stickman/stickman.pro
index 43aaec113d..43aaec113d 100644
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/widgets/animation/stickman/stickman.pro
diff --git a/examples/animation/stickman/stickman.qrc b/examples/widgets/animation/stickman/stickman.qrc
index 4cf3ba3828..4cf3ba3828 100644
--- a/examples/animation/stickman/stickman.qrc
+++ b/examples/widgets/animation/stickman/stickman.qrc
diff --git a/examples/animation/sub-attaq/animationmanager.cpp b/examples/widgets/animation/sub-attaq/animationmanager.cpp
index 7dcb9dfb50..7dcb9dfb50 100644
--- a/examples/animation/sub-attaq/animationmanager.cpp
+++ b/examples/widgets/animation/sub-attaq/animationmanager.cpp
diff --git a/examples/animation/sub-attaq/animationmanager.h b/examples/widgets/animation/sub-attaq/animationmanager.h
index 6587e39b14..6587e39b14 100644
--- a/examples/animation/sub-attaq/animationmanager.h
+++ b/examples/widgets/animation/sub-attaq/animationmanager.h
diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/widgets/animation/sub-attaq/boat.cpp
index 88332dbfe7..88332dbfe7 100644
--- a/examples/animation/sub-attaq/boat.cpp
+++ b/examples/widgets/animation/sub-attaq/boat.cpp
diff --git a/examples/animation/sub-attaq/boat.h b/examples/widgets/animation/sub-attaq/boat.h
index 0b2fe5c8eb..0b2fe5c8eb 100644
--- a/examples/animation/sub-attaq/boat.h
+++ b/examples/widgets/animation/sub-attaq/boat.h
diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/widgets/animation/sub-attaq/boat_p.h
index 38be985777..38be985777 100644
--- a/examples/animation/sub-attaq/boat_p.h
+++ b/examples/widgets/animation/sub-attaq/boat_p.h
diff --git a/examples/animation/sub-attaq/bomb.cpp b/examples/widgets/animation/sub-attaq/bomb.cpp
index e47e9423a9..e47e9423a9 100644
--- a/examples/animation/sub-attaq/bomb.cpp
+++ b/examples/widgets/animation/sub-attaq/bomb.cpp
diff --git a/examples/animation/sub-attaq/bomb.h b/examples/widgets/animation/sub-attaq/bomb.h
index 74ed734caf..74ed734caf 100644
--- a/examples/animation/sub-attaq/bomb.h
+++ b/examples/widgets/animation/sub-attaq/bomb.h
diff --git a/examples/animation/sub-attaq/data.xml b/examples/widgets/animation/sub-attaq/data.xml
index 0f30515ddf..0f30515ddf 100644
--- a/examples/animation/sub-attaq/data.xml
+++ b/examples/widgets/animation/sub-attaq/data.xml
diff --git a/examples/animation/sub-attaq/graphicsscene.cpp b/examples/widgets/animation/sub-attaq/graphicsscene.cpp
index a2b3e2f101..a2b3e2f101 100644
--- a/examples/animation/sub-attaq/graphicsscene.cpp
+++ b/examples/widgets/animation/sub-attaq/graphicsscene.cpp
diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/widgets/animation/sub-attaq/graphicsscene.h
index 3e571a878c..3e571a878c 100644
--- a/examples/animation/sub-attaq/graphicsscene.h
+++ b/examples/widgets/animation/sub-attaq/graphicsscene.h
diff --git a/examples/animation/sub-attaq/main.cpp b/examples/widgets/animation/sub-attaq/main.cpp
index df18c83435..df18c83435 100644
--- a/examples/animation/sub-attaq/main.cpp
+++ b/examples/widgets/animation/sub-attaq/main.cpp
diff --git a/examples/animation/sub-attaq/mainwindow.cpp b/examples/widgets/animation/sub-attaq/mainwindow.cpp
index 70f0303177..70f0303177 100644
--- a/examples/animation/sub-attaq/mainwindow.cpp
+++ b/examples/widgets/animation/sub-attaq/mainwindow.cpp
diff --git a/examples/animation/sub-attaq/mainwindow.h b/examples/widgets/animation/sub-attaq/mainwindow.h
index 596157d38f..596157d38f 100644
--- a/examples/animation/sub-attaq/mainwindow.h
+++ b/examples/widgets/animation/sub-attaq/mainwindow.h
diff --git a/examples/animation/sub-attaq/pics/big/background.png b/examples/widgets/animation/sub-attaq/pics/big/background.png
index 9f581571fa..9f581571fa 100644
--- a/examples/animation/sub-attaq/pics/big/background.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/background.png
diff --git a/examples/animation/sub-attaq/pics/big/boat.png b/examples/widgets/animation/sub-attaq/pics/big/boat.png
index be82dff62a..be82dff62a 100644
--- a/examples/animation/sub-attaq/pics/big/boat.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/boat.png
diff --git a/examples/animation/sub-attaq/pics/big/bomb.png b/examples/widgets/animation/sub-attaq/pics/big/bomb.png
index 3af5f2f29c..3af5f2f29c 100644
--- a/examples/animation/sub-attaq/pics/big/bomb.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/bomb.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step1.png
index c9fd8b0984..c9fd8b0984 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step1.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step1.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step2.png
index 7528f2d2da..7528f2d2da 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step2.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step2.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step3.png
index aae9c9c184..aae9c9c184 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step3.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step3.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step4.png
index d697c1bae8..d697c1bae8 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/boat/step4.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/boat/step4.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step1.png
index 88ca5144b7..88ca5144b7 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step1.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step1.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step2.png
index 524f5890ee..524f5890ee 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step2.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step2.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step3.png
index 2cca1e80fe..2cca1e80fe 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step3.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step3.png
diff --git a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step4.png
index 82100a8260..82100a8260 100644
--- a/examples/animation/sub-attaq/pics/big/explosion/submarine/step4.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/explosion/submarine/step4.png
diff --git a/examples/animation/sub-attaq/pics/big/submarine.png b/examples/widgets/animation/sub-attaq/pics/big/submarine.png
index df435dc47d..df435dc47d 100644
--- a/examples/animation/sub-attaq/pics/big/submarine.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/submarine.png
diff --git a/examples/animation/sub-attaq/pics/big/surface.png b/examples/widgets/animation/sub-attaq/pics/big/surface.png
index 4eba29e9cd..4eba29e9cd 100644
--- a/examples/animation/sub-attaq/pics/big/surface.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/surface.png
diff --git a/examples/animation/sub-attaq/pics/big/torpedo.png b/examples/widgets/animation/sub-attaq/pics/big/torpedo.png
index f9c26873f1..f9c26873f1 100644
--- a/examples/animation/sub-attaq/pics/big/torpedo.png
+++ b/examples/widgets/animation/sub-attaq/pics/big/torpedo.png
diff --git a/examples/animation/sub-attaq/pics/scalable/background-n810.svg b/examples/widgets/animation/sub-attaq/pics/scalable/background-n810.svg
index ece9f7aaf1..ece9f7aaf1 100644
--- a/examples/animation/sub-attaq/pics/scalable/background-n810.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/background-n810.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/background.svg b/examples/widgets/animation/sub-attaq/pics/scalable/background.svg
index 0be268010e..0be268010e 100644
--- a/examples/animation/sub-attaq/pics/scalable/background.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/background.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/boat.svg b/examples/widgets/animation/sub-attaq/pics/scalable/boat.svg
index 5298821ba8..5298821ba8 100644
--- a/examples/animation/sub-attaq/pics/scalable/boat.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/boat.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/bomb.svg b/examples/widgets/animation/sub-attaq/pics/scalable/bomb.svg
index 294771a6dd..294771a6dd 100644
--- a/examples/animation/sub-attaq/pics/scalable/bomb.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/bomb.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/sand.svg b/examples/widgets/animation/sub-attaq/pics/scalable/sand.svg
index 8af11b7a66..8af11b7a66 100644
--- a/examples/animation/sub-attaq/pics/scalable/sand.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/sand.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/see.svg b/examples/widgets/animation/sub-attaq/pics/scalable/see.svg
index 0666691215..0666691215 100644
--- a/examples/animation/sub-attaq/pics/scalable/see.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/see.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/sky.svg b/examples/widgets/animation/sub-attaq/pics/scalable/sky.svg
index 1546c087a7..1546c087a7 100644
--- a/examples/animation/sub-attaq/pics/scalable/sky.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/sky.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg b/examples/widgets/animation/sub-attaq/pics/scalable/sub-attaq.svg
index b075179b46..b075179b46 100644
--- a/examples/animation/sub-attaq/pics/scalable/sub-attaq.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/sub-attaq.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/submarine.svg b/examples/widgets/animation/sub-attaq/pics/scalable/submarine.svg
index 8a0ffddbca..8a0ffddbca 100644
--- a/examples/animation/sub-attaq/pics/scalable/submarine.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/submarine.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/surface.svg b/examples/widgets/animation/sub-attaq/pics/scalable/surface.svg
index 40ed239638..40ed239638 100644
--- a/examples/animation/sub-attaq/pics/scalable/surface.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/surface.svg
diff --git a/examples/animation/sub-attaq/pics/scalable/torpedo.svg b/examples/widgets/animation/sub-attaq/pics/scalable/torpedo.svg
index 48e429d2bf..48e429d2bf 100644
--- a/examples/animation/sub-attaq/pics/scalable/torpedo.svg
+++ b/examples/widgets/animation/sub-attaq/pics/scalable/torpedo.svg
diff --git a/examples/animation/sub-attaq/pics/small/background.png b/examples/widgets/animation/sub-attaq/pics/small/background.png
index 5ad3db660a..5ad3db660a 100644
--- a/examples/animation/sub-attaq/pics/small/background.png
+++ b/examples/widgets/animation/sub-attaq/pics/small/background.png
diff --git a/examples/animation/sub-attaq/pics/small/boat.png b/examples/widgets/animation/sub-attaq/pics/small/boat.png
index 114ccc310e..114ccc310e 100644
--- a/examples/animation/sub-attaq/pics/small/boat.png
+++ b/examples/widgets/animation/sub-attaq/pics/small/boat.png
diff --git a/examples/animation/sub-attaq/pics/small/bomb.png b/examples/widgets/animation/sub-attaq/pics/small/bomb.png
index 3af5f2f29c..3af5f2f29c 100644
--- a/examples/animation/sub-attaq/pics/small/bomb.png
+++ b/examples/widgets/animation/sub-attaq/pics/small/bomb.png
diff --git a/examples/animation/sub-attaq/pics/small/submarine.png b/examples/widgets/animation/sub-attaq/pics/small/submarine.png
index 0c0c350600..0c0c350600 100644
--- a/examples/animation/sub-attaq/pics/small/submarine.png
+++ b/examples/widgets/animation/sub-attaq/pics/small/submarine.png
diff --git a/examples/animation/sub-attaq/pics/small/surface.png b/examples/widgets/animation/sub-attaq/pics/small/surface.png
index 06d0e47a5c..06d0e47a5c 100644
--- a/examples/animation/sub-attaq/pics/small/surface.png
+++ b/examples/widgets/animation/sub-attaq/pics/small/surface.png
diff --git a/examples/animation/sub-attaq/pics/small/torpedo.png b/examples/widgets/animation/sub-attaq/pics/small/torpedo.png
index f9c26873f1..f9c26873f1 100644
--- a/examples/animation/sub-attaq/pics/small/torpedo.png
+++ b/examples/widgets/animation/sub-attaq/pics/small/torpedo.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-a.png
index 67dd76dac0..67dd76dac0 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-a.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-a.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-a2.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-a2.png
index 17668b07de..17668b07de 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-a2.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-a2.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-b.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-b.png
index cf6c04560b..cf6c04560b 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-b.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-b.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-dash.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-dash.png
index 219233ce6b..219233ce6b 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-dash.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-dash.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-excl.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-excl.png
index 8dd0a2eb86..8dd0a2eb86 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-excl.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-excl.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-q.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-q.png
index 86e588d4d8..86e588d4d8 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-q.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-q.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-s.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-s.png
index 7b6a36e93a..7b6a36e93a 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-s.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-s.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-t.png
index b2e3526bea..b2e3526bea 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-t.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-t.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-t2.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-t2.png
index b11a77886e..b11a77886e 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-t2.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-t2.png
diff --git a/examples/animation/sub-attaq/pics/welcome/logo-u.png b/examples/widgets/animation/sub-attaq/pics/welcome/logo-u.png
index 24eede887a..24eede887a 100644
--- a/examples/animation/sub-attaq/pics/welcome/logo-u.png
+++ b/examples/widgets/animation/sub-attaq/pics/welcome/logo-u.png
diff --git a/examples/animation/sub-attaq/pixmapitem.cpp b/examples/widgets/animation/sub-attaq/pixmapitem.cpp
index 077151d708..077151d708 100644
--- a/examples/animation/sub-attaq/pixmapitem.cpp
+++ b/examples/widgets/animation/sub-attaq/pixmapitem.cpp
diff --git a/examples/animation/sub-attaq/pixmapitem.h b/examples/widgets/animation/sub-attaq/pixmapitem.h
index 0a3b1287c7..0a3b1287c7 100644
--- a/examples/animation/sub-attaq/pixmapitem.h
+++ b/examples/widgets/animation/sub-attaq/pixmapitem.h
diff --git a/examples/animation/sub-attaq/progressitem.cpp b/examples/widgets/animation/sub-attaq/progressitem.cpp
index bad9ceb471..bad9ceb471 100644
--- a/examples/animation/sub-attaq/progressitem.cpp
+++ b/examples/widgets/animation/sub-attaq/progressitem.cpp
diff --git a/examples/animation/sub-attaq/progressitem.h b/examples/widgets/animation/sub-attaq/progressitem.h
index dc6d7ba6bc..dc6d7ba6bc 100644
--- a/examples/animation/sub-attaq/progressitem.h
+++ b/examples/widgets/animation/sub-attaq/progressitem.h
diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/examples/widgets/animation/sub-attaq/qanimationstate.cpp
index b122acc858..b122acc858 100644
--- a/examples/animation/sub-attaq/qanimationstate.cpp
+++ b/examples/widgets/animation/sub-attaq/qanimationstate.cpp
diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h
index 2672f640e4..2672f640e4 100644
--- a/examples/animation/sub-attaq/qanimationstate.h
+++ b/examples/widgets/animation/sub-attaq/qanimationstate.h
diff --git a/examples/animation/sub-attaq/states.cpp b/examples/widgets/animation/sub-attaq/states.cpp
index 32ad218693..32ad218693 100644
--- a/examples/animation/sub-attaq/states.cpp
+++ b/examples/widgets/animation/sub-attaq/states.cpp
diff --git a/examples/animation/sub-attaq/states.h b/examples/widgets/animation/sub-attaq/states.h
index e43370302c..e43370302c 100644
--- a/examples/animation/sub-attaq/states.h
+++ b/examples/widgets/animation/sub-attaq/states.h
diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro
index 6d9b3195ac..6d9b3195ac 100644
--- a/examples/animation/sub-attaq/sub-attaq.pro
+++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro
diff --git a/examples/animation/sub-attaq/subattaq.qrc b/examples/widgets/animation/sub-attaq/subattaq.qrc
index 80a3af11cc..80a3af11cc 100644
--- a/examples/animation/sub-attaq/subattaq.qrc
+++ b/examples/widgets/animation/sub-attaq/subattaq.qrc
diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/widgets/animation/sub-attaq/submarine.cpp
index 68eaf7ef38..68eaf7ef38 100644
--- a/examples/animation/sub-attaq/submarine.cpp
+++ b/examples/widgets/animation/sub-attaq/submarine.cpp
diff --git a/examples/animation/sub-attaq/submarine.h b/examples/widgets/animation/sub-attaq/submarine.h
index b113bc8797..b113bc8797 100644
--- a/examples/animation/sub-attaq/submarine.h
+++ b/examples/widgets/animation/sub-attaq/submarine.h
diff --git a/examples/animation/sub-attaq/submarine_p.h b/examples/widgets/animation/sub-attaq/submarine_p.h
index f24487aa17..f24487aa17 100644
--- a/examples/animation/sub-attaq/submarine_p.h
+++ b/examples/widgets/animation/sub-attaq/submarine_p.h
diff --git a/examples/animation/sub-attaq/textinformationitem.cpp b/examples/widgets/animation/sub-attaq/textinformationitem.cpp
index ce2e297287..ce2e297287 100644
--- a/examples/animation/sub-attaq/textinformationitem.cpp
+++ b/examples/widgets/animation/sub-attaq/textinformationitem.cpp
diff --git a/examples/animation/sub-attaq/textinformationitem.h b/examples/widgets/animation/sub-attaq/textinformationitem.h
index adad8be90b..adad8be90b 100644
--- a/examples/animation/sub-attaq/textinformationitem.h
+++ b/examples/widgets/animation/sub-attaq/textinformationitem.h
diff --git a/examples/animation/sub-attaq/torpedo.cpp b/examples/widgets/animation/sub-attaq/torpedo.cpp
index 34c32fe059..34c32fe059 100644
--- a/examples/animation/sub-attaq/torpedo.cpp
+++ b/examples/widgets/animation/sub-attaq/torpedo.cpp
diff --git a/examples/animation/sub-attaq/torpedo.h b/examples/widgets/animation/sub-attaq/torpedo.h
index 59209e3d75..59209e3d75 100644
--- a/examples/animation/sub-attaq/torpedo.h
+++ b/examples/widgets/animation/sub-attaq/torpedo.h
diff --git a/examples/desktop/README b/examples/widgets/desktop/README
index 4a949d1cf7..4a949d1cf7 100644
--- a/examples/desktop/README
+++ b/examples/widgets/desktop/README
diff --git a/examples/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro
index adfa51f130..adfa51f130 100644
--- a/examples/desktop/desktop.pro
+++ b/examples/widgets/desktop/desktop.pro
diff --git a/examples/desktop/screenshot/main.cpp b/examples/widgets/desktop/screenshot/main.cpp
index 3f9b2e1126..3f9b2e1126 100644
--- a/examples/desktop/screenshot/main.cpp
+++ b/examples/widgets/desktop/screenshot/main.cpp
diff --git a/examples/desktop/screenshot/screenshot.cpp b/examples/widgets/desktop/screenshot/screenshot.cpp
index 12c6bee6d4..12c6bee6d4 100644
--- a/examples/desktop/screenshot/screenshot.cpp
+++ b/examples/widgets/desktop/screenshot/screenshot.cpp
diff --git a/examples/desktop/screenshot/screenshot.desktop b/examples/widgets/desktop/screenshot/screenshot.desktop
index 236d360123..236d360123 100644
--- a/examples/desktop/screenshot/screenshot.desktop
+++ b/examples/widgets/desktop/screenshot/screenshot.desktop
diff --git a/examples/desktop/screenshot/screenshot.h b/examples/widgets/desktop/screenshot/screenshot.h
index 98251f3428..98251f3428 100644
--- a/examples/desktop/screenshot/screenshot.h
+++ b/examples/widgets/desktop/screenshot/screenshot.h
diff --git a/examples/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro
index e9f53f7450..e9f53f7450 100644
--- a/examples/desktop/screenshot/screenshot.pro
+++ b/examples/widgets/desktop/screenshot/screenshot.pro
diff --git a/examples/desktop/systray/images/bad.png b/examples/widgets/desktop/systray/images/bad.png
index c8701a241a..c8701a241a 100644
--- a/examples/desktop/systray/images/bad.png
+++ b/examples/widgets/desktop/systray/images/bad.png
diff --git a/examples/desktop/systray/images/heart.png b/examples/widgets/desktop/systray/images/heart.png
index cee1302b7d..cee1302b7d 100644
--- a/examples/desktop/systray/images/heart.png
+++ b/examples/widgets/desktop/systray/images/heart.png
diff --git a/examples/desktop/systray/images/trash.png b/examples/widgets/desktop/systray/images/trash.png
index 4c24db926d..4c24db926d 100644
--- a/examples/desktop/systray/images/trash.png
+++ b/examples/widgets/desktop/systray/images/trash.png
diff --git a/examples/desktop/systray/main.cpp b/examples/widgets/desktop/systray/main.cpp
index 6695113f71..6695113f71 100644
--- a/examples/desktop/systray/main.cpp
+++ b/examples/widgets/desktop/systray/main.cpp
diff --git a/examples/desktop/systray/systray.desktop b/examples/widgets/desktop/systray/systray.desktop
index 0490e71548..0490e71548 100644
--- a/examples/desktop/systray/systray.desktop
+++ b/examples/widgets/desktop/systray/systray.desktop
diff --git a/examples/desktop/systray/systray.pro b/examples/widgets/desktop/systray/systray.pro
index 5fdcf1f9c8..5fdcf1f9c8 100644
--- a/examples/desktop/systray/systray.pro
+++ b/examples/widgets/desktop/systray/systray.pro
diff --git a/examples/desktop/systray/systray.qrc b/examples/widgets/desktop/systray/systray.qrc
index a8b6535849..a8b6535849 100644
--- a/examples/desktop/systray/systray.qrc
+++ b/examples/widgets/desktop/systray/systray.qrc
diff --git a/examples/desktop/systray/window.cpp b/examples/widgets/desktop/systray/window.cpp
index c75e3590ba..c75e3590ba 100644
--- a/examples/desktop/systray/window.cpp
+++ b/examples/widgets/desktop/systray/window.cpp
diff --git a/examples/desktop/systray/window.h b/examples/widgets/desktop/systray/window.h
index 80b7a20754..80b7a20754 100644
--- a/examples/desktop/systray/window.h
+++ b/examples/widgets/desktop/systray/window.h
diff --git a/examples/dialogs/README b/examples/widgets/dialogs/README
index 090b011061..090b011061 100644
--- a/examples/dialogs/README
+++ b/examples/widgets/dialogs/README
diff --git a/examples/dialogs/classwizard/classwizard.cpp b/examples/widgets/dialogs/classwizard/classwizard.cpp
index eeb1fab55b..eeb1fab55b 100644
--- a/examples/dialogs/classwizard/classwizard.cpp
+++ b/examples/widgets/dialogs/classwizard/classwizard.cpp
diff --git a/examples/dialogs/classwizard/classwizard.desktop b/examples/widgets/dialogs/classwizard/classwizard.desktop
index 7f7d232092..7f7d232092 100644
--- a/examples/dialogs/classwizard/classwizard.desktop
+++ b/examples/widgets/dialogs/classwizard/classwizard.desktop
diff --git a/examples/dialogs/classwizard/classwizard.h b/examples/widgets/dialogs/classwizard/classwizard.h
index 332025f207..332025f207 100644
--- a/examples/dialogs/classwizard/classwizard.h
+++ b/examples/widgets/dialogs/classwizard/classwizard.h
diff --git a/examples/dialogs/classwizard/classwizard.pro b/examples/widgets/dialogs/classwizard/classwizard.pro
index d50ba675af..d50ba675af 100644
--- a/examples/dialogs/classwizard/classwizard.pro
+++ b/examples/widgets/dialogs/classwizard/classwizard.pro
diff --git a/examples/dialogs/classwizard/classwizard.qrc b/examples/widgets/dialogs/classwizard/classwizard.qrc
index 41a5ddc7d1..41a5ddc7d1 100644
--- a/examples/dialogs/classwizard/classwizard.qrc
+++ b/examples/widgets/dialogs/classwizard/classwizard.qrc
diff --git a/examples/dialogs/classwizard/images/background.png b/examples/widgets/dialogs/classwizard/images/background.png
index 44c7badb85..44c7badb85 100644
--- a/examples/dialogs/classwizard/images/background.png
+++ b/examples/widgets/dialogs/classwizard/images/background.png
diff --git a/examples/dialogs/classwizard/images/banner.png b/examples/widgets/dialogs/classwizard/images/banner.png
index 3169152b8e..3169152b8e 100644
--- a/examples/dialogs/classwizard/images/banner.png
+++ b/examples/widgets/dialogs/classwizard/images/banner.png
diff --git a/examples/dialogs/classwizard/images/logo1.png b/examples/widgets/dialogs/classwizard/images/logo1.png
index f9b594aafc..f9b594aafc 100644
--- a/examples/dialogs/classwizard/images/logo1.png
+++ b/examples/widgets/dialogs/classwizard/images/logo1.png
diff --git a/examples/dialogs/classwizard/images/logo2.png b/examples/widgets/dialogs/classwizard/images/logo2.png
index 5dcbd4669d..5dcbd4669d 100644
--- a/examples/dialogs/classwizard/images/logo2.png
+++ b/examples/widgets/dialogs/classwizard/images/logo2.png
diff --git a/examples/dialogs/classwizard/images/logo3.png b/examples/widgets/dialogs/classwizard/images/logo3.png
index 9fd3ea2358..9fd3ea2358 100644
--- a/examples/dialogs/classwizard/images/logo3.png
+++ b/examples/widgets/dialogs/classwizard/images/logo3.png
diff --git a/examples/dialogs/classwizard/images/watermark1.png b/examples/widgets/dialogs/classwizard/images/watermark1.png
index 0091f5c17a..0091f5c17a 100644
--- a/examples/dialogs/classwizard/images/watermark1.png
+++ b/examples/widgets/dialogs/classwizard/images/watermark1.png
diff --git a/examples/dialogs/classwizard/images/watermark2.png b/examples/widgets/dialogs/classwizard/images/watermark2.png
index 3b88f2e360..3b88f2e360 100644
--- a/examples/dialogs/classwizard/images/watermark2.png
+++ b/examples/widgets/dialogs/classwizard/images/watermark2.png
diff --git a/examples/dialogs/classwizard/main.cpp b/examples/widgets/dialogs/classwizard/main.cpp
index 03dd625ae4..03dd625ae4 100644
--- a/examples/dialogs/classwizard/main.cpp
+++ b/examples/widgets/dialogs/classwizard/main.cpp
diff --git a/examples/dialogs/configdialog/configdialog.cpp b/examples/widgets/dialogs/configdialog/configdialog.cpp
index 2f70c816c4..2f70c816c4 100644
--- a/examples/dialogs/configdialog/configdialog.cpp
+++ b/examples/widgets/dialogs/configdialog/configdialog.cpp
diff --git a/examples/dialogs/configdialog/configdialog.desktop b/examples/widgets/dialogs/configdialog/configdialog.desktop
index 11a326813a..11a326813a 100644
--- a/examples/dialogs/configdialog/configdialog.desktop
+++ b/examples/widgets/dialogs/configdialog/configdialog.desktop
diff --git a/examples/dialogs/configdialog/configdialog.h b/examples/widgets/dialogs/configdialog/configdialog.h
index 5b79e416ab..5b79e416ab 100644
--- a/examples/dialogs/configdialog/configdialog.h
+++ b/examples/widgets/dialogs/configdialog/configdialog.h
diff --git a/examples/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro
index 643c2a238f..643c2a238f 100644
--- a/examples/dialogs/configdialog/configdialog.pro
+++ b/examples/widgets/dialogs/configdialog/configdialog.pro
diff --git a/examples/dialogs/configdialog/configdialog.qrc b/examples/widgets/dialogs/configdialog/configdialog.qrc
index 31d0d49666..31d0d49666 100644
--- a/examples/dialogs/configdialog/configdialog.qrc
+++ b/examples/widgets/dialogs/configdialog/configdialog.qrc
diff --git a/examples/dialogs/configdialog/images/config.png b/examples/widgets/dialogs/configdialog/images/config.png
index 5c14d5f470..5c14d5f470 100644
--- a/examples/dialogs/configdialog/images/config.png
+++ b/examples/widgets/dialogs/configdialog/images/config.png
diff --git a/examples/dialogs/configdialog/images/query.png b/examples/widgets/dialogs/configdialog/images/query.png
index ea9e291eeb..ea9e291eeb 100644
--- a/examples/dialogs/configdialog/images/query.png
+++ b/examples/widgets/dialogs/configdialog/images/query.png
diff --git a/examples/dialogs/configdialog/images/update.png b/examples/widgets/dialogs/configdialog/images/update.png
index 3cb8ba6c77..3cb8ba6c77 100644
--- a/examples/dialogs/configdialog/images/update.png
+++ b/examples/widgets/dialogs/configdialog/images/update.png
diff --git a/examples/dialogs/configdialog/main.cpp b/examples/widgets/dialogs/configdialog/main.cpp
index 42f3cf2f43..42f3cf2f43 100644
--- a/examples/dialogs/configdialog/main.cpp
+++ b/examples/widgets/dialogs/configdialog/main.cpp
diff --git a/examples/dialogs/configdialog/pages.cpp b/examples/widgets/dialogs/configdialog/pages.cpp
index c89bc3c7c8..c89bc3c7c8 100644
--- a/examples/dialogs/configdialog/pages.cpp
+++ b/examples/widgets/dialogs/configdialog/pages.cpp
diff --git a/examples/dialogs/configdialog/pages.h b/examples/widgets/dialogs/configdialog/pages.h
index 938a2a74f7..938a2a74f7 100644
--- a/examples/dialogs/configdialog/pages.h
+++ b/examples/widgets/dialogs/configdialog/pages.h
diff --git a/examples/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro
index a59e480efa..a59e480efa 100644
--- a/examples/dialogs/dialogs.pro
+++ b/examples/widgets/dialogs/dialogs.pro
diff --git a/examples/dialogs/extension/extension.desktop b/examples/widgets/dialogs/extension/extension.desktop
index 374b1c8340..374b1c8340 100644
--- a/examples/dialogs/extension/extension.desktop
+++ b/examples/widgets/dialogs/extension/extension.desktop
diff --git a/examples/dialogs/extension/extension.pro b/examples/widgets/dialogs/extension/extension.pro
index 7e11dda4ab..7e11dda4ab 100644
--- a/examples/dialogs/extension/extension.pro
+++ b/examples/widgets/dialogs/extension/extension.pro
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/widgets/dialogs/extension/finddialog.cpp
index c21ebf67c5..c21ebf67c5 100644
--- a/examples/dialogs/extension/finddialog.cpp
+++ b/examples/widgets/dialogs/extension/finddialog.cpp
diff --git a/examples/dialogs/extension/finddialog.h b/examples/widgets/dialogs/extension/finddialog.h
index 5599ac2c09..5599ac2c09 100644
--- a/examples/dialogs/extension/finddialog.h
+++ b/examples/widgets/dialogs/extension/finddialog.h
diff --git a/examples/dialogs/extension/main.cpp b/examples/widgets/dialogs/extension/main.cpp
index f0eff079ed..f0eff079ed 100644
--- a/examples/dialogs/extension/main.cpp
+++ b/examples/widgets/dialogs/extension/main.cpp
diff --git a/examples/dialogs/findfiles/findfiles.desktop b/examples/widgets/dialogs/findfiles/findfiles.desktop
index 04c91cd76d..04c91cd76d 100644
--- a/examples/dialogs/findfiles/findfiles.desktop
+++ b/examples/widgets/dialogs/findfiles/findfiles.desktop
diff --git a/examples/dialogs/findfiles/findfiles.pro b/examples/widgets/dialogs/findfiles/findfiles.pro
index 51d1c0eed1..51d1c0eed1 100644
--- a/examples/dialogs/findfiles/findfiles.pro
+++ b/examples/widgets/dialogs/findfiles/findfiles.pro
diff --git a/examples/dialogs/findfiles/main.cpp b/examples/widgets/dialogs/findfiles/main.cpp
index dcbf1c0449..dcbf1c0449 100644
--- a/examples/dialogs/findfiles/main.cpp
+++ b/examples/widgets/dialogs/findfiles/main.cpp
diff --git a/examples/dialogs/findfiles/window.cpp b/examples/widgets/dialogs/findfiles/window.cpp
index 6b89436dc8..6b89436dc8 100644
--- a/examples/dialogs/findfiles/window.cpp
+++ b/examples/widgets/dialogs/findfiles/window.cpp
diff --git a/examples/dialogs/findfiles/window.h b/examples/widgets/dialogs/findfiles/window.h
index 0203de8a17..0203de8a17 100644
--- a/examples/dialogs/findfiles/window.h
+++ b/examples/widgets/dialogs/findfiles/window.h
diff --git a/examples/dialogs/licensewizard/images/logo.png b/examples/widgets/dialogs/licensewizard/images/logo.png
index 56f17a3e5a..56f17a3e5a 100644
--- a/examples/dialogs/licensewizard/images/logo.png
+++ b/examples/widgets/dialogs/licensewizard/images/logo.png
diff --git a/examples/dialogs/licensewizard/images/watermark.png b/examples/widgets/dialogs/licensewizard/images/watermark.png
index 124a05068b..124a05068b 100644
--- a/examples/dialogs/licensewizard/images/watermark.png
+++ b/examples/widgets/dialogs/licensewizard/images/watermark.png
diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/widgets/dialogs/licensewizard/licensewizard.cpp
index 501f8e310c..501f8e310c 100644
--- a/examples/dialogs/licensewizard/licensewizard.cpp
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.cpp
diff --git a/examples/dialogs/licensewizard/licensewizard.desktop b/examples/widgets/dialogs/licensewizard/licensewizard.desktop
index 423d81e9b3..423d81e9b3 100644
--- a/examples/dialogs/licensewizard/licensewizard.desktop
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.desktop
diff --git a/examples/dialogs/licensewizard/licensewizard.h b/examples/widgets/dialogs/licensewizard/licensewizard.h
index 24ee45d6dd..24ee45d6dd 100644
--- a/examples/dialogs/licensewizard/licensewizard.h
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.h
diff --git a/examples/dialogs/licensewizard/licensewizard.pro b/examples/widgets/dialogs/licensewizard/licensewizard.pro
index c61325772e..c61325772e 100644
--- a/examples/dialogs/licensewizard/licensewizard.pro
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.pro
diff --git a/examples/dialogs/licensewizard/licensewizard.qrc b/examples/widgets/dialogs/licensewizard/licensewizard.qrc
index b069938515..b069938515 100644
--- a/examples/dialogs/licensewizard/licensewizard.qrc
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.qrc
diff --git a/examples/dialogs/licensewizard/main.cpp b/examples/widgets/dialogs/licensewizard/main.cpp
index c7771d7676..c7771d7676 100644
--- a/examples/dialogs/licensewizard/main.cpp
+++ b/examples/widgets/dialogs/licensewizard/main.cpp
diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/widgets/dialogs/sipdialog/dialog.cpp
index fdfbc94ca4..fdfbc94ca4 100644
--- a/examples/dialogs/sipdialog/dialog.cpp
+++ b/examples/widgets/dialogs/sipdialog/dialog.cpp
diff --git a/examples/dialogs/sipdialog/dialog.h b/examples/widgets/dialogs/sipdialog/dialog.h
index 18eb92d857..18eb92d857 100644
--- a/examples/dialogs/sipdialog/dialog.h
+++ b/examples/widgets/dialogs/sipdialog/dialog.h
diff --git a/examples/dialogs/sipdialog/main.cpp b/examples/widgets/dialogs/sipdialog/main.cpp
index 79fd956fb9..79fd956fb9 100644
--- a/examples/dialogs/sipdialog/main.cpp
+++ b/examples/widgets/dialogs/sipdialog/main.cpp
diff --git a/examples/dialogs/sipdialog/sipdialog.desktop b/examples/widgets/dialogs/sipdialog/sipdialog.desktop
index b9c9955339..b9c9955339 100644
--- a/examples/dialogs/sipdialog/sipdialog.desktop
+++ b/examples/widgets/dialogs/sipdialog/sipdialog.desktop
diff --git a/examples/dialogs/sipdialog/sipdialog.pro b/examples/widgets/dialogs/sipdialog/sipdialog.pro
index 72db93f646..72db93f646 100644
--- a/examples/dialogs/sipdialog/sipdialog.pro
+++ b/examples/widgets/dialogs/sipdialog/sipdialog.pro
diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp
index bde96c516b..bde96c516b 100644
--- a/examples/dialogs/standarddialogs/dialog.cpp
+++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp
diff --git a/examples/dialogs/standarddialogs/dialog.h b/examples/widgets/dialogs/standarddialogs/dialog.h
index 2b14d793d6..2b14d793d6 100644
--- a/examples/dialogs/standarddialogs/dialog.h
+++ b/examples/widgets/dialogs/standarddialogs/dialog.h
diff --git a/examples/dialogs/standarddialogs/main.cpp b/examples/widgets/dialogs/standarddialogs/main.cpp
index 001239929e..001239929e 100644
--- a/examples/dialogs/standarddialogs/main.cpp
+++ b/examples/widgets/dialogs/standarddialogs/main.cpp
diff --git a/examples/dialogs/standarddialogs/standarddialogs.desktop b/examples/widgets/dialogs/standarddialogs/standarddialogs.desktop
index f74830317a..f74830317a 100644
--- a/examples/dialogs/standarddialogs/standarddialogs.desktop
+++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.desktop
diff --git a/examples/dialogs/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro
index cbcb4d7302..cbcb4d7302 100644
--- a/examples/dialogs/standarddialogs/standarddialogs.pro
+++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro
diff --git a/examples/dialogs/tabdialog/main.cpp b/examples/widgets/dialogs/tabdialog/main.cpp
index 119a4c272c..119a4c272c 100644
--- a/examples/dialogs/tabdialog/main.cpp
+++ b/examples/widgets/dialogs/tabdialog/main.cpp
diff --git a/examples/dialogs/tabdialog/tabdialog.cpp b/examples/widgets/dialogs/tabdialog/tabdialog.cpp
index 00e3706c5c..00e3706c5c 100644
--- a/examples/dialogs/tabdialog/tabdialog.cpp
+++ b/examples/widgets/dialogs/tabdialog/tabdialog.cpp
diff --git a/examples/dialogs/tabdialog/tabdialog.desktop b/examples/widgets/dialogs/tabdialog/tabdialog.desktop
index 651f7d4068..651f7d4068 100644
--- a/examples/dialogs/tabdialog/tabdialog.desktop
+++ b/examples/widgets/dialogs/tabdialog/tabdialog.desktop
diff --git a/examples/dialogs/tabdialog/tabdialog.h b/examples/widgets/dialogs/tabdialog/tabdialog.h
index c2b46f0e92..c2b46f0e92 100644
--- a/examples/dialogs/tabdialog/tabdialog.h
+++ b/examples/widgets/dialogs/tabdialog/tabdialog.h
diff --git a/examples/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro
index 66ac14daf2..66ac14daf2 100644
--- a/examples/dialogs/tabdialog/tabdialog.pro
+++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro
diff --git a/examples/dialogs/trivialwizard/trivialwizard.cpp b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp
index f8209405d9..f8209405d9 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.cpp
+++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.cpp
diff --git a/examples/dialogs/trivialwizard/trivialwizard.desktop b/examples/widgets/dialogs/trivialwizard/trivialwizard.desktop
index fad568ecc8..fad568ecc8 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.desktop
+++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.desktop
diff --git a/examples/dialogs/trivialwizard/trivialwizard.pro b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro
index 26d488d99d..26d488d99d 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.pro
+++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro
diff --git a/doc/src/examples/addressbook.qdoc b/examples/widgets/doc/addressbook.qdoc
index 9b4ede5775..9b4ede5775 100644
--- a/doc/src/examples/addressbook.qdoc
+++ b/examples/widgets/doc/addressbook.qdoc
diff --git a/doc/src/examples/affine.qdoc b/examples/widgets/doc/affine.qdoc
index c69794d511..c69794d511 100644
--- a/doc/src/examples/affine.qdoc
+++ b/examples/widgets/doc/affine.qdoc
diff --git a/doc/src/examples/analogclock.qdoc b/examples/widgets/doc/analogclock.qdoc
index 4385da07b6..bb4bdb54ae 100644
--- a/doc/src/examples/analogclock.qdoc
+++ b/examples/widgets/doc/analogclock.qdoc
@@ -45,11 +45,11 @@
     We subclass \l QWidget and reimplement the standard
     \l{QWidget::paintEvent()}{paintEvent()} function to draw the clock face:
 
-    \snippet examples/widgets/analogclock/analogclock.h 0
+    \snippet widgets/analogclock/analogclock.h 0
 
     \section1 AnalogClock Class Implementation
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 1
+    \snippet widgets/analogclock/analogclock.cpp 1
 
     When the widget is constructed, we set up a one-second timer to
     keep track of the current time, and we connect it to the standard
@@ -60,8 +60,8 @@
     Finally, we resize the widget so that it is displayed at a
     reasonable size.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 8
-    \snippet examples/widgets/analogclock/analogclock.cpp 10
+    \snippet widgets/analogclock/analogclock.cpp 8
+    \snippet widgets/analogclock/analogclock.cpp 10
 
     The \c paintEvent() function is called whenever the widget's
     contents need to be updated. This happens when the widget is
@@ -80,10 +80,10 @@
     can fit the clock face inside the widget. It is also useful to determine
     the current time before we start drawing.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 11
-    \snippet examples/widgets/analogclock/analogclock.cpp 12
-    \snippet examples/widgets/analogclock/analogclock.cpp 13
-    \snippet examples/widgets/analogclock/analogclock.cpp 14
+    \snippet widgets/analogclock/analogclock.cpp 11
+    \snippet widgets/analogclock/analogclock.cpp 12
+    \snippet widgets/analogclock/analogclock.cpp 13
+    \snippet widgets/analogclock/analogclock.cpp 14
 
     The contents of custom widgets are drawn with a QPainter.
     Painters can be used to draw on any QPaintDevice, but they are
@@ -116,37 +116,37 @@
     hour and minute. This means that the hand will be shown rotated clockwise
     by the required amount.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 15
-    \snippet examples/widgets/analogclock/analogclock.cpp 16
+    \snippet widgets/analogclock/analogclock.cpp 15
+    \snippet widgets/analogclock/analogclock.cpp 16
 
     We set the pen to be Qt::NoPen because we don't want any outline,
     and we use a solid brush with the color appropriate for
     displaying hours. Brushes are used when filling in polygons and
     other geometric shapes.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 17
-    \snippet examples/widgets/analogclock/analogclock.cpp 19
+    \snippet widgets/analogclock/analogclock.cpp 17
+    \snippet widgets/analogclock/analogclock.cpp 19
 
     We save and restore the transformation matrix before and after the
     rotation because we want to place the minute hand without having to
     take into account any previous rotations.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 20
+    \snippet widgets/analogclock/analogclock.cpp 20
     \codeline
-    \snippet examples/widgets/analogclock/analogclock.cpp 21
+    \snippet widgets/analogclock/analogclock.cpp 21
 
     We draw markers around the edge of the clock for each hour. We
     draw each marker then rotate the coordinate system so that the
     painter is ready for the next one.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 22
-    \snippet examples/widgets/analogclock/analogclock.cpp 23
+    \snippet widgets/analogclock/analogclock.cpp 22
+    \snippet widgets/analogclock/analogclock.cpp 23
 
     The minute hand is rotated in a similar way to the hour hand.
 
-    \snippet examples/widgets/analogclock/analogclock.cpp 25
+    \snippet widgets/analogclock/analogclock.cpp 25
     \codeline
-    \snippet examples/widgets/analogclock/analogclock.cpp 26
+    \snippet widgets/analogclock/analogclock.cpp 26
 
     Again, we draw markers around the edge of the clock, but this
     time to indicate minutes. We skip multiples of 5 to avoid drawing
diff --git a/doc/src/examples/animatedtiles.qdoc b/examples/widgets/doc/animatedtiles.qdoc
index 4fe25388cf..4fe25388cf 100644
--- a/doc/src/examples/animatedtiles.qdoc
+++ b/examples/widgets/doc/animatedtiles.qdoc
diff --git a/doc/src/examples/appchooser.qdoc b/examples/widgets/doc/appchooser.qdoc
index 092db7c29e..092db7c29e 100644
--- a/doc/src/examples/appchooser.qdoc
+++ b/examples/widgets/doc/appchooser.qdoc
diff --git a/doc/src/examples/application.qdoc b/examples/widgets/doc/application.qdoc
index 9cfdc08134..d99581fefd 100644
--- a/doc/src/examples/application.qdoc
+++ b/examples/widgets/doc/application.qdoc
@@ -59,7 +59,7 @@
 
     Here's the class definition:
 
-    \snippet examples/mainwindows/application/mainwindow.h 0
+    \snippet mainwindows/application/mainwindow.h 0
 
     The public API is restricted to the constructor. In the \c
     protected section, we reimplement QWidget::closeEvent() to detect
@@ -72,7 +72,7 @@
 
     \section1 MainWindow Class Implementation
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 0
+    \snippet mainwindows/application/mainwindow.cpp 0
 
     We start by including \c <QtGui>, a header file that contains the
     definition of all classes in the \l QtCore and \l QtGui
@@ -86,8 +86,8 @@
     generally a good idea to include only the header files that are
     strictly necessary from another header file.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 1
-    \snippet examples/mainwindows/application/mainwindow.cpp 2
+    \snippet mainwindows/application/mainwindow.cpp 1
+    \snippet mainwindows/application/mainwindow.cpp 2
 
     In the constructor, we start by creating a QPlainTextEdit widget as a
     child of the main window (the \c this object). Then we call
@@ -109,8 +109,8 @@
     \c setCurrentFile() function. We'll come back to this later.
 
     \target close event handler
-    \snippet examples/mainwindows/application/mainwindow.cpp 3
-    \snippet examples/mainwindows/application/mainwindow.cpp 4
+    \snippet mainwindows/application/mainwindow.cpp 3
+    \snippet mainwindows/application/mainwindow.cpp 4
 
     When the user attempts to close the window, we call the private
     function \c maybeSave() to give the user the possibility to save
@@ -121,8 +121,8 @@
     that the application will stay up and running as if nothing
     happened.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 5
-    \snippet examples/mainwindows/application/mainwindow.cpp 6
+    \snippet mainwindows/application/mainwindow.cpp 5
+    \snippet mainwindows/application/mainwindow.cpp 6
 
     The \c newFile() slot is invoked when the user selects
     \menu{File|New} from the menu. We call \c maybeSave() to save any
@@ -131,8 +131,8 @@
     update the window title and clear the
     \l{QWidget::windowModified}{windowModified} flag.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 7
-    \snippet examples/mainwindows/application/mainwindow.cpp 8
+    \snippet mainwindows/application/mainwindow.cpp 7
+    \snippet mainwindows/application/mainwindow.cpp 8
 
     The \c open() slot is invoked when the user clicks
     \menu{File|Open}. We pop up a QFileDialog asking the user to
@@ -140,23 +140,23 @@
     not an empty string), we call the private function \c loadFile()
     to actually load the file.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 9
-    \snippet examples/mainwindows/application/mainwindow.cpp 10
+    \snippet mainwindows/application/mainwindow.cpp 9
+    \snippet mainwindows/application/mainwindow.cpp 10
 
     The \c save() slot is invoked when the user clicks
     \menu{File|Save}. If the user hasn't provided a name for the file
     yet, we call \c saveAs(); otherwise, we call the private function
     \c saveFile() to actually save the file.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 11
-    \snippet examples/mainwindows/application/mainwindow.cpp 12
+    \snippet mainwindows/application/mainwindow.cpp 11
+    \snippet mainwindows/application/mainwindow.cpp 12
 
     In \c saveAs(), we start by popping up a QFileDialog asking the
     user to provide a name. If the user clicks \uicontrol{Cancel}, the
     returned file name is empty, and we do nothing.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 13
-    \snippet examples/mainwindows/application/mainwindow.cpp 14
+    \snippet mainwindows/application/mainwindow.cpp 13
+    \snippet mainwindows/application/mainwindow.cpp 14
 
     The application's About box is done using one statement, using
     the QMessageBox::about() static function and relying on its
@@ -169,18 +169,18 @@
     The \l{Internationalization with Qt} overview covers
     \l{QObject::tr()}{tr()} in more detail.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 15
-    \snippet examples/mainwindows/application/mainwindow.cpp 16
+    \snippet mainwindows/application/mainwindow.cpp 15
+    \snippet mainwindows/application/mainwindow.cpp 16
 
     The \c documentWasModified() slot is invoked each time the text
     in the QPlainTextEdit changes because of user edits. We call
     QWidget::setWindowModified() to make the title bar show that the
     file was modified. How this is done varies on each platform.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 17
-    \snippet examples/mainwindows/application/mainwindow.cpp 18
+    \snippet mainwindows/application/mainwindow.cpp 17
+    \snippet mainwindows/application/mainwindow.cpp 18
     \dots
-    \snippet examples/mainwindows/application/mainwindow.cpp 22
+    \snippet mainwindows/application/mainwindow.cpp 22
 
     The \c createActions() private function, which is called from the
     \c MainWindow constructor, creates \l{QAction}s. The code is very
@@ -209,8 +209,8 @@
     to this when we review the \c application.qrc file that's part of
     the project.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 23
-    \snippet examples/mainwindows/application/mainwindow.cpp 24
+    \snippet mainwindows/application/mainwindow.cpp 23
+    \snippet mainwindows/application/mainwindow.cpp 24
 
     The \uicontrol{Edit|Cut} and \uicontrol{Edit|Copy} actions must be available
     only when the QPlainTextEdit contains selected text. We disable them
@@ -218,8 +218,8 @@
     the QAction::setEnabled() slot, ensuring that the actions are
     disabled when the text editor has no selection.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 25
-    \snippet examples/mainwindows/application/mainwindow.cpp 27
+    \snippet mainwindows/application/mainwindow.cpp 25
+    \snippet mainwindows/application/mainwindow.cpp 27
 
     Creating actions isn't sufficient to make them available to the
     user; we must also add them to the menu system. This is what \c
@@ -240,21 +240,21 @@
 
     Let's now review the toolbars:
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 30
+    \snippet mainwindows/application/mainwindow.cpp 30
 
     Creating toolbars is very similar to creating menus. The same
     actions that we put in the menus can be reused in the toolbars.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 32
-    \snippet examples/mainwindows/application/mainwindow.cpp 33
+    \snippet mainwindows/application/mainwindow.cpp 32
+    \snippet mainwindows/application/mainwindow.cpp 33
 
     QMainWindow::statusBar() returns a pointer to the main window's
     QStatusBar widget. Like with \l{QMainWindow::menuBar()}, the
     widget is automatically created the first time the function is
     called.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 34
-    \snippet examples/mainwindows/application/mainwindow.cpp 36
+    \snippet mainwindows/application/mainwindow.cpp 34
+    \snippet mainwindows/application/mainwindow.cpp 36
 
     The \c readSettings() function is called from the constructor to
     load the user's preferences and other application settings. The
@@ -277,16 +277,16 @@
     to call QWidget::resize() before QWidget::move(). The reason why
     is given in the \l{Window Geometry} overview.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 37
-    \snippet examples/mainwindows/application/mainwindow.cpp 39
+    \snippet mainwindows/application/mainwindow.cpp 37
+    \snippet mainwindows/application/mainwindow.cpp 39
 
     The \c writeSettings() function is called from \c closeEvent().
     Writing settings is similar to reading them, except simpler. The
     arguments to the QSettings constructor must be the same as in \c
     readSettings().
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 40
-    \snippet examples/mainwindows/application/mainwindow.cpp 41
+    \snippet mainwindows/application/mainwindow.cpp 40
+    \snippet mainwindows/application/mainwindow.cpp 41
 
     The \c maybeSave() function is called to save pending changes. If
     there are pending changes, it pops up a QMessageBox giving the
@@ -303,8 +303,8 @@
     return value and stop whatever it was doing if the return value
     is \c false.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 42
-    \snippet examples/mainwindows/application/mainwindow.cpp 43
+    \snippet mainwindows/application/mainwindow.cpp 42
+    \snippet mainwindows/application/mainwindow.cpp 43
 
     In \c loadFile(), we use QFile and QTextStream to read in the
     data. The QFile object provides access to the bytes stored in a
@@ -331,15 +331,15 @@
     which we'll cover in a moment, and we display the string "File
     loaded" in the status bar for 2 seconds (2000 milliseconds).
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 44
-    \snippet examples/mainwindows/application/mainwindow.cpp 45
+    \snippet mainwindows/application/mainwindow.cpp 44
+    \snippet mainwindows/application/mainwindow.cpp 45
 
     Saving a file is very similar to loading one. Here, the
     QFile::Text flag ensures that on Windows, "\\n" is converted into
     "\\r\\n" to conform to the Windows convension.
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 46
-    \snippet examples/mainwindows/application/mainwindow.cpp 47
+    \snippet mainwindows/application/mainwindow.cpp 46
+    \snippet mainwindows/application/mainwindow.cpp 47
 
     The \c setCurrentFile() function is called to reset the state of
     a few variables when a file is loaded or saved, or when the user
@@ -353,15 +353,15 @@
     QWidget::setWindowTitle() call shortens the file name to exclude
     the path. Here's the function:
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 48
-    \snippet examples/mainwindows/application/mainwindow.cpp 49
+    \snippet mainwindows/application/mainwindow.cpp 48
+    \snippet mainwindows/application/mainwindow.cpp 49
 
     \section1 The main() Function
 
     The \c main() function for this application is typical of
     applications that contain one main window:
 
-    \snippet examples/mainwindows/application/main.cpp 0
+    \snippet mainwindows/application/main.cpp 0
 
     \section1 The Resource File
 
@@ -385,7 +385,7 @@
     The resource file must be mentioned in the \c application.pro
     file  so that \c qmake knows about it:
 
-    \snippet examples/mainwindows/application/application.pro 0
+    \snippet mainwindows/application/application.pro 0
 
     \c qmake will produce make rules to generate a file called \c
     qrc_application.cpp that is linked into the application. This
diff --git a/doc/src/examples/basicdrawing.qdoc b/examples/widgets/doc/basicdrawing.qdoc
index 1c4053f847..899aa361f8 100644
--- a/doc/src/examples/basicdrawing.qdoc
+++ b/examples/widgets/doc/basicdrawing.qdoc
@@ -68,7 +68,7 @@
     window displaying a \c RenderArea widget in addition to several
     parameter widgets.
 
-    \snippet examples/painting/basicdrawing/window.h 0
+    \snippet painting/basicdrawing/window.h 0
 
     We declare the various widgets, and three private slots updating
     the \c RenderArea widget: The \c shapeChanged() slot updates the
@@ -83,14 +83,14 @@
     In the constructor we create and initialize the various widgets
     appearing in the main application window.
 
-    \snippet examples/painting/basicdrawing/window.cpp 1
+    \snippet painting/basicdrawing/window.cpp 1
 
     First we create the \c RenderArea widget that will render the
     currently active shape. Then we create the \uicontrol Shape combobox,
     and add the associated items (i.e. the different shapes a QPainter
     can draw).
 
-    \snippet examples/painting/basicdrawing/window.cpp 2
+    \snippet painting/basicdrawing/window.cpp 2
 
     QPainter's pen is a QPen object; the QPen class defines how a
     painter should draw lines and outlines of shapes. A pen has
@@ -103,7 +103,7 @@
 
     We create a QSpinBox for the \uicontrol {Pen Width} parameter.
 
-    \snippet examples/painting/basicdrawing/window.cpp 3
+    \snippet painting/basicdrawing/window.cpp 3
 
     The pen style defines the line type. The default style is solid
     (Qt::SolidLine). Setting the style to none (Qt::NoPen) tells the
@@ -117,7 +117,7 @@
     items (i.e the values of the Qt::PenStyle, Qt::PenCapStyle and
     Qt::PenJoinStyle enums respectively).
 
-    \snippet examples/painting/basicdrawing/window.cpp 4
+    \snippet painting/basicdrawing/window.cpp 4
 
     The QBrush class defines the fill pattern of shapes drawn by a
     QPainter. The default brush style is Qt::NoBrush. This style tells
@@ -127,8 +127,8 @@
     We create a QComboBox for the \uicontrol {Brush Style} parameter, and add
     the associated items (i.e. the values of the Qt::BrushStyle enum).
 
-    \snippet examples/painting/basicdrawing/window.cpp 5
-    \snippet examples/painting/basicdrawing/window.cpp 6
+    \snippet painting/basicdrawing/window.cpp 5
+    \snippet painting/basicdrawing/window.cpp 6
 
     Antialiasing is a feature that "smoothes" the pixels to create
     more even and less jagged lines, and can be applied using
@@ -138,7 +138,7 @@
 
     We simply create a QCheckBox for the \uicontrol Antialiasing option.
 
-    \snippet examples/painting/basicdrawing/window.cpp 7
+    \snippet painting/basicdrawing/window.cpp 7
 
     The \uicontrol Transformations option implies a manipulation of the
     coordinate system that will appear as if the rendered shape is
@@ -148,21 +148,21 @@
     QPainter::scale() functions to implement this feature represented
     in the main application window by a simple QCheckBox.
 
-    \snippet examples/painting/basicdrawing/window.cpp 8
+    \snippet painting/basicdrawing/window.cpp 8
 
     Then we connect the parameter widgets with their associated slots
     using the static QObject::connect() function, ensuring that the \c
     RenderArea widget is updated whenever the user changes the shape,
     or any of the other parameters.
 
-    \snippet examples/painting/basicdrawing/window.cpp 9
-    \snippet examples/painting/basicdrawing/window.cpp 10
+    \snippet painting/basicdrawing/window.cpp 9
+    \snippet painting/basicdrawing/window.cpp 10
 
     Finally, we add the various widgets to a layout, and call the \c
     shapeChanged(), \c penChanged(), and \c brushChanged() slots to
     initialize the application. We also turn on antialiasing.
 
-    \snippet examples/painting/basicdrawing/window.cpp 11
+    \snippet painting/basicdrawing/window.cpp 11
 
     The \c shapeChanged() slot is called whenever the user changes the
     currently active shape.
@@ -185,7 +185,7 @@
     add the following line of code to the beginning of the \c
     window.cpp file.
 
-    \snippet examples/painting/basicdrawing/window.cpp 0
+    \snippet painting/basicdrawing/window.cpp 0
 
     The QComboBox::itemData() function returns the data as a QVariant,
     so we need to cast the data to \c RenderArea::Shape. If there is
@@ -195,20 +195,20 @@
     In the end we call the \c RenderArea::setShape() slot to update
     the \c RenderArea widget.
 
-    \snippet examples/painting/basicdrawing/window.cpp 12
+    \snippet painting/basicdrawing/window.cpp 12
 
     We call the \c penChanged() slot whenever the user changes any of
     the pen parameters. Again we use the QComboBox::itemData()
     function to retrieve the parameters, and then we call the \c
     RenderArea::setPen() slot to update the \c RenderArea widget.
 
-    \snippet examples/painting/basicdrawing/window.cpp 13
+    \snippet painting/basicdrawing/window.cpp 13
 
     The brushChanged() slot is called whenever the user changes the
     brush parameter which we retrieve using the QComboBox::itemData()
     function as before.
 
-    \snippet examples/painting/basicdrawing/window.cpp 14
+    \snippet painting/basicdrawing/window.cpp 14
 
     If the brush parameter is a gradient fill, special actions are
     required.
@@ -232,7 +232,7 @@
     In the end we call \c RenderArea::setBrush() slot to update the \c
     RenderArea widget's brush with the QLinearGradient object.
 
-    \snippet examples/painting/basicdrawing/window.cpp 15
+    \snippet painting/basicdrawing/window.cpp 15
 
     A similar pattern of actions, as the one used for QLinearGradient,
     is used in the cases of Qt::RadialGradientPattern and
@@ -247,13 +247,13 @@
     first argument specifies the center of the conical, and the second
     specifies the start angle of the interpolation.
 
-    \snippet examples/painting/basicdrawing/window.cpp 16
+    \snippet painting/basicdrawing/window.cpp 16
 
     If the brush style is Qt::TexturePattern we create a QBrush from a
     QPixmap. Then we call \c RenderArea::setBrush() slot to update the
     \c RenderArea widget with the newly created brush.
 
-    \snippet examples/painting/basicdrawing/window.cpp 17
+    \snippet painting/basicdrawing/window.cpp 17
 
     Otherwise we simply create a brush with the given style and a
     green color, and then call \c RenderArea::setBrush() slot to
@@ -264,7 +264,7 @@
     The \c RenderArea class inherits QWidget, and renders multiple
     copies of the currently active shape using a QPainter.
 
-    \snippet examples/painting/basicdrawing/renderarea.h 0
+    \snippet painting/basicdrawing/renderarea.h 0
 
     First we define a public \c Shape enum to hold the different
     shapes that can be rendered by the widget (i.e the shapes that can
@@ -287,7 +287,7 @@
 
     In the constructor we initialize some of the widget's variables.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 0
+    \snippet painting/basicdrawing/renderarea.cpp 0
 
     We set its shape to be a \uicontrol Polygon, its antialiased property to
     be false and we load an image into the widget's pixmap
@@ -296,7 +296,7 @@
     will be used to render the background. QPalette::Base is typically
     white.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 2
+    \snippet painting/basicdrawing/renderarea.cpp 2
 
     The \c RenderArea inherits QWidget's \l
     {QWidget::sizeHint()}{sizeHint} property holding the recommended
@@ -310,7 +310,7 @@
     Our reimplementation of the function returns a QSize with a 400
     pixels width and a 200 pixels height.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 1
+    \snippet painting/basicdrawing/renderarea.cpp 1
 
     \c RenderArea also inherits QWidget's
     \l{QWidget::minimumSizeHint()}{minimumSizeHint} property holding
@@ -324,11 +324,11 @@
     Our reimplementation of the function returns a QSize with a 100
     pixels width and a 100 pixels height.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 3
+    \snippet painting/basicdrawing/renderarea.cpp 3
     \codeline
-    \snippet examples/painting/basicdrawing/renderarea.cpp 4
+    \snippet painting/basicdrawing/renderarea.cpp 4
     \codeline
-    \snippet examples/painting/basicdrawing/renderarea.cpp 5
+    \snippet painting/basicdrawing/renderarea.cpp 5
 
     The public \c setShape(), \c setPen() and \c setBrush() slots are
     called whenever we want to modify a \c RenderArea widget's shape,
@@ -340,16 +340,16 @@
     repaint; instead it schedules a paint event for processing when Qt
     returns to the main event loop.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 6
+    \snippet painting/basicdrawing/renderarea.cpp 6
     \codeline
-    \snippet examples/painting/basicdrawing/renderarea.cpp 7
+    \snippet painting/basicdrawing/renderarea.cpp 7
 
     With the \c setAntialiased() and \c setTransformed() slots we
     change the state of the properties according to the slot
     parameter, and call the QWidget::update() slot to make the changes
     visible in the \c RenderArea widget.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 8
+    \snippet painting/basicdrawing/renderarea.cpp 8
 
     Then we reimplement the QWidget::paintEvent() function. The first
     thing we do is to create the graphical objects we will need to
@@ -373,7 +373,7 @@
     In addition we define a start angle and an arc length that we will
     use when drawing the \uicontrol Arc, \uicontrol Chord and \uicontrol Pie shapes.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 9
+    \snippet painting/basicdrawing/renderarea.cpp 9
 
     We create a QPainter for the \c RenderArea widget, and set the
     painters pen and brush according to the \c RenderArea's pen and
@@ -382,7 +382,7 @@
     indicates that the engine should antialias edges of primitives if
     possible.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 10
+    \snippet painting/basicdrawing/renderarea.cpp 10
 
     Finally, we render the multiple copies of the \c RenderArea's
     shape. The number of copies is depending on the size of the \c
@@ -397,7 +397,7 @@
     will be rendered on top of each other in the top left cormer of
     the \c RenderArea widget.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 11
+    \snippet painting/basicdrawing/renderarea.cpp 11
 
     If the \uicontrol Transformations parameter option is checked, we do an
     additional translation of the coordinate system before we rotate
@@ -409,7 +409,7 @@
     Now, when rendering the shape, it will appear as if it was rotated
     in three dimensions.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 12
+    \snippet painting/basicdrawing/renderarea.cpp 12
 
     Next, we identify the \c RenderArea's shape, and render it using
     the associated QPainter drawing function:
@@ -437,7 +437,7 @@
     lose the knowledge of this point unless we save the current
     painter state \e before we start the translating process.
 
-    \snippet examples/painting/basicdrawing/renderarea.cpp 13
+    \snippet painting/basicdrawing/renderarea.cpp 13
 
     Then, when we are finished rendering a copy of the shape we can
     restore the original painter state, with its associated coordinate
diff --git a/doc/src/examples/basicgraphicslayouts.qdoc b/examples/widgets/doc/basicgraphicslayouts.qdoc
index b7023cf9ca..9f52b3eafa 100644
--- a/doc/src/examples/basicgraphicslayouts.qdoc
+++ b/examples/widgets/doc/basicgraphicslayouts.qdoc
@@ -40,7 +40,7 @@
     The \c Window class is a subclass of QGraphicsWidget. It has a
     constructor with a QGraphicsWidget \a parent as its parameter.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/window.h 0
+    \snippet graphicsview/basicgraphicslayouts/window.h 0
 
     \section1 Window Class Implementation
 
@@ -52,7 +52,7 @@
     \c item with a \l{QGraphicsLinearLayout::setStretchFactor()}
     {stretchFactor}.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 0
+    \snippet graphicsview/basicgraphicslayouts/window.cpp 0
 
     We repeat the process:
 
@@ -62,7 +62,7 @@
         \li provide a stretch factor.
     \endlist
 
-    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 1
+    \snippet graphicsview/basicgraphicslayouts/window.cpp 1
 
     We then add \c linear to \c windowLayout, nesting two
     QGraphicsLinearLayout objects. Apart from the QGraphicsLinearLayout, we
@@ -73,7 +73,7 @@
     the \l{QGraphicsGridLayout::}{addItem()} function as shown in the code
     snippet below:
 
-    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 2
+    \snippet graphicsview/basicgraphicslayouts/window.cpp 2
 
     The first item we add to \c grid is placed in the top left cell,
     spanning four rows. The next two items are placed in the second column,
@@ -94,7 +94,7 @@
     add an item to a layout, it will be automatically reparented to the widget
     on which the layout is installed.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/window.cpp 3
+    \snippet graphicsview/basicgraphicslayouts/window.cpp 3
 
     Now that we have set up \c grid and added it to \c windowLayout, we
     install \c windowLayout onto the window object using
@@ -112,7 +112,7 @@
     {QGraphicsItem::boundingRect()}{boundingRect()} and
     {QGraphicsItem::paint()}{paint()}.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.h 0
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.h 0
 
     The \c LayoutItem class also has a private instance of QPixmap, \c m_pix.
 
@@ -121,17 +121,17 @@
     In \c{LayoutItem}'s constructor, \c m_pix is instantiated and the
     \c{block.png} image is loaded into it.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 0
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.cpp 0
 
     We use the Q_UNUSED() macro to prevent the compiler from generating
     warnings regarding unused parameters.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 1
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.cpp 1
 
     The idea behind the \c paint() function is to paint the
     background rect then paint a rect around the pixmap.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 2
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.cpp 2
 
     The reimplementation of \l{QGraphicsItem::}{boundingRect()}
     will set the top left corner at (0,0), and the size of it will be
@@ -139,7 +139,7 @@
     \l{QGraphicsLayoutItem::}{geometry()}. This is the area that
     we paint within.
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 3
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.cpp 3
 
 
     The reimplementation of \l{QGraphicsLayoutItem::setGeometry()}{setGeometry()}
@@ -148,7 +148,7 @@
     \l{QGraphicsItem::prepareGeometryChange()}{prepareGeometryChange()}.
     Finally, we move the item according to \c geom.topLeft().
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 4
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.cpp 4
 
 
     Since we don't want the size of the item to be smaller than the pixmap, we
@@ -159,6 +159,6 @@
     The preferred size is the same as the minimum size hint, while we set
     maximum to be a large value
 
-    \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 5
+    \snippet graphicsview/basicgraphicslayouts/layoutitem.cpp 5
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/src/examples/basiclayouts.qdoc b/examples/widgets/doc/basiclayouts.qdoc
index 37d9fcb70a..a0f083ba58 100644
--- a/doc/src/examples/basiclayouts.qdoc
+++ b/examples/widgets/doc/basiclayouts.qdoc
@@ -44,7 +44,7 @@
 
     \section1 Dialog Class Definition
 
-    \snippet examples/layouts/basiclayouts/dialog.h 0
+    \snippet layouts/basiclayouts/dialog.h 0
 
     The \c Dialog class inherits QDialog. It is a custom widget that
     displays its child widgets using the geometry managers:
@@ -58,7 +58,7 @@
 
     \section1 Dialog Class Implementation
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 0
+    \snippet layouts/basiclayouts/dialog.cpp 0
 
     In the constructor, we first use the \c createMenu() function to
     create and populate a menu bar and the \c createHorizontalGroupBox()
@@ -70,7 +70,7 @@
     three labels and three input fields: a line edit, a combo box and
     a spin box.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 1
+    \snippet layouts/basiclayouts/dialog.cpp 1
 
     We also create a big text editor and a dialog button box. The
     QDialogButtonBox class is a widget that presents buttons in a
@@ -84,7 +84,7 @@
     it is automatically reparented to the widget the layout is
     installed on.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 2
+    \snippet layouts/basiclayouts/dialog.cpp 2
 
     The main layout is a QVBoxLayout object. QVBoxLayout is a
     convenience class for a box layout with vertical orientation.
@@ -97,14 +97,14 @@
     placed in a column.  The corresponding convenience classes are
     QHBoxLayout and QVBoxLayout, respectively.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 3
+    \snippet layouts/basiclayouts/dialog.cpp 3
 
     When we call the QLayout::setMenuBar() function, the layout places
     the provided menu bar at the top of the parent widget, and outside
     the widget's \l {QWidget::contentsRect()}{content margins}. All
     child widgets are placed below the bottom edge of the menu bar.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 4
+    \snippet layouts/basiclayouts/dialog.cpp 4
 
     We use the QBoxLayout::addWidget() function to add the widgets to
     the end of layout. Each widget will get at least its minimum size
@@ -113,25 +113,25 @@
     and any excess space is shared according to these stretch
     factors. If not specified, a widget's stretch factor is 0.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 5
+    \snippet layouts/basiclayouts/dialog.cpp 5
 
     We install the main layout on the \c Dialog widget using the
     QWidget::setLayout() function, and all of the layout's widgets are
     automatically reparented to be children of the \c Dialog widget.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 6
+    \snippet layouts/basiclayouts/dialog.cpp 6
 
     In the private \c createMenu() function we create a menu bar, and
     add a pull-down \uicontrol File menu containing an \uicontrol Exit option.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 7
+    \snippet layouts/basiclayouts/dialog.cpp 7
 
     When we create the horizontal group box, we use a QHBoxLayout as
     the internal layout. We create the buttons we want to put in the
     group box, add them to the layout and install the layout on the
     group box.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 8
+    \snippet layouts/basiclayouts/dialog.cpp 8
 
     In the \c createGridGroupBox() function we use a QGridLayout which
     lays out widgets in a grid. It takes the space made available to
@@ -139,7 +139,7 @@
     into rows and columns, and puts each widget it manages into the
     correct cell.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 9
+    \snippet layouts/basiclayouts/dialog.cpp 9
 
     For each row in the grid we create a label and an associated line
     edit, and add them to the layout. The QGridLayout::addWidget()
@@ -147,7 +147,7 @@
     needs the row and column specifying the grid cell to put the
     widget in.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 10
+    \snippet layouts/basiclayouts/dialog.cpp 10
 
     QGridLayout::addWidget() can in addition take arguments
     specifying the number of rows and columns the cell will be
@@ -160,7 +160,7 @@
     could, for example, align a widget with the right edge by
     specifying the alignment to be Qt::AlignRight.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 11
+    \snippet layouts/basiclayouts/dialog.cpp 11
 
     Each column in a grid layout has a stretch factor. The stretch
     factor is set using QGridLayout::setColumnStretch() and determines
@@ -178,7 +178,7 @@
     stretch factor for rows, as well as a QGridLayout::setRowStretch()
     function.
 
-    \snippet examples/layouts/basiclayouts/dialog.cpp 12
+    \snippet layouts/basiclayouts/dialog.cpp 12
 
     In the \c createFormGroupBox() function, we use a QFormLayout
     to neatly arrange objects into two columns - name and field.
diff --git a/doc/src/examples/basicsortfiltermodel.qdoc b/examples/widgets/doc/basicsortfiltermodel.qdoc
index 0ecf4a0629..0ecf4a0629 100644
--- a/doc/src/examples/basicsortfiltermodel.qdoc
+++ b/examples/widgets/doc/basicsortfiltermodel.qdoc
diff --git a/doc/src/examples/blurpicker.qdoc b/examples/widgets/doc/blurpicker.qdoc
index bd57acb061..bd57acb061 100644
--- a/doc/src/examples/blurpicker.qdoc
+++ b/examples/widgets/doc/blurpicker.qdoc
diff --git a/doc/src/examples/borderlayout.qdoc b/examples/widgets/doc/borderlayout.qdoc
index aaff2dda1d..aaff2dda1d 100644
--- a/doc/src/examples/borderlayout.qdoc
+++ b/examples/widgets/doc/borderlayout.qdoc
diff --git a/doc/src/examples/boxes.qdoc b/examples/widgets/doc/boxes.qdoc
index aa34a61bc3..aa34a61bc3 100644
--- a/doc/src/examples/boxes.qdoc
+++ b/examples/widgets/doc/boxes.qdoc
diff --git a/doc/src/examples/calculator.qdoc b/examples/widgets/doc/calculator.qdoc
index 914b8c5299..8480d90477 100644
--- a/doc/src/examples/calculator.qdoc
+++ b/examples/widgets/doc/calculator.qdoc
@@ -49,7 +49,7 @@
 
     \section1 Calculator Class Definition
 
-    \snippet examples/widgets/calculator/calculator.h 0
+    \snippet widgets/calculator/calculator.h 0
 
     The \c Calculator class provides a simple calculator widget. It
     inherits from QDialog and has several private slots associated
@@ -65,8 +65,8 @@
     multiplicative operators (\uicontrol{\unicode{215}}, \uicontrol{\unicode{247}}). The other buttons
     have their own slots.
 
-    \snippet examples/widgets/calculator/calculator.h 1
-    \snippet examples/widgets/calculator/calculator.h 2
+    \snippet widgets/calculator/calculator.h 1
+    \snippet widgets/calculator/calculator.h 2
 
     The private \c createButton() function is used as part of the
     widget construction. \c abortOperation() is called whenever a
@@ -74,12 +74,12 @@
     applied to a negative number. \c calculate() applies a binary
     operator (\uicontrol{+}, \uicontrol{-}, \uicontrol{\unicode{215}}, or \uicontrol{\unicode{247}}).
 
-    \snippet examples/widgets/calculator/calculator.h 3
-    \snippet examples/widgets/calculator/calculator.h 4
-    \snippet examples/widgets/calculator/calculator.h 5
-    \snippet examples/widgets/calculator/calculator.h 6
-    \snippet examples/widgets/calculator/calculator.h 7
-    \snippet examples/widgets/calculator/calculator.h 8
+    \snippet widgets/calculator/calculator.h 3
+    \snippet widgets/calculator/calculator.h 4
+    \snippet widgets/calculator/calculator.h 5
+    \snippet widgets/calculator/calculator.h 6
+    \snippet widgets/calculator/calculator.h 7
+    \snippet widgets/calculator/calculator.h 8
 
     These variables, together with the contents of the calculator
     display (a QLineEdit), encode the state of the calculator:
@@ -125,24 +125,24 @@
     they can be applied immediately since the operand is already
     known when the operator button is clicked.
 
-    \snippet examples/widgets/calculator/calculator.h 9
+    \snippet widgets/calculator/calculator.h 9
     \codeline
-    \snippet examples/widgets/calculator/calculator.h 10
+    \snippet widgets/calculator/calculator.h 10
 
     Finally, we declare the variables associated with the display and the
     buttons used to display numerals.
 
     \section1 Calculator Class Implementation
 
-    \snippet examples/widgets/calculator/calculator.cpp 0
+    \snippet widgets/calculator/calculator.cpp 0
 
     In the constructor, we initialize the calculator's state. The \c
     pendingAdditiveOperator and \c pendingMultiplicativeOperator
     variables don't need to be initialized explicitly, because the
     QString constructor initializes them to empty strings.
 
-    \snippet examples/widgets/calculator/calculator.cpp 1
-    \snippet examples/widgets/calculator/calculator.cpp 2
+    \snippet widgets/calculator/calculator.cpp 1
+    \snippet widgets/calculator/calculator.cpp 2
 
     We create the QLineEdit representing the calculator's display and
     set up some of its properties. In particular, we set it to be
@@ -150,13 +150,13 @@
 
     We also enlarge \c{display}'s font by 8 points.
 
-    \snippet examples/widgets/calculator/calculator.cpp 4
+    \snippet widgets/calculator/calculator.cpp 4
 
     For each button, we call the private \c createButton() function with
     the proper text label and a slot to connect to the button.
 
-    \snippet examples/widgets/calculator/calculator.cpp 5
-    \snippet examples/widgets/calculator/calculator.cpp 6
+    \snippet widgets/calculator/calculator.cpp 5
+    \snippet widgets/calculator/calculator.cpp 6
 
     The layout is handled by a single QGridLayout. The
     QLayout::setSizeConstraint() call ensures that the \c Calculator
@@ -172,7 +172,7 @@
     column; for these we must also pass a row span and a column
     span.
 
-    \snippet examples/widgets/calculator/calculator.cpp 7
+    \snippet widgets/calculator/calculator.cpp 7
 
     Pressing one of the calculator's digit buttons will emit the
     button's \l{QToolButton::clicked()}{clicked()} signal, which will
@@ -198,8 +198,8 @@
 
     At the end, we append the new digit to the value in the display.
 
-    \snippet examples/widgets/calculator/calculator.cpp 8
-    \snippet examples/widgets/calculator/calculator.cpp 9
+    \snippet widgets/calculator/calculator.cpp 8
+    \snippet widgets/calculator/calculator.cpp 9
 
     The \c unaryOperatorClicked() slot is called whenever one of the
     unary operator buttons is clicked. Again a pointer to the clicked
@@ -215,8 +215,8 @@
     digit will be considered as a new operand, instead of being
     appended to the current value.
 
-    \snippet examples/widgets/calculator/calculator.cpp 10
-    \snippet examples/widgets/calculator/calculator.cpp 11
+    \snippet widgets/calculator/calculator.cpp 10
+    \snippet widgets/calculator/calculator.cpp 11
 
     The \c additiveOperatorClicked() slot is called when the user
     clicks the \uicontrol{+} or \uicontrol{-} button.
@@ -226,16 +226,16 @@
     multiplicative operators, since these have higher precedence than
     additive operators:
 
-    \snippet examples/widgets/calculator/calculator.cpp 12
-    \snippet examples/widgets/calculator/calculator.cpp 13
+    \snippet widgets/calculator/calculator.cpp 12
+    \snippet widgets/calculator/calculator.cpp 13
 
     If \uicontrol{\unicode{215}} or \uicontrol{\unicode{247}} has been clicked earlier, without clicking
     \uicontrol{=} afterward, the current value in the display is the right
     operand of the \uicontrol{\unicode{215}} or \uicontrol{\unicode{247}} operator and we can finally
     perform the operation and update the display.
 
-    \snippet examples/widgets/calculator/calculator.cpp 14
-    \snippet examples/widgets/calculator/calculator.cpp 15
+    \snippet widgets/calculator/calculator.cpp 14
+    \snippet widgets/calculator/calculator.cpp 15
 
     If \uicontrol{+} or \uicontrol{-} has been clicked earlier, \c sumSoFar is
     the left operand and the current value in the display is the
@@ -243,8 +243,8 @@
     operator, \c sumSoFar is simply set to be the text in the
     display.
 
-    \snippet examples/widgets/calculator/calculator.cpp 16
-    \snippet examples/widgets/calculator/calculator.cpp 17
+    \snippet widgets/calculator/calculator.cpp 16
+    \snippet widgets/calculator/calculator.cpp 17
 
     Finally, we can take care of the operator that was just clicked.
     Since we don't have the right-hand operand yet, we store the clicked
@@ -252,49 +252,49 @@
     apply the operation later, when we have a right operand, with \c
     sumSoFar as the left operand.
 
-    \snippet examples/widgets/calculator/calculator.cpp 18
+    \snippet widgets/calculator/calculator.cpp 18
 
     The \c multiplicativeOperatorClicked() slot is similar to \c
     additiveOperatorClicked(). We don't need to worry about pending
     additive operators here, because multiplicative operators have
     precedence over additive operators.
 
-    \snippet examples/widgets/calculator/calculator.cpp 20
+    \snippet widgets/calculator/calculator.cpp 20
 
     Like in \c additiveOperatorClicked(), we start by handing any
     pending multiplicative and additive operators. Then we display \c
     sumSoFar and reset the variable to zero. Resetting the variable
     to zero is necessary to avoid counting the value twice.
 
-    \snippet examples/widgets/calculator/calculator.cpp 22
+    \snippet widgets/calculator/calculator.cpp 22
 
     The \c pointClicked() slot adds a decimal point to the content in
     \c display.
 
-    \snippet examples/widgets/calculator/calculator.cpp 24
+    \snippet widgets/calculator/calculator.cpp 24
 
     The \c changeSignClicked() slot changes the sign of the value in
     \c display. If the current value is positive, we prepend a minus
     sign; if the current value is negative, we remove the first
     character from the value (the minus sign).
 
-    \snippet examples/widgets/calculator/calculator.cpp 26
+    \snippet widgets/calculator/calculator.cpp 26
 
     The \c backspaceClicked() removes the rightmost character in the
     display. If we get an empty string, we show "0" and set \c
     waitingForOperand to \c true.
 
-    \snippet examples/widgets/calculator/calculator.cpp 28
+    \snippet widgets/calculator/calculator.cpp 28
 
     The \c clear() slot resets the current operand to zero. It is
     equivalent to clicking \uicontrol Backspace enough times to erase the
     entire operand.
 
-    \snippet examples/widgets/calculator/calculator.cpp 30
+    \snippet widgets/calculator/calculator.cpp 30
 
     The \c clearAll() slot resets the calculator to its initial state.
 
-    \snippet examples/widgets/calculator/calculator.cpp 32
+    \snippet widgets/calculator/calculator.cpp 32
 
     The \c clearMemory() slot erases the sum kept in memory, \c
     readMemory() displays the sum as an operand, \c setMemory()
@@ -304,18 +304,18 @@
     equalClicked() to update \c sumSoFar and the value in the
     display.
 
-    \snippet examples/widgets/calculator/calculator.cpp 34
+    \snippet widgets/calculator/calculator.cpp 34
 
     The private \c createButton() function is called from the
     constructor to create calculator buttons.
 
-    \snippet examples/widgets/calculator/calculator.cpp 36
+    \snippet widgets/calculator/calculator.cpp 36
 
     The private \c abortOperation() function is called whenever a
     calculation fails. It resets the calculator state and displays
     "####".
 
-    \snippet examples/widgets/calculator/calculator.cpp 38
+    \snippet widgets/calculator/calculator.cpp 38
 
     The private \c calculate() function performs a binary operation.
     The right operand is given by \c rightOperand. For additive
@@ -327,7 +327,7 @@
 
     Let's now take a look at the \c Button class:
 
-    \snippet examples/widgets/calculator/button.h 0
+    \snippet widgets/calculator/button.h 0
 
     The \c Button class has a convenience constructor that takes a
     text label and a parent widget, and it reimplements QWidget::sizeHint()
@@ -336,7 +336,7 @@
 
     \section1 Button Class Implementation
 
-    \snippet examples/widgets/calculator/button.cpp 0
+    \snippet widgets/calculator/button.cpp 0
 
     The buttons' appearance is determined by the layout of the
     calculator widget through the size and
@@ -348,8 +348,8 @@
     expand to fill available space. Without this call, the different
     buttons in a same column would have different widths.
 
-    \snippet examples/widgets/calculator/button.cpp 1
-    \snippet examples/widgets/calculator/button.cpp 2
+    \snippet widgets/calculator/button.cpp 1
+    \snippet widgets/calculator/button.cpp 2
 
     In \l{QWidget::sizeHint()}{sizeHint()}, we try to return a size
     that looks good for most buttons. We reuse the size hint of the
diff --git a/doc/src/examples/calendar.qdoc b/examples/widgets/doc/calendar.qdoc
index aea9805669..b7fa7c8617 100644
--- a/doc/src/examples/calendar.qdoc
+++ b/examples/widgets/doc/calendar.qdoc
@@ -52,7 +52,7 @@
     allow the user to change the month and year shown. The font size used for the
     text can also be adjusted.
 
-    \snippet examples/richtext/calendar/mainwindow.h 0
+    \snippet richtext/calendar/mainwindow.h 0
 
     The private \c insertCalendar() function performs most of the work, relying on
     the \c fontSize and \c selectedDate variables to write useful information to
@@ -63,7 +63,7 @@
     The \c MainWindow constructor sets up the user interface and initializes
     variables used to generate a calendar for each month.
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 0
+    \snippet richtext/calendar/mainwindow.cpp 0
 
     We begin by setting default values for the selected date that will be highlighted
     in the calendar and the font size to be used. Since we are using a QMainWindow
@@ -74,7 +74,7 @@
     spin box for the year. These widgets are configured to provide a reasonable range
     of values for the user to try:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 1
+    \snippet richtext/calendar/mainwindow.cpp 1
 
     We use the \c selectedDate object to obtain the current month and year, and we
     set these in the combobox and spin box:
@@ -82,7 +82,7 @@
     The font size is displayed in a spin box which we restrict to a sensible range
     of values:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 2
+    \snippet richtext/calendar/mainwindow.cpp 2
 
     We construct an editor and use the \c insertCalendar() function to create
     a calendar for it. Each calendar is displayed in the same text editor; in
@@ -93,14 +93,14 @@
     effect on the appearance of the calendar unless we make some signal-slot
     connections:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 3
+    \snippet richtext/calendar/mainwindow.cpp 3
 
     The signals are connected to some simple slots in the \c MainWindow class
     which we will describe later.
 
     We create layouts to manage the widgets we constructed:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 4
+    \snippet richtext/calendar/mainwindow.cpp 4
 
     Finally, the central widget is set for the window.
 
@@ -109,7 +109,7 @@
     and \c fontSize variables, to produce a suitable plan for the specified
     month and year.
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 5
+    \snippet richtext/calendar/mainwindow.cpp 5
 
     We begin by clearing the editor's rich text document, and obtain a text
     cursor from the editor that we will use to add content. We also create a
@@ -120,7 +120,7 @@
     page with equal space to the left and right of it. All of these properties are
     set in a QTextTableFormat object:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 6
+    \snippet richtext/calendar/mainwindow.cpp 6
 
     Each cell in the table will be padded and spaced to make the text easier to
     read.
@@ -129,14 +129,14 @@
     percentage widths for each of them and set the constraints in the
     QTextTableFormat:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 7
+    \snippet richtext/calendar/mainwindow.cpp 7
 
     The constraints used for the column widths are only useful if the table has
     an appropriate number of columns. With the format for the table defined, we
     construct a new table with one row and seven columns at the current cursor
     position:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 8
+    \snippet richtext/calendar/mainwindow.cpp 8
 
     We only need one row to start with; more can be added as we need them. Using
     this approach means that we do not need to perform any date calculations
@@ -146,14 +146,14 @@
     the cursor is automatically moved inside the newly inserted object. This means
     that we can immediately start modifying the table from within:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 9
+    \snippet richtext/calendar/mainwindow.cpp 9
 
     Since the table has an outer frame, we obtain the frame and its format so that
     we can customize it. After making the changes we want, we set the frame's format
     using the modified format object. We have given the table an outer border one
     pixel wide.
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 10
+    \snippet richtext/calendar/mainwindow.cpp 10
 
     In a similar way, we obtain the cursor's current character format and
     create customized formats based on it.
@@ -163,7 +163,7 @@
     insert text. The following loop inserts the days of the week into the table
     as bold text:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 11
+    \snippet richtext/calendar/mainwindow.cpp 11
 
     For each day of the week, we obtain an existing table cell in the first row
     (row 0) using the table's \l{QTextTable::cellAt()}{cellAt()} function. Since
@@ -176,7 +176,7 @@
     purpose, and we use this cursor to insert text using the \c boldFormat
     character format that we created earlier:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 12
+    \snippet richtext/calendar/mainwindow.cpp 12
 
     Inserting text into document objects usually follows the same pattern.
     Each object can provide a new cursor that corresponds to the first valid
@@ -189,7 +189,7 @@
     encountered, it is inserted with a special format (created earlier) that
     makes it stand out:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 13
+    \snippet richtext/calendar/mainwindow.cpp 13
 
     We add a new row to the table at the end of each week only if the next week
     falls within the currently selected month.
@@ -197,24 +197,24 @@
     For each calendar that we create, we change the window title to reflect the
     currently selected month and year:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 14
+    \snippet richtext/calendar/mainwindow.cpp 14
 
     The \c insertCalendar() function relies on up-to-date values for the month,
     year, and font size. These are set in the following slots:
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 15
+    \snippet richtext/calendar/mainwindow.cpp 15
 
     The \c setFontSize() function simply changes the private \c fontSize variable
     before updating the calendar.
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 16
+    \snippet richtext/calendar/mainwindow.cpp 16
 
     The \c setMonth slot is called when the QComboBox used to select the month is
     updated. The value supplied is the currently selected row in the combobox.
     We add 1 to this value to obtain a valid month number, and create a new QDate
     based on the existing one. The calendar is then updated to use this new date.
 
-    \snippet examples/richtext/calendar/mainwindow.cpp 17
+    \snippet richtext/calendar/mainwindow.cpp 17
 
     The \c setYear() slot is called when the QDateTimeEdit used to select the
     year is updated. The value supplied is a QDate object; this makes
diff --git a/doc/src/examples/calendarwidget.qdoc b/examples/widgets/doc/calendarwidget.qdoc
index 45423cc2c6..ad15bbaa0c 100644
--- a/doc/src/examples/calendarwidget.qdoc
+++ b/examples/widgets/doc/calendarwidget.qdoc
@@ -84,9 +84,9 @@
 
     Here is the definition of the \c Window class:
 
-    \snippet examples/widgets/calendarwidget/window.h 0
+    \snippet widgets/calendarwidget/window.h 0
     \dots
-    \snippet examples/widgets/calendarwidget/window.h 1
+    \snippet widgets/calendarwidget/window.h 1
 
     As is often the case with classes that represent self-contained
     windows, most of the API is private. We will review the private
@@ -96,7 +96,7 @@
 
     Let's now review the class implementation, starting with the constructor:
 
-    \snippet examples/widgets/calendarwidget/window.cpp 0
+    \snippet widgets/calendarwidget/window.cpp 0
 
     We start by creating the four \l{QGroupBox}es and their child
     widgets (including the QCalendarWidget) using four private \c
@@ -116,7 +116,7 @@
 
     Let's move on to the \c createPreviewGroupBox() function:
 
-    \snippet examples/widgets/calendarwidget/window.cpp 9
+    \snippet widgets/calendarwidget/window.cpp 9
 
     The \uicontrol Preview group box contains only one widget: the
     QCalendarWidget. We set it up, connect its
@@ -128,7 +128,7 @@
     and several widgets are set up the same way; we look at parts of
     its implementation here and skip the rest:
 
-    \snippet examples/widgets/calendarwidget/window.cpp 10
+    \snippet widgets/calendarwidget/window.cpp 10
     \dots
 
     We start with the setup of the \uicontrol{Week starts on} combobox.
@@ -142,7 +142,7 @@
     C++ will happily convert any enum value to \c int.
 
     \dots
-    \snippet examples/widgets/calendarwidget/window.cpp 11
+    \snippet widgets/calendarwidget/window.cpp 11
     \dots
 
     After creating the widgets, we connect the signals and slots. We
@@ -150,14 +150,14 @@
     public slots provided by QComboBox.
 
     \dots
-    \snippet examples/widgets/calendarwidget/window.cpp 12
+    \snippet widgets/calendarwidget/window.cpp 12
 
     At the end of the function, we call the slots that update the calendar to ensure
     that the QCalendarWidget is synchronized with the other widgets on startup.
 
     Let's now take a look at the \c createDatesGroupBox() private function:
 
-    \snippet examples/widgets/calendarwidget/window.cpp 13
+    \snippet widgets/calendarwidget/window.cpp 13
 
     In this function, we create the \uicontrol {Minimum Date}, \uicontrol {Maximum Date},
     and \uicontrol {Current Date} editor widgets,
@@ -166,9 +166,9 @@
     set in \c createPrivewGroupBox(); we can then set the widgets
     default values to the calendars values.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 14
+    \snippet widgets/calendarwidget/window.cpp 14
     \dots
-    \snippet examples/widgets/calendarwidget/window.cpp 15
+    \snippet widgets/calendarwidget/window.cpp 15
 
     We connect the \c currentDateEdit's
     \l{QDateEdit::}{dateChanged()} signal directly to the calendar's
@@ -180,20 +180,20 @@
 
     Here is the \c createTextFormatsGroup() function:
 
-    \snippet examples/widgets/calendarwidget/window.cpp 16
+    \snippet widgets/calendarwidget/window.cpp 16
 
     We set up the \uicontrol {Weekday Color} and \uicontrol {Weekend Color} comboboxes
     using \c createColorCombo(), which instantiates a QComboBox and
     populates it with colors ("Red", "Blue", etc.).
 
-    \snippet examples/widgets/calendarwidget/window.cpp 17
+    \snippet widgets/calendarwidget/window.cpp 17
 
     The \uicontrol {Header Text Format} combobox lets the user change the
     text format (bold, italic, or plain) used for horizontal and
     vertical headers. The \uicontrol {First Friday in blue} and \uicontrol {May 1
     in red} check box affect the rendering of specific dates.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 18
+    \snippet widgets/calendarwidget/window.cpp 18
 
     We connect the check boxes and comboboxes to various private
     slots. The \uicontrol {First Friday in blue} and \uicontrol {May 1 in red}
@@ -201,7 +201,7 @@
     which is also called when the calendar switches month.
 
     \dots
-    \snippet examples/widgets/calendarwidget/window.cpp 19
+    \snippet widgets/calendarwidget/window.cpp 19
 
     At the end of \c createTextFormatsGroupBox(), we call private
     slots to synchronize the QCalendarWidget with the other widgets.
@@ -210,7 +210,7 @@
     functions. Let's now take a look at the other private functions
     and slots.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 20
+    \snippet widgets/calendarwidget/window.cpp 20
 
     In \c createColorCombo(), we create a combobox and populate it with
     standard colors. The second argument to QComboBox::addItem()
@@ -219,7 +219,7 @@
     This function was used to set up the \uicontrol {Weekday Color}
     and \uicontrol {Weekend Color} comboboxes.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 1
+    \snippet widgets/calendarwidget/window.cpp 1
 
     When the user changes the \uicontrol {Week starts on} combobox's
     value, \c firstDayChanged() is invoked with the index of the
@@ -231,12 +231,12 @@
     verticalHeaderChanged() are very similar to \c firstDayChanged(),
     so they are omitted.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 2
+    \snippet widgets/calendarwidget/window.cpp 2
 
     The \c selectedDateChanged() updates the \uicontrol{Current Date}
     editor to reflect the current state of the QCalendarWidget.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 3
+    \snippet widgets/calendarwidget/window.cpp 3
 
     When the user changes the minimum date, we tell the
     QCalenderWidget. We also update the \uicontrol {Maximum Date} editor,
@@ -244,12 +244,12 @@
     date, QCalendarWidget will automatically adapt its maximum date
     to avoid a contradicting state.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 4
+    \snippet widgets/calendarwidget/window.cpp 4
 
     \c maximumDateChanged() is implemented similarly to \c
     minimumDateChanged().
 
-    \snippet examples/widgets/calendarwidget/window.cpp 5
+    \snippet widgets/calendarwidget/window.cpp 5
 
     Each combobox item has a QColor object as user data corresponding to the
     item's text. After fetching the colors from the comboboxes, we
@@ -260,13 +260,13 @@
     specify various character formatting information. In this
     example, we only show a subset of the possibilities.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 6
+    \snippet widgets/calendarwidget/window.cpp 6
 
     \c weekendFormatChanged() is the same as \c
     weekdayFormatChanged(), except that it affects Saturday and
     Sunday instead of Monday to Friday.
 
-    \snippet examples/widgets/calendarwidget/window.cpp 7
+    \snippet widgets/calendarwidget/window.cpp 7
 
     The \c reformatHeaders() slot is called when the user
     changes the text format of
@@ -275,7 +275,7 @@
     have been to store \l{QTextCharFormat} values alongside the combobox
     items.)
 
-    \snippet examples/widgets/calendarwidget/window.cpp 8
+    \snippet widgets/calendarwidget/window.cpp 8
 
     In \c reformatCalendarPage(), we set the text format of the first
     Friday in the month and May 1 in the current year. The text
diff --git a/doc/src/examples/charactermap.qdoc b/examples/widgets/doc/charactermap.qdoc
index 5fbcae1fad..fee2a42156 100644
--- a/doc/src/examples/charactermap.qdoc
+++ b/examples/widgets/doc/charactermap.qdoc
@@ -59,7 +59,7 @@ and interaction features.
 
 The class definition looks like this:
 
-\snippet examples/widgets/charactermap/characterwidget.h 0
+\snippet widgets/charactermap/characterwidget.h 0
 
 The widget does not contain any other widgets, so it must provide its own
 size hint to allow its contents to be displayed correctly.
@@ -87,7 +87,7 @@ Since the widget is to be used as a simple canvas, the constructor just
 calls the base class constructor and defines some default values for
 private data members.
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 0
+\snippet widgets/charactermap/characterwidget.cpp 0
 
 We initialize \c currentKey with a value of -1 to indicate
 that no character is initially selected. We enable mouse tracking to
@@ -96,21 +96,21 @@ allow us to follow the movement of the cursor across the widget.
 The class provides two functions to allow the font and style to be set up.
 Each of these modify the widget's display font and call update():
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 1
+\snippet widgets/charactermap/characterwidget.cpp 1
 \codeline
-\snippet examples/widgets/charactermap/characterwidget.cpp 2
+\snippet widgets/charactermap/characterwidget.cpp 2
 
 We use a fixed size font for the display. Similarly, a fixed size hint is
 provided by the sizeHint() function:
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 3
+\snippet widgets/charactermap/characterwidget.cpp 3
 
 Three standard event functions are implemented so that the widget
 can respond to clicks, provide tooltips, and render the available
 characters. The paintEvent() shows how the contents of the widget are
 arranged and displayed:
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 6
+\snippet widgets/charactermap/characterwidget.cpp 6
 
 A QPainter is created for the widget and, in all cases, we ensure that the
 widget's background is painted. The painter's font is set to the
@@ -119,19 +119,19 @@ user-specified display font.
 The area of the widget that needs to be redrawn is used to determine which
 characters need to be displayed:
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 7
+\snippet widgets/charactermap/characterwidget.cpp 7
 
 Using integer division, we obtain the row and column numbers of each
 characters that should be displayed, and we draw a square on the widget
 for each character displayed.
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 8
-\snippet examples/widgets/charactermap/characterwidget.cpp 9
+\snippet widgets/charactermap/characterwidget.cpp 8
+\snippet widgets/charactermap/characterwidget.cpp 9
 
 The symbols for each character in the array are drawn within each square,
 with the symbol for the most recently selected character displayed in red:
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 10
+\snippet widgets/charactermap/characterwidget.cpp 10
 
 We do not need to take into account the difference between the area
 displayed in the viewport and the area we are drawing on because
@@ -139,7 +139,7 @@ everything outside the visible area will be clipped.
 
 The mousePressEvent() defines how the widget responds to mouse clicks.
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 5
+\snippet widgets/charactermap/characterwidget.cpp 5
 
 We are only interested when the user clicks with the left mouse button
 over the widget. When this happens, we calculate which character was
@@ -158,7 +158,7 @@ The mouseMoveEvent() maps the mouse cursor's position in global
 coordinates to widget coordinates, and determines the character that
 was clicked by performing the calculation
 
-\snippet examples/widgets/charactermap/characterwidget.cpp 4
+\snippet widgets/charactermap/characterwidget.cpp 4
 
 The tooltip is given a position defined in global coordinates.
 
@@ -171,7 +171,7 @@ interface.
 
 The class definition looks like this:
 
-\snippet examples/widgets/charactermap/mainwindow.h 0
+\snippet widgets/charactermap/mainwindow.h 0
 
 The main window contains various widgets that are used to control how
 the characters will be displayed, and defines the findFonts() function
@@ -188,7 +188,7 @@ some standard widgets (two comboboxes, a line edit, and a push button).
 We also construct a CharacterWidget custom widget, and add a QScrollArea
 so that we can view its contents:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 0
+\snippet widgets/charactermap/mainwindow.cpp 0
 
 QScrollArea provides a viewport onto the \c CharacterWidget when we set
 its widget and handles much of the work needed to provide a scrolling
@@ -198,11 +198,11 @@ The font combo box is automatically popuplated with a list of available
 fonts. We list the available styles for the current font in the style
 combobox using the following function:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 1
+\snippet widgets/charactermap/mainwindow.cpp 1
 
 The line edit and push button are used to supply text to the clipboard:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 2
+\snippet widgets/charactermap/mainwindow.cpp 2
 
 We also obtain a clipboard object so that we can send text entered by the
 user to other applications.
@@ -211,7 +211,7 @@ Most of the signals emitted in the example come from standard widgets.
 We connect these signals to slots in this class, and to the slots provided
 by other widgets.
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 4
+\snippet widgets/charactermap/mainwindow.cpp 4
 
 The font combobox's
 \l{QFontComboBox::currentFontChanged()}{currentFontChanged()} signal is
@@ -225,7 +225,7 @@ directly to the character widget.
 The final two connections allow characters to be selected in the character
 widget, and text to be inserted into the clipboard:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 5
+\snippet widgets/charactermap/mainwindow.cpp 5
 
 The character widget emits the characterSelected() custom signal when
 the user clicks on a character, and this is handled by the insertCharacter()
@@ -235,20 +235,20 @@ the clicked() signal, and we handle this with the updateClipboard() function.
 The remaining code in the constructor sets up the layout of the central widget,
 and provides a window title:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 6
+\snippet widgets/charactermap/mainwindow.cpp 6
 
 The font combobox is automatically populated with a list of available font
 families. The styles that can be used with each font are found by the
 findStyles() function. This function is called whenever the user selects a
 different font in the font combobox.
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 7
+\snippet widgets/charactermap/mainwindow.cpp 7
 
 We begin by recording the currently selected style, and we clear the
 style combobox so that we can insert the styles associated with the
 current font family.
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 8
+\snippet widgets/charactermap/mainwindow.cpp 8
 
 We use the font database to collect the styles that are available for the
 current font, and insert them into the style combobox. The current item is
@@ -259,7 +259,7 @@ widget and the main window's push button. The insertCharacter() function is
 used to insert characters from the character widget when the user clicks a
 character:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 9
+\snippet widgets/charactermap/mainwindow.cpp 9
 
 The character is inserted into the line edit at the current cursor position.
 
@@ -267,7 +267,7 @@ The main window's "To clipboard" push button is connected to the
 updateClipboard() function so that, when it is clicked, the clipboard is
 updated to contain the contents of the line edit:
 
-\snippet examples/widgets/charactermap/mainwindow.cpp 10
+\snippet widgets/charactermap/mainwindow.cpp 10
 
 We copy all the text from the line edit to the clipboard, but we do not clear
 the line edit.
diff --git a/doc/src/examples/chart.qdoc b/examples/widgets/doc/chart.qdoc
index 947eddf1c9..44263d1027 100644
--- a/doc/src/examples/chart.qdoc
+++ b/examples/widgets/doc/chart.qdoc
@@ -51,7 +51,7 @@
     indexAt(). However, the view needs to maintain strict control over its look and
     feel, so we also provide implementations for a number of other functions:
 
-    \snippet examples/itemviews/chart/pieview.h 0
+    \snippet itemviews/chart/pieview.h 0
 
 
 
diff --git a/doc/src/examples/chip.qdoc b/examples/widgets/doc/chip.qdoc
index 966c16900a..966c16900a 100644
--- a/doc/src/examples/chip.qdoc
+++ b/examples/widgets/doc/chip.qdoc
diff --git a/doc/src/examples/classwizard.qdoc b/examples/widgets/doc/classwizard.qdoc
index eec9b6ac51..0c357b7286 100644
--- a/doc/src/examples/classwizard.qdoc
+++ b/examples/widgets/doc/classwizard.qdoc
@@ -82,14 +82,14 @@
 
     Here's the \c ClassWizard definition:
 
-    \snippet examples/dialogs/classwizard/classwizard.h 0
+    \snippet dialogs/classwizard/classwizard.h 0
 
     The class reimplements QDialog's \l{QDialog::}{accept()} slot.
     This slot is called when the user clicks \uicontrol{Finish}.
 
     Here's the constructor:
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 1
+    \snippet dialogs/classwizard/classwizard.cpp 1
 
     We instantiate the five pages and insert them into the wizard
     using QWizard::addPage(). The order in which they are inserted
@@ -102,11 +102,11 @@
     dialog's background in \l{QWizard::}{MacStyle}. (See \l{Elements
     of a Wizard Page} for more information.)
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 3
-    \snippet examples/dialogs/classwizard/classwizard.cpp 4
+    \snippet dialogs/classwizard/classwizard.cpp 3
+    \snippet dialogs/classwizard/classwizard.cpp 4
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 5
-    \snippet examples/dialogs/classwizard/classwizard.cpp 6
+    \snippet dialogs/classwizard/classwizard.cpp 5
+    \snippet dialogs/classwizard/classwizard.cpp 6
 
     If the user clicks \uicontrol Finish, we extract the information from
     the various pages using QWizard::field() and generate the files.
@@ -121,9 +121,9 @@
     classwizard.cpp, together with \c ClassWizard. We will start with
     the easiest page:
 
-    \snippet examples/dialogs/classwizard/classwizard.h 1
+    \snippet dialogs/classwizard/classwizard.h 1
     \codeline
-    \snippet examples/dialogs/classwizard/classwizard.cpp 7
+    \snippet dialogs/classwizard/classwizard.cpp 7
 
     A page inherits from QWizardPage. We set a
     \l{QWizardPage::}{title} and a
@@ -139,13 +139,13 @@
 
     The second page is defined and implemented as follows:
 
-    \snippet examples/dialogs/classwizard/classwizard.h 2
+    \snippet dialogs/classwizard/classwizard.h 2
     \codeline
-    \snippet examples/dialogs/classwizard/classwizard.cpp 9
+    \snippet dialogs/classwizard/classwizard.cpp 9
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 12
+    \snippet dialogs/classwizard/classwizard.cpp 12
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 13
+    \snippet dialogs/classwizard/classwizard.cpp 13
 
     First, we set the page's \l{QWizardPage::}{title},
     \l{QWizardPage::}{subTitle}, and \l{QWizard::LogoPixmap}{logo
@@ -165,13 +165,13 @@
 
     The third page is defined and implemented as follows:
 
-    \snippet examples/dialogs/classwizard/classwizard.h 3
+    \snippet dialogs/classwizard/classwizard.h 3
     \codeline
-    \snippet examples/dialogs/classwizard/classwizard.cpp 14
+    \snippet dialogs/classwizard/classwizard.cpp 14
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 15
+    \snippet dialogs/classwizard/classwizard.cpp 15
     \codeline
-    \snippet examples/dialogs/classwizard/classwizard.cpp 16
+    \snippet dialogs/classwizard/classwizard.cpp 16
 
     The code in the constructor is very similar to what we did for \c
     ClassInfoPage, so we skipped most of it.
diff --git a/doc/src/examples/codeeditor.qdoc b/examples/widgets/doc/codeeditor.qdoc
index 695ac5c4ce..695ac5c4ce 100644
--- a/doc/src/examples/codeeditor.qdoc
+++ b/examples/widgets/doc/codeeditor.qdoc
diff --git a/doc/src/examples/coloreditorfactory.qdoc b/examples/widgets/doc/coloreditorfactory.qdoc
index 1806446fb7..a2c02f8c1d 100644
--- a/doc/src/examples/coloreditorfactory.qdoc
+++ b/examples/widgets/doc/coloreditorfactory.qdoc
@@ -66,7 +66,7 @@
 
     We take a closer look at the constructor:
 
-    \snippet examples/itemviews/coloreditorfactory/window.cpp 0
+    \snippet itemviews/coloreditorfactory/window.cpp 0
 
     The QStandardItemEditorCreator is a convenience class that
     inherits QItemEditorCreatorBase. Its constructor takes a template
@@ -88,7 +88,7 @@
     The ColorListEditor inherits QComboBox and lets the user
     select a QColor from its popup list.
 
-    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.h 0
+    \snippet itemviews/coloreditorfactory/colorlisteditor.h 0
 
     QItemDelegate manages the interaction between the editor and
     the model, i.e., it retrieves data to edit from the model and
@@ -105,19 +105,19 @@
     populateList(), which we will look at later. We move on to the
     \c color() function:
 
-    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.cpp 0
+    \snippet itemviews/coloreditorfactory/colorlisteditor.cpp 0
 
     We return the data that is selected in the combobox. The data
     is stored in the Qt::DecorationRole as the color is then also
     displayed in the popup list (as shown in the image above).
 
-    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.cpp 1
+    \snippet itemviews/coloreditorfactory/colorlisteditor.cpp 1
 
     The \c findData() function searches the items in the combobox
     and returns the index of the item that has \c color in the
     Qt::Decoration role.
 
-    \snippet examples/itemviews/coloreditorfactory/colorlisteditor.cpp 2
+    \snippet itemviews/coloreditorfactory/colorlisteditor.cpp 2
 
     Qt knows some predefined colors by name. We simply loop
     through these to fill our editor with items.
diff --git a/doc/src/examples/combowidgetmapper.qdoc b/examples/widgets/doc/combowidgetmapper.qdoc
index dae95ddb26..949014930d 100644
--- a/doc/src/examples/combowidgetmapper.qdoc
+++ b/examples/widgets/doc/combowidgetmapper.qdoc
@@ -51,7 +51,7 @@
     The class provides a constructor, a slot to keep the buttons up to date,
     and a private function to set up the model:
 
-    \snippet examples/itemviews/combowidgetmapper/window.h Window definition
+    \snippet itemviews/combowidgetmapper/window.h Window definition
 
     In addition to the QDataWidgetMapper object and the controls used to make
     up the user interface, we use a QStandardItemModel to hold our data and
@@ -63,7 +63,7 @@
     The constructor of the \c Window class can be explained in three parts.
     In the first part, we set up the widgets used for the user interface:
 
-    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up widgets
+    \snippet itemviews/combowidgetmapper/window.cpp Set up widgets
 
     Note that we set up the mapping the combo box in the same way as for other
     widgets, but that we apply its own model to it so that it will display
@@ -73,7 +73,7 @@
     Next, we set up the widget mapper, relating each input widget to a column
     in the model specified by the call to \l{QDataWidgetMapper::}{setModel()}:
 
-    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up the mapper
+    \snippet itemviews/combowidgetmapper/window.cpp Set up the mapper
 
     For the combo box, we pass an extra argument to tell the widget mapper
     which property to relate to values from the model. As a result, the user
@@ -92,14 +92,14 @@
     The rest of the constructor is very similar to that of the
     \l{Simple Widget Mapper Example}:
 
-    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up connections and layouts
+    \snippet itemviews/combowidgetmapper/window.cpp Set up connections and layouts
 
     The model is initialized in the window's \c{setupModel()} function. Here,
     we create a standard model with 5 rows and 3 columns. In each row, we
     insert a name, address, and a value that indicates the type of address.
     The address types are stored in a string list model.
 
-    \snippet examples/itemviews/combowidgetmapper/window.cpp Set up the model
+    \snippet itemviews/combowidgetmapper/window.cpp Set up the model
 
     As we insert each row into the model, like a record in a database, we
     store values that correspond to items in \c typeModel for each person's
@@ -113,7 +113,7 @@
     We show the implementation of the \c{updateButtons()} slot for
     completeness:
 
-    \snippet examples/itemviews/combowidgetmapper/window.cpp Slot for updating the buttons
+    \snippet itemviews/combowidgetmapper/window.cpp Slot for updating the buttons
 
     \omit
     \section1 Delegate Class Definition and Implementation
@@ -121,7 +121,7 @@
     The delegate we use to mediate interaction between the widget mapper and
     the input widgets is a small QItemDelegate subclass:
 
-    \snippet examples/itemviews/combowidgetmapper/delegate.h Delegate class definition
+    \snippet itemviews/combowidgetmapper/delegate.h Delegate class definition
 
     This provides implementations of the two standard functions used to pass
     data between editor widgets and the model (see the \l{Delegate Classes}
@@ -134,7 +134,7 @@
     referred to by the model index supplied and processes it according to
     the presence of a \c currentIndex property in the editor widget:
 
-    \snippet examples/itemviews/combowidgetmapper/delegate.cpp setEditorData implementation
+    \snippet itemviews/combowidgetmapper/delegate.cpp setEditorData implementation
 
     If, like QComboBox, the editor widget has this property, it is set using
     the value from the model. Since we are passing around QVariant values,
@@ -149,7 +149,7 @@
     process, taking the value stored in the widget's \c currentIndex property
     and storing it back in the model:
 
-    \snippet examples/itemviews/combowidgetmapper/delegate.cpp setModelData implementation
+    \snippet itemviews/combowidgetmapper/delegate.cpp setModelData implementation
     \endomit
 
     \section1 Summary and Further Reading
diff --git a/doc/src/examples/composition.qdoc b/examples/widgets/doc/composition.qdoc
index 6aca01d255..6aca01d255 100644
--- a/doc/src/examples/composition.qdoc
+++ b/examples/widgets/doc/composition.qdoc
diff --git a/doc/src/examples/concentriccircles.qdoc b/examples/widgets/doc/concentriccircles.qdoc
index 22b0be8fb8..67bc125dbe 100644
--- a/doc/src/examples/concentriccircles.qdoc
+++ b/examples/widgets/doc/concentriccircles.qdoc
@@ -74,7 +74,7 @@
     The CircleWidget class inherits QWidget, and is a custom widget
     which renders several animated concentric circles.
 
-    \snippet examples/painting/concentriccircles/circlewidget.h 0
+    \snippet painting/concentriccircles/circlewidget.h 0
 
     We declare the \c floatBased and \c antialiased variables to hold
     whether an instance of the class should be rendered with integer
@@ -97,7 +97,7 @@
     In the constructor we make the widget's rendering integer based
     and aliased by default:
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 0
+    \snippet painting/concentriccircles/circlewidget.cpp 0
 
     We initialize the widget's \c frameNo variable, and set the
     widget's background color using the QWidget::setBackgroundColor()
@@ -111,9 +111,9 @@
     useful. The widget can also make use of extra space, so it should
     get as much space as possible.
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 1
+    \snippet painting/concentriccircles/circlewidget.cpp 1
     \codeline
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 2
+    \snippet painting/concentriccircles/circlewidget.cpp 2
 
     The public \c setFloatBased() and \c setAntialiased() functions
     update the widget's rendering preferences, i.e. whether the widget
@@ -124,9 +124,9 @@
     QWidget::update() function, forcing a repaint of the widget with
     the new rendering preferences.
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 3
+    \snippet painting/concentriccircles/circlewidget.cpp 3
     \codeline
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 4
+    \snippet painting/concentriccircles/circlewidget.cpp 4
 
     The default implementations of the QWidget::minimumSizeHint() and
     QWidget::sizeHint() functions return invalid sizes if there is no
@@ -136,14 +136,14 @@
     We reimplement the functions to give the widget minimum and
     preferred sizes which are reasonable within our application.
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 5
+    \snippet painting/concentriccircles/circlewidget.cpp 5
 
     The nextAnimationFrame() slot simply increments the \c frameNo
     variable's value, and calls the QWidget::update() function which
     schedules a paint event for processing when Qt returns to the main
     event loop.
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 6
+    \snippet painting/concentriccircles/circlewidget.cpp 6
 
     A paint event is a request to repaint all or part of the
     widget. The \c paintEvent() function is an event handler that can
@@ -158,7 +158,7 @@
     widget's cocentric circles. The translation ensures that the
     center of the circles will be equivalent to the widget's center.
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 7
+    \snippet painting/concentriccircles/circlewidget.cpp 7
 
     When painting a circle, we use the number of "animation frames" to
     determine the alpha channel of the circle's color. The alpha
@@ -166,7 +166,7 @@
     fully transparent color, while 255 represents a fully opaque
     color.
 
-    \snippet examples/painting/concentriccircles/circlewidget.cpp 8
+    \snippet painting/concentriccircles/circlewidget.cpp 8
 
     If the calculated alpha channel is fully transparent, we don't
     draw anything since that would be equivalent to drawing a white
@@ -190,7 +190,7 @@
     window rendering four \c {CircleWidget}s using different
     combinations of precision and aliasing.
 
-    \snippet examples/painting/concentriccircles/window.h 0
+    \snippet painting/concentriccircles/window.h 0
 
     We declare the various components of the main window, i.e., the text
     labels and a double array that will hold reference to the four \c
@@ -199,12 +199,12 @@
 
     \section1 Window Class Implementation
 
-    \snippet examples/painting/concentriccircles/window.cpp 0
+    \snippet painting/concentriccircles/window.cpp 0
 
     In the constructor, we first create the various labels and put
     them in a QGridLayout.
 
-    \snippet examples/painting/concentriccircles/window.cpp 1
+    \snippet painting/concentriccircles/window.cpp 1
 
     Then we create a QTimer. The QTimer class is a high-level
     programming interface for timers, and provides repetitive and
@@ -215,7 +215,7 @@
     them to the layout), we connect the QTimer::timeout() signal to
     each of the widgets' \c nextAnimationFrame() slots.
 
-    \snippet examples/painting/concentriccircles/window.cpp 2
+    \snippet painting/concentriccircles/window.cpp 2
 
     Before we set the layout and window title for our main window, we
     make the timer start with a timeout interval of 100 milliseconds,
@@ -224,7 +224,7 @@
     four \c {CircleWidget}s, every 100 millisecond which is the reason
     the circles appear as animated.
 
-    \snippet examples/painting/concentriccircles/window.cpp 3
+    \snippet painting/concentriccircles/window.cpp 3
 
     The private \c createLabel() function is implemented to simlify
     the constructor.
diff --git a/doc/src/examples/configdialog.qdoc b/examples/widgets/doc/configdialog.qdoc
index 9acea72a3b..9acea72a3b 100644
--- a/doc/src/examples/configdialog.qdoc
+++ b/examples/widgets/doc/configdialog.qdoc
diff --git a/doc/src/examples/customsortfiltermodel.qdoc b/examples/widgets/doc/customsortfiltermodel.qdoc
index 61230a7b9a..4dce820f9c 100644
--- a/doc/src/examples/customsortfiltermodel.qdoc
+++ b/examples/widgets/doc/customsortfiltermodel.qdoc
@@ -80,7 +80,7 @@
     that our filter can recognize a valid range of dates, and to
     control the sorting behavior.
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.h 0
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.h 0
 
     We want to be able to filter our data by specifying a given period
     of time. For that reason, we implement the custom \c
@@ -100,7 +100,7 @@
     The \c MySortFilterProxyModel constructor is trivial, passing the
     parent parameter on to the base class constructor:
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 0
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 0
 
     The most interesting parts of the \c MySortFilterProxyModel
     implementation are the reimplementations of
@@ -110,7 +110,7 @@
     functions. Let's first take a look at our customized \c lessThan()
     function.
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 4
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 4
 
     We want to sort the senders by their email addresses. The \l
     {QSortFilterProxyModel::}{lessThan()} function is used as the <
@@ -119,7 +119,7 @@
     to be able to sort the senders by their email addresses we must
     first identify the address within the given string:
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 6
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 6
 
     We use QRegExp to define a pattern for the addresses we are looking
     for. The QRegExp::indexIn() function attempts to find a match in
@@ -132,7 +132,7 @@
     subexpressions have indexes starting from 1 (excluding
     non-capturing parentheses).
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3
 
     The \l
     {QSortFilterProxyModel::filterAcceptsRow()}{filterAcceptsRow()}
@@ -141,7 +141,7 @@
     is accepted if either the subject or the sender contains the given
     regular expression, and the date is valid.
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 7
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 7
 
     We use our custom \c dateInRange() function to determine if a date
     is valid.
@@ -150,9 +150,9 @@
     time, we also implement functions for getting and setting the
     minimum and maximum dates:
 
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 1
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 1
     \codeline
-    \snippet examples/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 2
+    \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 2
 
     The get functions, \c filterMinimumDate() and \c
     filterMaximumDate(), are trivial and implemented as inline
@@ -166,7 +166,7 @@
     The \c CustomFilter class inherits QWidget, and provides this
     example's main application window:
 
-    \snippet examples/itemviews/customsortfiltermodel/window.h 0
+    \snippet itemviews/customsortfiltermodel/window.h 0
 
     We implement two private slots, \c textFilterChanged() and \c
     dateFilterChanged(), to respond to the user changing the filter
@@ -182,7 +182,7 @@
     source model already exists and start by creating an instance of
     our custom proxy model:
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 0
+    \snippet itemviews/customsortfiltermodel/window.cpp 0
 
     We set the \l
     {QSortFilterProxyModel::dynamicSortFilter}{dynamicSortFilter}
@@ -194,13 +194,13 @@
     The main application window shows views of both the source model
     and the proxy model. The source view is quite simple:
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 1
+    \snippet itemviews/customsortfiltermodel/window.cpp 1
 
     The QTreeView class provides a default model/view implementation
     of a tree view; our view implements a tree representation of items
     in the application's source model.
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 2
+    \snippet itemviews/customsortfiltermodel/window.cpp 2
 
     The QTreeView class provides a default model/view implementation
     of a tree view; our view implements a tree representation of items
@@ -211,14 +211,14 @@
     controlling the various aspects of transforming the source model's
     data structure:
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 3
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 4
+    \snippet itemviews/customsortfiltermodel/window.cpp 3
+    \snippet itemviews/customsortfiltermodel/window.cpp 4
 
     Note that whenever the user changes one of the filtering options,
     we must explicitly reapply the filter. This is done by connecting
     the various editors to functions that update the proxy model.
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 5
+    \snippet itemviews/customsortfiltermodel/window.cpp 5
 
     The sorting will be handled by the view. All we have to do is to
     enable sorting for our proxy view by setting the
@@ -226,7 +226,7 @@
     default). Then we add all the filtering widgets and the proxy view
     to a layout that we install on a corresponding group box.
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 6
+    \snippet itemviews/customsortfiltermodel/window.cpp 6
 
     Finally, after putting our two group boxes into another layout
     that we install on our main application widget, we customize the
@@ -236,7 +236,7 @@
     function, calling the \c Window::setSourceModel() function to make
     the application use it:
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 7
+    \snippet itemviews/customsortfiltermodel/window.cpp 7
 
     The QSortFilterProxyModel::setSourceModel() function makes the
     proxy model process the data in the given model, in this case out
@@ -245,7 +245,7 @@
     model for the view to present. Note that the latter function will
     also create and set a new selection model.
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 8
+    \snippet itemviews/customsortfiltermodel/window.cpp 8
 
     The \c textFilterChanged() function is called whenever the user
     changes the filter pattern or the case sensitivity.
@@ -261,7 +261,7 @@
     {QSortFilterProxyModel::}{setFilterRegExp()} function also updates
     the model.
 
-    \snippet examples/itemviews/customsortfiltermodel/window.cpp 9
+    \snippet itemviews/customsortfiltermodel/window.cpp 9
 
     The \c dateFilterChanged() function is called whenever the user
     modifies the range of valid dates. We retrieve the new dates from
@@ -276,7 +276,7 @@
     model by creating the model in the \c main () function. First we
     create the application, then we create the source model:
 
-    \snippet examples/itemviews/customsortfiltermodel/main.cpp 0
+    \snippet itemviews/customsortfiltermodel/main.cpp 0
 
     The \c createMailModel() function is a convenience function
     provided to simplify the constructor. All it does is to create and
diff --git a/doc/src/examples/deform.qdoc b/examples/widgets/doc/deform.qdoc
index 8195f90ffa..8195f90ffa 100644
--- a/doc/src/examples/deform.qdoc
+++ b/examples/widgets/doc/deform.qdoc
diff --git a/doc/src/examples/diagramscene.qdoc b/examples/widgets/doc/diagramscene.qdoc
index ac9ca2f294..b61a936d52 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/examples/widgets/doc/diagramscene.qdoc
@@ -84,7 +84,7 @@
 
     \section1 MainWindow Class Definition
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.h 0
+    \snippet graphicsview/diagramscene/mainwindow.h 0
 
     The \c MainWindow class creates and lays out the widgets in a
     QMainWindow. The class forwards input from the widgets to the
@@ -101,7 +101,7 @@
 
     We start with a look at the constructor:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 0
+    \snippet graphicsview/diagramscene/mainwindow.cpp 0
 
     In the constructor we call methods to create the widgets and
     layouts of the example before we create the diagram scene. 
@@ -120,7 +120,7 @@
     high level of detail as it does not deal with graphics framework 
     specific functionality. Here is its implementation:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 21
+    \snippet graphicsview/diagramscene/mainwindow.cpp 21
     
     This part of the function sets up the tabbed widget item that
     contains the flowchart shapes. An exclusive QButtonGroup always 
@@ -134,14 +134,14 @@
     The buttons of the background tabbed widget item is set up in the
     same way, so we skip to the creation of the tool box:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 22
+    \snippet graphicsview/diagramscene/mainwindow.cpp 22
 
     We set the preferred size of the toolbox as its maximum. This
     way, more space is given to the graphics view. 
 
     Here is the \c createActions() function:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 23
+    \snippet graphicsview/diagramscene/mainwindow.cpp 23
 
     We show an example of the creation of an action. The
     functionality the actions trigger is discussed in the slots we
@@ -151,7 +151,7 @@
 
     The is the \c createMenus() function:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 24
+    \snippet graphicsview/diagramscene/mainwindow.cpp 24
 
     We create the three menus' of the example.
 
@@ -163,9 +163,9 @@
     fillColorToolButton is created. This button lets the user select a
     color for the diagram items.
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 25
+    \snippet graphicsview/diagramscene/mainwindow.cpp 25
     \dots
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 26
+    \snippet graphicsview/diagramscene/mainwindow.cpp 26
 
     We set the menu of the tool button with
     \l{QToolButton::}{setMenu()}. We need the \c fillAction QAction
@@ -178,11 +178,11 @@
     createColorToolButtonIcon() we create the icon for the button.
 
     \dots
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 27
+    \snippet graphicsview/diagramscene/mainwindow.cpp 27
 
     Here is the \c createBackgroundCellWidget() function:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 28
+    \snippet graphicsview/diagramscene/mainwindow.cpp 28
 
     This function creates \l{QWidget}s containing a tool button
     and a label. The widgets created with this function are used for
@@ -190,7 +190,7 @@
 
     Here is the \c createCellWidget() function:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 29
+    \snippet graphicsview/diagramscene/mainwindow.cpp 29
 
     This function returns a QWidget containing a QToolButton with
     an image of one of the \c DiagramItems, i.e., flowchart shapes.
@@ -203,7 +203,7 @@
 
     Here is the \c createColorMenu() function:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 30
+    \snippet graphicsview/diagramscene/mainwindow.cpp 30
 
     This function creates a color menu that is used as the
     drop-down menu for the tool buttons in the \c colorToolBar. We
@@ -212,7 +212,7 @@
 
     Here is the \c createColorToolButtonIcon() function:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 31
+    \snippet graphicsview/diagramscene/mainwindow.cpp 31
 
     This function is used to create the QIcon of the \c
     fillColorToolButton, \c fontColorToolButton, and \c
@@ -222,7 +222,7 @@
 
     Here is the \c createColorIcon() function:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 32
+    \snippet graphicsview/diagramscene/mainwindow.cpp 32
 
     This function creates an icon with a filled rectangle in the 
     color of \a color. It is used for creating icons for the color
@@ -231,7 +231,7 @@
 
     Here is the \c backgroundButtonGroupClicked() slot:
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 1
+    \snippet graphicsview/diagramscene/mainwindow.cpp 1
 
     In this function we set the QBrush that is used to draw the
     background of the diagramscene. The background can be a grid of
@@ -245,7 +245,7 @@
 
     Here is the implementation of \c buttonGroupClicked():
 
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 2
+    \snippet graphicsview/diagramscene/mainwindow.cpp 2
 
     This slot is called when a button in \c buttonGroup is checked.
     When a button is checked the user can click on the graphics view
@@ -263,7 +263,7 @@
     
     Here is the implementation of \c deleteItem():
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 3
+    \snippet graphicsview/diagramscene/mainwindow.cpp 3
     
     This slot deletes the selected item, if any, from the scene. It
     deletes the arrows first in order to avoid to delete them twice. If
@@ -273,7 +273,7 @@
     
     This is the implementation of pointerGroupClicked():
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 4
+    \snippet graphicsview/diagramscene/mainwindow.cpp 4
     
     The \c pointerTypeGroup decides whether the scene is in ItemMove
     or InsertLine mode. This button group is exclusive, i.e., only 
@@ -284,7 +284,7 @@
     
     Here is the \c bringToFront() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 5
+    \snippet graphicsview/diagramscene/mainwindow.cpp 5
     
     Several items may collide, i.e., overlap, with each other in
     the scene.  This slot is called when the user requests that an
@@ -299,7 +299,7 @@
     
     Here is the \c sendToBack() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 6
+    \snippet graphicsview/diagramscene/mainwindow.cpp 6
     
     This slot works in the same way as \c bringToFront() described
     above, but sets a z-value that is lower than items the item that
@@ -307,7 +307,7 @@
     
     This is the implementation of \c itemInserted():
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 7
+    \snippet graphicsview/diagramscene/mainwindow.cpp 7
     
     This slot is called from the \c DiagramScene when an item has been
     added to the scene. We set the mode of the scene back to the mode
@@ -317,14 +317,14 @@
     
     Here is the implementation of \c textInserted():
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 8
+    \snippet graphicsview/diagramscene/mainwindow.cpp 8
     
     We simply set the mode of the scene back to the mode it had before
     the text was inserted.
     
     Here is the \c currentFontChanged() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 9
+    \snippet graphicsview/diagramscene/mainwindow.cpp 9
     
     When the user requests a font change, by using one of the
     widgets in the \c fontToolBar, we create a new QFont object and
@@ -333,7 +333,7 @@
     
     Here is the \c fontSizeChanged() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 10
+    \snippet graphicsview/diagramscene/mainwindow.cpp 10
     
     When the user requests a font change, by using one of the
     widgets in the \c fontToolBar, we create a new QFont object and
@@ -342,7 +342,7 @@
     
     Here is the implementation of \c sceneScaleChanged():
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 11
+    \snippet graphicsview/diagramscene/mainwindow.cpp 11
     
     The user can increase or decrease the scale, with the \c
     sceneScaleCombo, the scene is drawn in.
@@ -351,7 +351,7 @@
     
     Here is the \c textColorChanged() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 12
+    \snippet graphicsview/diagramscene/mainwindow.cpp 12
     
     This slot is called when an item in the drop-down menu of the \c
     fontColorToolButton is pressed. We need to change the icon on 
@@ -362,7 +362,7 @@
     
     Here is the \c itemColorChanged() implementation:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 13
+    \snippet graphicsview/diagramscene/mainwindow.cpp 13
     
     This slot handles requests for changing the color of \c
     DiagramItems in the same manner as \c textColorChanged() does for
@@ -370,7 +370,7 @@
     
     Here is the implementation of \c lineColorChanged():
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 14
+    \snippet graphicsview/diagramscene/mainwindow.cpp 14
     
     This slot handles requests for changing the color of \c Arrows in
     the same manner that \c textColorChanged() does it for \c
@@ -378,7 +378,7 @@
     
     Here is the \c textButtonTriggered() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 15
+    \snippet graphicsview/diagramscene/mainwindow.cpp 15
     
     \c textAction points to the  QAction of the currently selected menu item
     in the \c fontColorToolButton's color drop-down menu. We have set
@@ -388,7 +388,7 @@
     
     Here is the \c fillButtonTriggered() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 16
+    \snippet graphicsview/diagramscene/mainwindow.cpp 16
     
     \c fillAction points to the selected menu item in the drop-down
     menu of \c fillColorToolButton(). We can therefore use the data of
@@ -396,7 +396,7 @@
     
     Here is the \c lineButtonTriggered() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 17
+    \snippet graphicsview/diagramscene/mainwindow.cpp 17
     
     \c lineAction point to the selected item in the drop-down menu of
     \c lineColorToolButton. We use its data when we set the arrow 
@@ -404,7 +404,7 @@
     
     Here is the \c handleFontChange() function:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 18
+    \snippet graphicsview/diagramscene/mainwindow.cpp 18
     
     \c handleFontChange() is called when any of the widgets that show
     font properties changes. We create a new QFont object and set its
@@ -414,7 +414,7 @@
     
     Here is the \c itemSelected() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 19
+    \snippet graphicsview/diagramscene/mainwindow.cpp 19
     
     This slot is called when an item in the \c DiagramScene is
     selected. In the case of this example it is only text items that
@@ -426,7 +426,7 @@
     
     This is the \c about() slot:
     
-    \snippet examples/graphicsview/diagramscene/mainwindow.cpp 20
+    \snippet graphicsview/diagramscene/mainwindow.cpp 20
     
     This slot displays an about box for the example when the user
     selects the about menu item from the help menu.
@@ -439,7 +439,7 @@
     class.
     
     
-    \snippet examples/graphicsview/diagramscene/diagramscene.h 0
+    \snippet graphicsview/diagramscene/diagramscene.h 0
     
     In the \c DiagramScene a mouse click can give three different
     actions: the item under the mouse can be moved, an item may be
@@ -465,7 +465,7 @@
 
     We start with the constructor:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 0
+    \snippet graphicsview/diagramscene/diagramscene.cpp 0
 
     The scene uses \c myItemMenu to set the context menu when it
     creates \c DiagramItems. We set the default mode to \c
@@ -474,7 +474,7 @@
 
     Here is the \c setLineColor() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 1
+    \snippet graphicsview/diagramscene/diagramscene.cpp 1
 
     The \c isItemChange function returns true if an \c Arrow item is
     selected in the scene in which case we want to change its color.
@@ -483,14 +483,14 @@
 
     Here is the \c setTextColor() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 2
+    \snippet graphicsview/diagramscene/diagramscene.cpp 2
 
     This function sets the color of \c DiagramTextItems equal to the
     way \c setLineColor() sets the color of \c Arrows.
 
     Here is the \c setItemColor() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 3
+    \snippet graphicsview/diagramscene/diagramscene.cpp 3
 
     This function sets the color the scene will use when creating 
     \c DiagramItems. It also changes the color of a selected \c
@@ -498,14 +498,14 @@
 
     This is the implementation of \c setFont():
     
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 4
+    \snippet graphicsview/diagramscene/diagramscene.cpp 4
 
     Set the font to use for new and selected, if a text item is
     selected, \c DiagramTextItems.
 
     This is the implementation of \c editorLostFocus() slot:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 5
+    \snippet graphicsview/diagramscene/diagramscene.cpp 5
 
     \c DiagramTextItems emit a signal when they loose focus, which is
     connected to this slot. We remove the item if it has no text.
@@ -516,13 +516,13 @@
     different depending on which mode the \c DiagramScene is in. We
     examine its implementation for each mode:
     
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 6
+    \snippet graphicsview/diagramscene/diagramscene.cpp 6
 
     We simply create a new \c DiagramItem and add it to the scene at
     the position the mouse was pressed. Note that the origin of its 
     local coordinate system will be under the mouse pointer position.
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 7
+    \snippet graphicsview/diagramscene/diagramscene.cpp 7
 
     The user adds \c Arrows to the scene by stretching a line between
     the items the arrow should connect. The start of the line is fixed
@@ -533,7 +533,7 @@
     We will see how this is implemented later; here we simply add the
     line.
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 8
+    \snippet graphicsview/diagramscene/diagramscene.cpp 8
     
     The \c DiagramTextItem is editable when the
     Qt::TextEditorInteraction flag is set, else it is movable by the
@@ -541,7 +541,7 @@
     items in the scene, so we set the value to a number higher
     than other items in the scene.
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 9
+    \snippet graphicsview/diagramscene/diagramscene.cpp 9
 
     We are in MoveItem mode if we get to the default switch; we
     can then call the QGraphicsScene implementation, which
@@ -553,7 +553,7 @@
 
     This is the \c mouseMoveEvent() function:
     
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 10
+    \snippet graphicsview/diagramscene/diagramscene.cpp 10
 
     We must draw the line if we are in InsertMode and the mouse button
     is pressed down (the line is not 0). As discussed in \c
@@ -566,14 +566,14 @@
     In the \c mouseReleaseEvent() function we need to check if an arrow
     should be added to the scene:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 11
+    \snippet graphicsview/diagramscene/diagramscene.cpp 11
     
     First we need to get the items (if any) under the line's start
     and end points. The line itself is the first item at these points,
     so we remove it from the lists. As a precaution, we check if the
     lists are empty, but this should never happen.
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 12
+    \snippet graphicsview/diagramscene/diagramscene.cpp 12
 
     Now we check if there are two different \c DiagramItems under
     the lines start and end points. If there are we can create an \c
@@ -582,11 +582,11 @@
     and end points to the items. We set the z-value of the arrow to
     -1000.0 because we always want it to be drawn under the items.
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 13
+    \snippet graphicsview/diagramscene/diagramscene.cpp 13
 
     Here is the \c isItemChange() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramscene.cpp 14
+    \snippet graphicsview/diagramscene/diagramscene.cpp 14
 
     The scene has single selection, i.e., only one item can be
     selected at any given time. The foreach will then loop one time
@@ -597,7 +597,7 @@
     \section1 DiagramItem Class Definition
 
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.h 0
+    \snippet graphicsview/diagramscene/diagramitem.h 0
 
     The \c DiagramItem represents a flowchart shape in the \c
     DiagramScene. It inherits QGraphicsPolygonItem and has a polygon
@@ -622,7 +622,7 @@
 
     We start with a look at the constructor:
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 0
+    \snippet graphicsview/diagramscene/diagramitem.cpp 0
 
     In the constructor we create the items polygon according to
     \a diagramType. \l{QGraphicsItem}s are not movable or selectable
@@ -630,7 +630,7 @@
 
     Here is the \c removeArrow() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 1
+    \snippet graphicsview/diagramscene/diagramitem.cpp 1
 
     \c removeArrow() is used to remove \c Arrow items when they
     or \c DiagramItems they are connected to are removed from the
@@ -638,7 +638,7 @@
 
     Here is the \c removeArrows() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 2
+    \snippet graphicsview/diagramscene/diagramitem.cpp 2
 
     This function is called when the item is removed from the scene
     and removes all arrows that are connected to this item. The arrow
@@ -647,13 +647,13 @@
 
     Here is the \c addArrow() function:
     
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 3
+    \snippet graphicsview/diagramscene/diagramitem.cpp 3
 
     This function simply adds the \a arrow to the items \c arrows list.
 
     Here is the \c image() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 4
+    \snippet graphicsview/diagramscene/diagramitem.cpp 4
 
     This function draws the polygon of the item onto a QPixmap. In
     this example we use this to create icons for the tool buttons in
@@ -661,7 +661,7 @@
 
     Here is the \c contextMenuEvent() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 5
+    \snippet graphicsview/diagramscene/diagramitem.cpp 5
 
     We show the context menu. As right mouse clicks, which shows the
     menu, don't select items by default we set the item selected with
@@ -671,7 +671,7 @@
 
     This is the implementation of \c itemChange():
 
-    \snippet examples/graphicsview/diagramscene/diagramitem.cpp 6
+    \snippet graphicsview/diagramscene/diagramitem.cpp 6
 
     If the item has moved, we need to update the positions of the
     arrows connected to it. The implementation of QGraphicsItem does
@@ -686,7 +686,7 @@
     DiagramTextItem the editing starts with a double click leaving
     single click available to interact with and move it.
 
-    \snippet examples/graphicsview/diagramscene/diagramtextitem.h 0
+    \snippet graphicsview/diagramscene/diagramtextitem.h 0
 
     We use \c itemChange() and \c focusOutEvent() to notify the
     \c DiagramScene when the text item loses focus and gets selected.
@@ -698,14 +698,14 @@
     
     We start with the constructor:
 
-    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 0
+    \snippet graphicsview/diagramscene/diagramtextitem.cpp 0
 
     We simply set the item movable and selectable, as these flags are
     off by default.
 
     Here is the \c itemChange() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 1
+    \snippet graphicsview/diagramscene/diagramtextitem.cpp 1
 
     When the item is selected we emit the selectedChanged signal. The
     \c MainWindow uses this signal to update the widgets that display
@@ -713,7 +713,7 @@
 
     Here is the \c focusOutEvent() function:
 
-    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 2
+    \snippet graphicsview/diagramscene/diagramtextitem.cpp 2
 
     \c DiagramScene uses the signal emitted when the text item looses
     focus to remove the item if it is empty, i.e., it contains no
@@ -721,7 +721,7 @@
 
     This is the implementation of \c mouseDoubleClickEvent():
 
-    \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 5
+    \snippet graphicsview/diagramscene/diagramtextitem.cpp 5
 
     When we receive a double click event, we make the item editable by calling
     QGraphicsTextItem::setTextInteractionFlags(). We then forward the
@@ -736,7 +736,7 @@
     selections. The class inherits QGraphicsLine item, and draws the
     arrowhead and moves with the items it connects.
 
-    \snippet examples/graphicsview/diagramscene/arrow.h 0
+    \snippet graphicsview/diagramscene/arrow.h 0
 
     The item's color can be set with \c setColor().
 
@@ -757,14 +757,14 @@
 
     The constructor of the \c Arrow class looks like this:
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 0
+    \snippet graphicsview/diagramscene/arrow.cpp 0
 
     We set the start and end diagram items of the arrow. The arrow
     head will be drawn where the line intersects the end item.
 
     Here is the \c boundingRect() function:
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 1
+    \snippet graphicsview/diagramscene/arrow.cpp 1
 
     We need to reimplement this function because the arrow is
     larger than the bounding rectangle of the QGraphicsLineItem. The
@@ -773,7 +773,7 @@
 
     Here is the \c shape() function:
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 2
+    \snippet graphicsview/diagramscene/arrow.cpp 2
 
     The shape function returns a QPainterPath that is the exact
     shape of the item. The QGraphicsLineItem::shape() returns a path
@@ -783,14 +783,14 @@
 
     Here is the \c updatePosition() slot:
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 3
+    \snippet graphicsview/diagramscene/arrow.cpp 3
 
     This slot updates the arrow by setting the start and end
     points of its line to the center of the items it connects. 
 
     Here is the \c paint() function:
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 4
+    \snippet graphicsview/diagramscene/arrow.cpp 4
 
     If the start and end items collide we do not draw the arrow; the
     algorithm we use to find the point the arrow should be drawn at
@@ -798,7 +798,7 @@
 
     We first set the pen and brush we will use for drawing the arrow.
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 5
+    \snippet graphicsview/diagramscene/arrow.cpp 5
 
     We then need to find the position at which to draw the
     arrowhead.  The head should be drawn where the line and the end
@@ -811,7 +811,7 @@
     We must therefore add the position of the end item to make the
     coordinates relative to the scene. 
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 6
+    \snippet graphicsview/diagramscene/arrow.cpp 6
 
     We calculate the angle between the x-axis and the line of the
     arrow. We need to turn the arrow head to this angle so that it
@@ -824,7 +824,7 @@
     clear the \c arrowHead polygon from the previous calculated arrow
     head and set these new points.
 
-    \snippet examples/graphicsview/diagramscene/arrow.cpp 7
+    \snippet graphicsview/diagramscene/arrow.cpp 7
 
     If the line is selected, we draw two dotted lines that are
     parallel with the line of the arrow. We do not use the default
diff --git a/doc/src/examples/digitalclock.qdoc b/examples/widgets/doc/digitalclock.qdoc
index 39d015efd1..92e8003205 100644
--- a/doc/src/examples/digitalclock.qdoc
+++ b/examples/widgets/doc/digitalclock.qdoc
@@ -44,11 +44,11 @@
     and implement a private slot called \c showTime() to update the clock
     display:
 
-    \snippet examples/widgets/digitalclock/digitalclock.h 0
+    \snippet widgets/digitalclock/digitalclock.h 0
 
     \section1 DigitalClock Class Implementation
 
-    \snippet examples/widgets/digitalclock/digitalclock.cpp 0
+    \snippet widgets/digitalclock/digitalclock.cpp 0
 
     In the constructor, we first change the look of the LCD numbers. The
     QLCDNumber::Filled style produces raised segments filled with the
@@ -59,8 +59,8 @@
     call the \c showTime() slot; without this call, there would be a one-second
     delay at startup before the time is shown.
 
-    \snippet examples/widgets/digitalclock/digitalclock.cpp 1
-    \snippet examples/widgets/digitalclock/digitalclock.cpp 2
+    \snippet widgets/digitalclock/digitalclock.cpp 1
+    \snippet widgets/digitalclock/digitalclock.cpp 2
 
     The \c showTime() slot is called whenever the clock display needs
     to be updated.
diff --git a/doc/src/examples/dirview.qdoc b/examples/widgets/doc/dirview.qdoc
index a4b799678a..a4b799678a 100644
--- a/doc/src/examples/dirview.qdoc
+++ b/examples/widgets/doc/dirview.qdoc
diff --git a/doc/src/examples/dockwidgets.qdoc b/examples/widgets/doc/dockwidgets.qdoc
index 8c64c78ae4..12f18a538f 100644
--- a/doc/src/examples/dockwidgets.qdoc
+++ b/examples/widgets/doc/dockwidgets.qdoc
@@ -46,13 +46,13 @@
 
     Here's the class definition:
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.h 0
+    \snippet mainwindows/dockwidgets/mainwindow.h 0
 
     We will now review each function in turn.
 
     \section1 MainWindow Class Implementation
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 0
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 0
 
     We start by including \c <QtGui>, a header file that contains the
     definition of all classes in the \l QtCore and \l QtGui
@@ -60,7 +60,7 @@
     every class individually and is especially convenient if we add new
     widgets. We also include \c mainwindow.h.
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 1
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 1
 
     In the constructor, we start by creating a QTextEdit widget. Then we call
     QMainWindow::setCentralWidget(). This function passes ownership of
@@ -77,7 +77,7 @@
     createToolBars(), and \c createStatusBar() functions since they
     follow the same pattern as all the other Qt examples.
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 9
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 9
 
     We create the customers dock window first, and in addition to a
     window title, we also pass it a \c this pointer so that it becomes a
@@ -109,7 +109,7 @@
     We briefly discuss the rest of the implementation, but have now
     covered everything relating to dock windows.
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 2
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 2
 
     In this function we clear the QTextEdit so that it is empty. Next we
     create a QTextCursor on the QTextEdit. We move the cursor to the
@@ -120,7 +120,7 @@
     insert the skeleton of the letter including two markers \c NAME and
     \c ADDRESS. We will also use the \c{Yours sincerely,} text as a marker.
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 6
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 6
 
     If the user clicks a customer we split the customer details into
     pieces. We then look for the \c NAME marker using the \c find()
@@ -133,7 +133,7 @@
     operation by the QTextEdit, so a single undo will revert all the
     insertions.
     
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 7
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 7
 
     This function works in a similar way to \c insertCustomer(). First
     we look for the marker, in this case, \c {Yours sincerely,}, and then
@@ -141,19 +141,19 @@
     we use a \c beginEditBlock() ... \c endEditBlock() pair so that the
     insertion can be undone as a single operation.
     
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 3
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 3
 
     Qt's QTextDocument class makes printing documents easy. We simply
     take the QTextEdit's QTextDocument, set up the printer and print the
     document.
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 4
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 4
 
     QTextEdit can output its contents in HTML format, so we prompt the
     user for the name of an HTML file and if they provide one we simply
     write the QTextEdit's contents in HTML format to the file.
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 5
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 5
 
     If the focus is in the QTextEdit, pressing \uicontrol Ctrl+Z undoes as
     expected. But for the user's convenience we provide an
diff --git a/doc/src/examples/dragdroprobot.qdoc b/examples/widgets/doc/dragdroprobot.qdoc
index c6563a5286..60bd4eb4d8 100644
--- a/doc/src/examples/dragdroprobot.qdoc
+++ b/examples/widgets/doc/dragdroprobot.qdoc
@@ -63,7 +63,7 @@
 
     Let's start with the \c RobotPart class declaration.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.h 0
+    \snippet graphicsview/dragdroprobot/robot.h 0
 
     This base class inherits QGraphicsObject. QGraphicsObject provides signals
     and slots through inheriting QObject, and it also declares QGraphicsItem's
@@ -80,7 +80,7 @@
     variable, which we will use later to indicate visually that the limb can
     accept colors that are is dragged onto it.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 0
+    \snippet graphicsview/dragdroprobot/robot.cpp 0
 
     \c RobotPart's constructor initializes the dragOver member and sets the
     color to Qt::lightGray. In the constructor body we enable support for
@@ -89,7 +89,7 @@
 
     The rest of this class's implementation is to support Drag and Drop.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 1
+    \snippet graphicsview/dragdroprobot/robot.cpp 1
 
     The \l{QGraphicsItem::dragEnterEvent()}{dragEnterEvent()} handler is called
     when a Drag and Drop element is dragged into the robot part's area.
@@ -102,7 +102,7 @@
     visual feedback to the user; otherwise the event is ignored, which in turn
     allows the event to propagate to parent elements.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 2
+    \snippet graphicsview/dragdroprobot/robot.cpp 2
 
     The \l{QGraphicsItem::dragLeaveEvent()}{dragLeaveEvent()} handler is called
     when a Drag and Drop element is dragged away from the robot part's area.
@@ -110,7 +110,7 @@
     \l{QGraphicsItem::update()}{update()} to help provide visual feedback that
     the drag has left this item.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 3
+    \snippet graphicsview/dragdroprobot/robot.cpp 3
 
     The \l{QGraphicsItem::dropEvent()}{dropEvent()} handler is called when a
     Drag and Drop element is dropped onto an item (i.e., when the mouse button
@@ -124,7 +124,7 @@
     as this class has one minor difference, and leave the other classes as an
     exercise for the reader.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.h 1
+    \snippet graphicsview/dragdroprobot/robot.h 1
 
     The \c RobotHead class inherits \c RobotPart and provides the necessary
     implementations of \l{QGraphicsItem::boundingRect()}{boundingRect()} and
@@ -135,12 +135,12 @@
     The class contains a private pixmap member that we can use to implement
     support for accepting image drops.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 4
+    \snippet graphicsview/dragdroprobot/robot.cpp 4
 
     \c RobotHead has a rather plain constructor that simply forwards to
     \c RobotPart's constructor.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 5
+    \snippet graphicsview/dragdroprobot/robot.cpp 5
 
     The \l{QGraphicsItem::boundingRect()}{boundingRect()} reimplementation
     returns the extents for the head. Because we want the center of rotation to
@@ -149,7 +149,7 @@
     rotating the head, the "neck" will stay still while the top of the head
     tilts from side to side.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 6
+    \snippet graphicsview/dragdroprobot/robot.cpp 6
 
     In \l{QGraphicsItem::paint()}{paint()} we draw the actual head. The
     implementation is split into two sections; if an image has been dropped
@@ -160,7 +160,7 @@
     can often be faster to draw the head as an image rather than using a
     sequence of vector operations.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 7
+    \snippet graphicsview/dragdroprobot/robot.cpp 7
 
     The robot head can accept image drops. In order to support this, its
     reimplementation of \l{QGraphicsItem::dragEnterEvent()}{dragEnterEvent()}
@@ -168,7 +168,7 @@
     event is accepted. Otherwise we fall back to the base \c RobotPart
     implementation.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 8
+    \snippet graphicsview/dragdroprobot/robot.cpp 8
 
     To follow up on image support, we must also implement
     \l{QGraphicsItem::dropEvent()}{dropEvent()}. We check if the drag object
@@ -180,21 +180,21 @@
     \c RobotTorso and \c RobotLimb are similar to \c RobotHead, so let's
     skip directly to the \c Robot class.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.h 4
+    \snippet graphicsview/dragdroprobot/robot.h 4
 
     The \c Robot class also inherits \c RobotPart, and like the other parts it
     also implements \l{QGraphicsItem::boundingRect()}{boundingRect()} and
     \l{QGraphicsItem::paint()}{paint()}. It provides a rather special
     implementation, though:
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 9
+    \snippet graphicsview/dragdroprobot/robot.cpp 9
 
     Because the \c Robot class is only used as a base node for the rest of the
     robot, it has no visual representation. Its
     \l{QGraphicsItem::boundingRect()}{boundingRect()} implementation can
     therefore return a null QRectF, and its paint() function does nothing.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 10
+    \snippet graphicsview/dragdroprobot/robot.cpp 10
 
     The constructor starts by setting the flag
     \l{QGraphicsItem::ItemHasNoContents}{ItemHasNoContents}, which is a minor
@@ -208,13 +208,13 @@
     the head a child of the torso; if you rotate the torso, the head will
     follow. The same pattern is applied to the rest of the limbs.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 11
+    \snippet graphicsview/dragdroprobot/robot.cpp 11
 
     Each robot part is carefully positioned. For example, the upper left arm is
     moved precisely to the top-left area of the torso, and the upper right arm
     is moved to the top-right area.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 12
+    \snippet graphicsview/dragdroprobot/robot.cpp 12
 
     The next section creates all animation objects. This snippet shows the two
     animations that operate on the head's scale and rotation. The two
@@ -226,7 +226,7 @@
 
     The rest of the animations are defined in a similar way.
 
-    \snippet examples/graphicsview/dragdroprobot/robot.cpp 13
+    \snippet graphicsview/dragdroprobot/robot.cpp 13
 
     Finally we set an easing curve and duration on each animation, ensure the
     toplevel animation group loops forever, and start the toplevel animation.
@@ -236,7 +236,7 @@
     The \c ColorItem class represents a circular item that can be pressed to
     drag colors onto robot parts.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.h 0
+    \snippet graphicsview/dragdroprobot/coloritem.h 0
 
     This class is very simple. It does not use animations, and has no need for
     properties nor signals and slots, so to save resources, it's most natural
@@ -252,7 +252,7 @@
 
     Let's take a look at its implementation.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 0
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 0
 
     \c ColorItem's constructor assigns an opaque random color to its color
     member by making use of qrand(). For improved usability, it assigns a
@@ -266,7 +266,7 @@
     mouse event handlers greatly, as we can always assume that only the left
     mouse button is pressed and released.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 1
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 1
 
     The item's bounding rect is a fixed 30x30 units centered around the item's
     origin (0, 0), and adjusted by 0.5 units in all directions to allow a
@@ -274,19 +274,19 @@
     also compensate with a few units down and to the right to make room
     for a simple dropshadow.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 2
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 2
 
     The \l{QGraphicsItem::paint()}{paint()} implementation draws an ellipse
     with a 1-unit black outline, a plain color fill, and a dark gray
     dropshadow.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 3
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 3
 
     The \l{QGraphicsItem::mousePressEvent()}{mousePressEvent()} handler is
     called when you press the mouse button inside the item's area. Our
     implementation simply sets the cursor to Qt::ClosedHandCursor.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 4
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 4
 
     The \l{QGraphicsItem::mouseReleaseEvent()}{mouseReleaseEvent()} handler is
     called when you release the mouse button after having pressed it inside an
@@ -296,7 +296,7 @@
     the cursor changes to an open hand. Pressing the item will show a closed
     hand cursor. Releasing will restore to an open hand cursor again.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 5
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 5
 
     The \l{QGraphicsItem::mouseMoveEvent()}{mouseMoveEvent()} handler is called
     when you move the mouse around after pressing the mouse button inside the
@@ -313,20 +313,20 @@
     the right time. We also create a QMimeData instance that can contain our
     color or image data, and assign this to the drag object.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 6
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 6
 
     This snippet has a somewhat random outcome: once in a while, a special
     image is assigned to the drag object's mime data. The pixmap is also
     assiged as the drag object's pixmap. This will ensure that you can see the
     image that is being dragged as a pixmap under the mouse cursor.
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 7
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 7
 
     Otherwise, and this is the most common outcome, a simple color is assigned
     to the drag object's mime data. We render this \c ColorItem into a new
     pixmap to give the user visual feedback that the color is being "dragged".
 
-    \snippet examples/graphicsview/dragdroprobot/coloritem.cpp 8
+    \snippet graphicsview/dragdroprobot/coloritem.cpp 8
 
     Finally we execute the drag. QDrag::exec() will reenter the event loop, and
     only exit if the drag has either been dropped, or canceled. In any case we
@@ -337,13 +337,13 @@
     Now that the \c Robot and \c ColorItem classes are complete, we can put all
     the pieces together inside the main() function.
 
-    \snippet examples/graphicsview/dragdroprobot/main.cpp 0
+    \snippet graphicsview/dragdroprobot/main.cpp 0
 
     We start off by constructing QApplication, and initializing the random
     number generator. This ensures that the color items have different colors
     every time the application starts.
 
-    \snippet examples/graphicsview/dragdroprobot/main.cpp 1
+    \snippet graphicsview/dragdroprobot/main.cpp 1
 
     We construct a fixed size scene, and create 10 \c ColorItem instances
     arranged in a circle. Each item is added to the scene.
@@ -351,7 +351,7 @@
     In the center of this circle we create one \c Robot instance. The
     robot is scaled and moved up a few units. It is then added to the scene.
 
-    \snippet examples/graphicsview/dragdroprobot/main.cpp 2
+    \snippet graphicsview/dragdroprobot/main.cpp 2
 
     Finally we create a QGraphicsView window, and assign the scene to it.
 
diff --git a/doc/src/examples/dynamiclayouts.qdoc b/examples/widgets/doc/dynamiclayouts.qdoc
index 318f719503..318f719503 100644
--- a/doc/src/examples/dynamiclayouts.qdoc
+++ b/examples/widgets/doc/dynamiclayouts.qdoc
diff --git a/doc/src/examples/easing.qdoc b/examples/widgets/doc/easing.qdoc
index 7fb7f59531..7fb7f59531 100644
--- a/doc/src/examples/easing.qdoc
+++ b/examples/widgets/doc/easing.qdoc
diff --git a/doc/src/examples/editabletreemodel.qdoc b/examples/widgets/doc/editabletreemodel.qdoc
index 958080ad58..423b9cee94 100644
--- a/doc/src/examples/editabletreemodel.qdoc
+++ b/examples/widgets/doc/editabletreemodel.qdoc
@@ -230,7 +230,7 @@
     pieces of data, and which can provide information about their parent
     and child items:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.h 0
+    \snippet itemviews/editabletreemodel/treeitem.h 0
 
     We have designed the API to be similar to that provided by
     QAbstractItemModel by giving each item functions to return the number
@@ -247,7 +247,7 @@
     Each \c TreeItem is constructed with a list of data and an optional
     parent item:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 0
+    \snippet itemviews/editabletreemodel/treeitem.cpp 0
 
     Initially, each item has no children. These are added to the item's
     internal \c childItems member using the \c insertChildren() function
@@ -256,29 +256,29 @@
     The destructor ensures that each child added to the item is deleted
     when the item itself is deleted:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 1
+    \snippet itemviews/editabletreemodel/treeitem.cpp 1
 
     \target TreeItem::parent
     Since each item stores a pointer to its parent, the \c parent() function
     is trivial:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 9
+    \snippet itemviews/editabletreemodel/treeitem.cpp 9
 
     \target TreeItem::child
     Three functions provide information about the children of an item.
     \c child() returns a specific child from the internal list of children:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 2
+    \snippet itemviews/editabletreemodel/treeitem.cpp 2
 
     The \c childCount() function returns the total number of children:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 3
+    \snippet itemviews/editabletreemodel/treeitem.cpp 3
 
     The \c childNumber() function is used to determine the index of the child
     in its parent's list of children. It accesses the parent's \c childItems
     member directly to obtain this information:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 4
+    \snippet itemviews/editabletreemodel/treeitem.cpp 4
 
     The root item has no parent item; for this item, we return zero to be
     consistent with the other items.
@@ -286,20 +286,20 @@
     The \c columnCount() function simply returns the number of elements in
     the internal \c itemData list of QVariant objects:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 5
+    \snippet itemviews/editabletreemodel/treeitem.cpp 5
 
     \target TreeItem::data
     Data is retrieved using the \c data() function, which accesses the
     appropriate element in the \c itemData list:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 6
+    \snippet itemviews/editabletreemodel/treeitem.cpp 6
 
     \target TreeItem::setData
     Data is set using the \c setData() function, which only stores values
     in the \c itemData list for valid list indexes, corresponding to column
     values in the model:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 11
+    \snippet itemviews/editabletreemodel/treeitem.cpp 11
 
     To make implementation of the model easier, we return true to indicate
     whether the data was set successfully, or false if an invalid column
@@ -309,20 +309,20 @@
     in the model leads to the insertion of new child items in the corresponding
     item, handled by the \c insertChildren() function:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 7
+    \snippet itemviews/editabletreemodel/treeitem.cpp 7
 
     This ensures that new items are created with the required number of columns
     and inserted at a valid position in the internal \c childItems list.
     Items are removed with the \c removeChildren() function:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 10
+    \snippet itemviews/editabletreemodel/treeitem.cpp 10
 
     As discussed above, the functions for inserting and removing columns are
     used differently to those for inserting and removing child items because
     they are expected to be called on every item in the tree. We do this by
     recursively calling this function on each child of the item:
 
-    \snippet examples/itemviews/editabletreemodel/treeitem.cpp 8
+    \snippet itemviews/editabletreemodel/treeitem.cpp 8
 
     \section1 TreeModel Class Definition
 
@@ -330,16 +330,16 @@
     class, exposing the necessary interface for a model that can be edited and
     resized.
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.h 0
+    \snippet itemviews/editabletreemodel/treemodel.h 0
 
     The constructor and destructor are specific to this model.
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.h 1
+    \snippet itemviews/editabletreemodel/treemodel.h 1
 
     Read-only tree models only need to provide the above functions. The
     following public functions provide support for editing and resizing:
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.h 2
+    \snippet itemviews/editabletreemodel/treemodel.h 2
 
     To simplify this example, the data exposed by the model is organized into
     a data structure by the model's \l{TreeModel::setupModelData}{setupModelData()}
@@ -351,7 +351,7 @@
     The constructor creates a root item and initializes it with the header
     data supplied:
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 0
+    \snippet itemviews/editabletreemodel/treemodel.cpp 0
 
     We call the internal \l{TreeModel::setupModelData}{setupModelData()}
     function to convert the textual data supplied to a data structure we can
@@ -361,7 +361,7 @@
     The destructor only has to delete the root item; all child items will
     be recursively deleted by the \c TreeItem destructor.
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 1
+    \snippet itemviews/editabletreemodel/treemodel.cpp 1
 
     \target TreeModel::getItem
     Since the model's interface to the other model/view components is based
@@ -371,7 +371,7 @@
     consistency, we have defined a \c getItem() function to perform this
     repetitive task:
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 4
+    \snippet itemviews/editabletreemodel/treemodel.cpp 4
 
     This function assumes that each model index it is passed corresponds to
     a valid item in memory. If the index is invalid, or its internal pointer
@@ -381,13 +381,13 @@
     \c getItem() function to obtain the relevant item, then returns the
     number of children it contains:
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 8
+    \snippet itemviews/editabletreemodel/treemodel.cpp 8
 
     By contrast, the \c columnCount() implementation does not need to look
     for a particular item because all items are defined to have the same
     number of columns associated with them.
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 2
+    \snippet itemviews/editabletreemodel/treemodel.cpp 2
 
     As a result, the number of columns can be obtained directly from the root
     item.
@@ -397,7 +397,7 @@
     the Qt::ItemIsEditable and Qt::ItemIsSelectable flags as well as
     Qt::ItemIsEnabled:
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 3
+    \snippet itemviews/editabletreemodel/treemodel.cpp 3
 
     \target TreeModel::index
     The model needs to be able to generate model indexes to allow other
@@ -405,7 +405,7 @@
     is performed by the \c index() function, which is used to obtain model
     indexes corresponding to children of a given parent item:
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 5
+    \snippet itemviews/editabletreemodel/treemodel.cpp 5
 
     In this model, we only return model indexes for child items if the parent
     index is invalid (corresponding to the root item) or if it has a zero
@@ -415,7 +415,7 @@
     a \c TreeItem instance that corresponds to the model index supplied, and
     request its child item that corresponds to the specified row.
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 6
+    \snippet itemviews/editabletreemodel/treemodel.cpp 6
 
     Since each item contains information for an entire row of data, we create
     a model index to uniquely identify it by calling
@@ -432,7 +432,7 @@
     then creating a model index to represent the parent. (See
     \l{Relating-items-using-model-indexes}{the above diagram}).
 
-    \snippet examples/itemviews/editabletreemodel/treemodel.cpp 7
+    \snippet itemviews/editabletreemodel/treemodel.cpp 7
 
     Items without parents, including the root item, are handled by returning
     a null model index. Otherwise, a model index is created and returned as
diff --git a/doc/src/examples/elasticnodes.qdoc b/examples/widgets/doc/elasticnodes.qdoc
index bd25008f60..17f14124f8 100644
--- a/doc/src/examples/elasticnodes.qdoc
+++ b/examples/widgets/doc/elasticnodes.qdoc
@@ -61,7 +61,7 @@
 
     Let's start by looking at the \c Node class declaration.
 
-    \snippet examples/graphicsview/elasticnodes/node.h 0
+    \snippet graphicsview/elasticnodes/node.h 0
 
     The \c Node class inherits QGraphicsItem, and reimplements the two
     mandatory functions \l{QGraphicsItem::boundingRect()}{boundingRect()} and
@@ -87,7 +87,7 @@
     We will start reviewing the \c Node implementation by looking at its
     constructor:
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 0
+    \snippet graphicsview/elasticnodes/node.cpp 0
 
     In the constructor, we set the
     \l{QGraphicsItem::ItemIsMovable}{ItemIsMovable} flag to allow the item to
@@ -102,7 +102,7 @@
     \c Node's constructor takes a \c GraphWidget pointer and stores this as a
     member variable. We will revisit this pointer later on.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 1
+    \snippet graphicsview/elasticnodes/node.cpp 1
 
     The addEdge() function adds the input edge to a list of attached edges. The
     edge is then adjusted so that the end points for the edge match the
@@ -110,7 +110,7 @@
 
     The edges() function simply returns the list of attached edges.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 2
+    \snippet graphicsview/elasticnodes/node.cpp 2
 
     There are two ways to move a node. The \c calculateForces() function
     implements the elastic effect that pulls and pushes on nodes in the grid.
@@ -121,7 +121,7 @@
     Because we need to find all neighboring (but not necessarily connected)
     nodes, we also make sure the item is part of a scene in the first place.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 3
+    \snippet graphicsview/elasticnodes/node.cpp 3
 
     The "elastic" effect comes from an algorithm that applies pushing and
     pulling forces. The effect is impressive, and surprisingly simple to
@@ -142,41 +142,41 @@
     rapid degradation when distance increases. The sum of all forces is stored
     in \c xvel (X-velocity) and \c yvel (Y-velocity).
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 4
+    \snippet graphicsview/elasticnodes/node.cpp 4
 
     The edges between the nodes represent forces that pull the nodes together.
     By visiting each edge that is connected to this node, we can use a similar
     approach as above to find the direction and strength of all pulling forces.
     These forces are subtracted from \c xvel and \c yvel.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 5
+    \snippet graphicsview/elasticnodes/node.cpp 5
 
     In theory, the sum of pushing and pulling forces should stabilize to
     precisely 0. In practice, however, they never do. To circumvent errors in
     numerical precision, we simply force the sum of forces to be 0 when they
     are less than 0.1.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 6
+    \snippet graphicsview/elasticnodes/node.cpp 6
 
     The final step of \c calculateForces() determines the node's new position.
     We add the force to the node's current position. We also make sure the new
     position stays inside of our defined boundaries. We don't actually move the
     item in this function; that's done in a separate step, from \c advance().
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 7
+    \snippet graphicsview/elasticnodes/node.cpp 7
 
     The \c advance() function updates the item's current position. It is called
     from \c GraphWidget::timerEvent(). If the node's position changed, the
     function returns true; otherwise false is returned.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 8
+    \snippet graphicsview/elasticnodes/node.cpp 8
 
     The \c Node's bounding rectangle is a 20x20 sized rectangle centered around
     its origin (0, 0), adjusted by 2 units in all directions to compensate for
     the node's outline stroke, and by 3 units down and to the right to make
     room for a simple drop shadow.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 9
+    \snippet graphicsview/elasticnodes/node.cpp 9
 
     The shape is a simple ellipse. This ensures that you must click inside the
     node's elliptic shape in order to drag it around. You can test this effect
@@ -185,7 +185,7 @@
     item's hit area would be identical to its bounding rectangle (i.e.,
     rectangular).
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 10
+    \snippet graphicsview/elasticnodes/node.cpp 10
 
     This function implements the node's painting. We start by drawing a simple
     dark gray elliptic drop shadow at (-7, -7), that is, (3, 3) units down and
@@ -201,7 +201,7 @@
     uses \l{QGraphicsItem::DeviceCoordinateCache}{DeviceCoordinateCache}, a
     simple yet effective measure that prevents unnecessary redrawing.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 11
+    \snippet graphicsview/elasticnodes/node.cpp 11
 
     We reimplement \l{QGraphicsItem::itemChange()}{itemChange()} to adjust the
     position of all connected edges, and to notify the scene that an item has
@@ -213,7 +213,7 @@
     notification using a signal; in such case, \c Node would need to inherit
     from QGraphicsObject.
 
-    \snippet examples/graphicsview/elasticnodes/node.cpp 12
+    \snippet graphicsview/elasticnodes/node.cpp 12
 
     Because we have set the \l{QGraphicsItem::ItemIsMovable}{ItemIsMovable}
     flag, we don't need to implement the logic that moves the node according to
@@ -232,7 +232,7 @@
 
     Let's take a look at the class declaration:
 
-    \snippet examples/graphicsview/elasticnodes/edge.h 0
+    \snippet graphicsview/elasticnodes/edge.h 0
 
     \c Edge inherits from QGraphicsItem, as it's a simple class that has no use
     for signals, slots, and properties (compare to QGraphicsObject).
@@ -246,7 +246,7 @@
 
     We will now review its implementation.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 0
+    \snippet graphicsview/elasticnodes/edge.cpp 0
 
     The \c Edge constructor initializes its \c arrowSize data member to 10 units;
     this determines the size of the arrow which is drawn in
@@ -259,12 +259,12 @@
     pointers are updated, this edge is registered with each node, and we call
     \c adjust() to update this edge's start end end position.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 1
+    \snippet graphicsview/elasticnodes/edge.cpp 1
 
     The source and destination get-functions simply return the respective
     pointers.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 2
+    \snippet graphicsview/elasticnodes/edge.cpp 2
 
     In \c adjust(), we define two points: \c sourcePoint, and \c destPoint,
     pointing at the source and destination nodes' origins respectively. Each
@@ -298,7 +298,7 @@
     bookkeeping clean. It's safest to call this function once, immediately
     before any such variable is modified.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 3
+    \snippet graphicsview/elasticnodes/edge.cpp 3
 
     The edge's bounding rectangle is defined as the smallest rectangle that
     includes both the start and the end point of the edge. Because we draw an
@@ -307,7 +307,7 @@
     draw the outline of the arrow, and we can assume that half of the outline
     can be drawn outside of the arrow's area, and half will be drawn inside.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 4
+    \snippet graphicsview/elasticnodes/edge.cpp 4
 
     We start the reimplementation of \l{QGraphicsItem::paint()}{paint()} by
     checking a few preconditions. Firstly, if either the source or destination
@@ -316,13 +316,13 @@
     At the same time, we check if the length of the edge is approximately 0,
     and if it is, then we also return.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 5
+    \snippet graphicsview/elasticnodes/edge.cpp 5
 
     We draw the line using a pen that has round joins and caps. If you run the
     example, zoom in and study the edge in detail, you will see that there are
     no sharp/square edges.
 
-    \snippet examples/graphicsview/elasticnodes/edge.cpp 6
+    \snippet graphicsview/elasticnodes/edge.cpp 6
 
     We proceed to drawing one arrow at each end of the edge. Each arrow is
     drawn as a polygon with a black fill. The coordinates for the arrow are
@@ -333,7 +333,7 @@
     \c GraphWidget is a subclass of QGraphicsView, which provides the main
     window with scrollbars.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.h 0
+    \snippet graphicsview/elasticnodes/graphwidget.h 0
 
     The class provides a basic constructor that initializes the scene, an \c
     itemMoved() function to notify changes in the scene's node graph, a few
@@ -341,7 +341,7 @@
     \l{QGraphicsView::drawBackground()}{drawBackground()}, and a helper
     function for scaling the view by using the mouse wheel or keyboard.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 0
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 0
 
     \c GraphicsWidget's constructor creates the scene, and because most items
     move around most of the time, it sets QGraphicsScene::NoIndex. The scene
@@ -366,19 +366,19 @@
     Finally we give the window a minimum size that matches the scene's default
     size, and set a suitable window title.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 1
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 1
 
     The last part of the constructor creates the grid of nodes and edges, and
     gives each node an initial position.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 2
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 2
 
     \c GraphWidget is notified of node movement through this \c itemMoved()
     function. Its job is simply to restart the main timer in case it's not
     running already. The timer is designed to stop when the graph stabilizes,
     and start once it's unstable again.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 3
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 3
 
     This is \c GraphWidget's key event handler. The arrow keys move the center
     node around, the '+' and '-' keys zoom in and out by calling \c
@@ -386,7 +386,7 @@
     nodes. All other key events (e.g., page up and page down) are handled by
     QGraphicsView's default implementation.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 4
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 4
 
     The timer event handler's job is to run the whole force calculation
     machinery as a smooth animation. Each time the timer is triggered, the
@@ -396,14 +396,14 @@
     By checking the return value of \c advance(), we can decide if the grid
     stabilized (i.e., no nodes moved). If so, we can stop the timer.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 5
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 5
 
     In the wheel event handler, we convert the mouse wheel delta to a scale
     factor, and pass this factor to \c scaleView(). This approach takes into
     account the speed that the wheel is rolled. The faster you roll the mouse
     wheel, the faster the view will zoom.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 6
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 6
 
     The view's background is rendered in a reimplementation of
     QGraphicsView::drawBackground(). We draw a large rectangle filled with a
@@ -413,7 +413,7 @@
     This background rendering is quite expensive; this is why the view enables
     QGraphicsView::CacheBackground.
 
-    \snippet examples/graphicsview/elasticnodes/graphwidget.cpp 7
+    \snippet graphicsview/elasticnodes/graphwidget.cpp 7
 
     The \c scaleView() helper function checks that the scale factor stays
     within