Move opengl/wid/net example docs to proper folders.

Change-Id: I846439a9cf7ad965ed27a00f98dbc4ff97abe73b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>

195 files changed, 439 insertions, 439 deletions

diff --git a/doc/src/examples/bearermonitor.qdoc b/doc/src/examples/bearermonitor.qdoc
index 07c142a0e6..419fd87267 100644
--- a/doc/src/examples/bearermonitor.qdoc
+++ b/doc/src/examples/bearermonitor.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/bearermonitor
+    \example bearermonitor
     \title Bearer Monitor Example
 
     The Bearer Monitor example shows how to use the Bearer Management API.
diff --git a/doc/src/examples/books.qdoc b/doc/src/examples/books.qdoc
index 2b6ce1e45b..135cecafea 100644
--- a/doc/src/examples/books.qdoc
+++ b/doc/src/examples/books.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/books
+    \example books
     \title Books
 
     The Books example shows how Qt's SQL classes can be used with the model/view
diff --git a/doc/src/examples/codecs.qdoc b/doc/src/examples/codecs.qdoc
index e54981abb3..84b80b63f6 100644
--- a/doc/src/examples/codecs.qdoc
+++ b/doc/src/examples/codecs.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example tools/codecs
+    \example codecs
     \title Codecs Example
 
     The Codecs example demonstrates the principles behind importing and exporting text
diff --git a/doc/src/examples/completer.qdoc b/doc/src/examples/completer.qdoc
index df832de4d6..0e635e3fb0 100644
--- a/doc/src/examples/completer.qdoc
+++ b/doc/src/examples/completer.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example tools/completer
+    \example completer
     \title Completer Example
 
     The Completer example shows how to provide string-completion facilities
diff --git a/doc/src/examples/complexpingpong.qdoc b/doc/src/examples/complexpingpong.qdoc
index 0c6880826f..00e648b8fd 100644
--- a/doc/src/examples/complexpingpong.qdoc
+++ b/doc/src/examples/complexpingpong.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example dbus/complexpingpong
+    \example complexpingpong
     \title Complex Ping Pong Example
 
     The Complex Ping Pong example improves on the \l{D-Bus Ping Pong Example} by providing
diff --git a/doc/src/examples/contiguouscache.qdoc b/doc/src/examples/contiguouscache.qdoc
index 02f333054e..b187997bf0 100644
--- a/doc/src/examples/contiguouscache.qdoc
+++ b/doc/src/examples/contiguouscache.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example tools/contiguouscache
+    \example contiguouscache
     \title Contiguous Cache Example
 
     The Contiguous Cache example shows how to use QContiguousCache to manage memory usage for
diff --git a/doc/src/examples/cube.qdoc b/doc/src/examples/cube.qdoc
deleted file mode 100644
index ec40be0f45..0000000000
--- a/doc/src/examples/cube.qdoc
+++ /dev/null
@@ -1,178 +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:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** 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 opengl/cube
-    \group all-examples
-    \title Cube OpenGL ES 2.0 example
-
-    The Cube OpenGL ES 2.0 example shows how to write mouse rotateable
-	textured 3D cube using OpenGL ES 2.0 with Qt. It shows how to handle
-	polygon geometries efficiently and how to write simple vertex and
-	fragment shader for programmable graphics pipeline. In addition it
-	shows how to use quaternions for representing 3D object orientation.
-
-    This example has been written for OpenGL ES 2.0 but it works also on
-	desktop OpenGL because this example is simple enough and for the
-	most parts desktop OpenGL API is same. It compiles also without OpenGL
-	support but then it just shows a label stating that OpenGL support is
-	required.
-
-	\image cube.png Screenshot of the Cube example running on N900
-
-	The example consist of two classes:
-
-	\list
-    \li \c MainWidget extends QGLWidget and contains OpenGL ES 2.0
-		initialization and drawing and mouse and timer event handling
-    \li \c GeometryEngine handles polygon geometries. Transfers polygon geometry
-		to vertex buffer objects and draws geometries from vertex buffer objects.
-	\endlist
-
-	We'll start by initializing OpenGL ES 2.0 in \c MainWidget.
-
-	\tableofcontents
-
-	\section1 Initializing OpenGL ES 2.0
-
-	Since OpenGL ES 2.0 doesn't support fixed graphics pipeline anymore it has to
-	be implemented by ourselves. This makes graphics pipeline very flexible but
-	in the same time it becomes more difficult because user has to implement graphics
-	pipeline to get even the simplest example running. It also makes graphics pipeline
-	more efficient because user can decide what kind of pipeline is needed for the
-	application.
-
-	First we have to implement vertex shader. It gets vertex data and
-	model-view-projection matrix (MVP) as parameters. It transforms vertex position
-	using MVP matrix to screen space and passes texture coordinate to
-	fragment shader. Texture coordinate will be automatically interpolated on polygon
-	faces.
-
-	\snippet examples/opengl/cube/vshader.glsl 0
-
-	After that we need to implement second part of the graphics pipeline - fragment
-	shader. For this exercise we need to implement fragment shader that handles
-	texturing. It gets interpolated texture coordinate as a parameter and looks up
-	fragment color from the given texture.
-
-	\snippet examples/opengl/cube/fshader.glsl 0
-
-	Using \c QGLShaderProgram we can compile, link and bind shader code to
-	graphics pipeline. This code uses Qt Resource files to access shader source code.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 3
-
-	The following code enables depth buffering and back face culling.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 2
-
-	\section1 Loading textures from Qt Resource files
-
-	\c QGLWidget interface implements methods for loading textures from QImage to GL
-	texture memory. We still need to use OpenGL provided functions for specifying
-	the GL texture unit and configuring texture filtering options.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 4
-
-	\section1 Cube Geometry
-
-	There are many ways to render polygons in OpenGL but the most efficient way is
-	to use only triangle strip primitives and render vertices from graphics hardware
-	memory. OpenGL has a mechanism to create buffer objects to this memory area and
-	transfer vertex data to these buffers. In OpenGL terminology these are referred
-	as Vertex Buffer Objects (VBO).
-
-	\image cube_faces.png Cube faces and vertices
-
-	This is how cube faces break down to triangles. Vertices are ordered this way
-	to get vertex ordering correct using triangle strips. OpenGL determines triangle
-	front and back face based on vertex ordering. By default OpenGL uses
-	counter-clockwise order for front faces. This information is used by back face
-	culling which improves rendering performance by not rendering back faces of the
-	triangles. This way graphics pipeline can omit rendering sides of the triangle that
-	aren't facing towards screen.
-
-	Creating vertex buffer objects and transferring data to them is quite simple using
-	OpenGL provided functions.
-
-	\snippet examples/opengl/cube/geometryengine.cpp 0
-
-	\snippet examples/opengl/cube/geometryengine.cpp 1
-
-	Drawing primitives from VBOs and telling programmable graphics pipeline how to
-	locate vertex data requires few steps. First we need to bind VBOs to be used.
-	After that we bind shader program attribute names and configure what
-	kind of data it has in the bound VBO. Finally we'll draw triangle
-	strip primitives using indices from the other VBO.
-
-	\snippet examples/opengl/cube/geometryengine.cpp 2
-
-	\section1 Perspective projection
-
-	Using \c QMatrix4x4 helper methods it's really easy to calculate perpective
-	projection matrix. This matrix is used to project vertices to screen space.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 5
-
-	\section1 Orientation of the 3D object
-
-	Quaternions are handy way to represent orientation of the 3D object. Quaternions
-	involve quite complex mathematics but fortunately all the necessary mathematics
-	behind quaternions is implemented in \c QQuaternion. That allows us to store
-	cube orientation in quaternion and rotating cube around given axis is quite
-	simple.
-
-	The following code calculates rotation axis and angular speed based on mouse events.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 0
-
-	\c QBasicTimer is used to animate scene and update cube orientation. Rotations
-	can be concatenated simply by multiplying quaternions.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 1
-
-	Model-view matrix is calculated using the quaternion and by moving world by Z axis.
-	This matrix is multiplied with the projection matrix to get MVP matrix for shader
-	program.
-
-	\snippet examples/opengl/cube/mainwidget.cpp 6
-
-*/
diff --git a/doc/src/images/blockingfortuneclient-example.png b/examples/network/doc/images/blockingfortuneclient-example.png
index cdb7cac0d3..cdb7cac0d3 100644
--- a/doc/src/images/blockingfortuneclient-example.png
+++ b/examples/network/doc/images/blockingfortuneclient-example.png
diff --git a/doc/src/images/broadcastreceiver-example.png b/examples/network/doc/images/broadcastreceiver-example.png
index b83789523c..b83789523c 100644
--- a/doc/src/images/broadcastreceiver-example.png
+++ b/examples/network/doc/images/broadcastreceiver-example.png
diff --git a/doc/src/images/broadcastsender-example.png b/examples/network/doc/images/broadcastsender-example.png
index bf7ccbeb9e..bf7ccbeb9e 100644
--- a/doc/src/images/broadcastsender-example.png
+++ b/examples/network/doc/images/broadcastsender-example.png
diff --git a/doc/src/images/fortuneclient-example.png b/examples/network/doc/images/fortuneclient-example.png
index b34a98736d..b34a98736d 100644
--- a/doc/src/images/fortuneclient-example.png
+++ b/examples/network/doc/images/fortuneclient-example.png
diff --git a/doc/src/images/fortuneserver-example.png b/examples/network/doc/images/fortuneserver-example.png
index 73f27d5653..73f27d5653 100644
--- a/doc/src/images/fortuneserver-example.png
+++ b/examples/network/doc/images/fortuneserver-example.png
diff --git a/doc/src/images/googlesuggest-example.png b/examples/network/doc/images/googlesuggest-example.png
index 477d444cbd..477d444cbd 100644
--- a/doc/src/images/googlesuggest-example.png
+++ b/examples/network/doc/images/googlesuggest-example.png
diff --git a/doc/src/images/http-example.png b/examples/network/doc/images/http-example.png
index 16b0539b1b..16b0539b1b 100644
--- a/doc/src/images/http-example.png
+++ b/examples/network/doc/images/http-example.png
diff --git a/doc/src/images/loopback-example.png b/examples/network/doc/images/loopback-example.png
index 2b1bd4a0f2..2b1bd4a0f2 100644
--- a/doc/src/images/loopback-example.png
+++ b/examples/network/doc/images/loopback-example.png
diff --git a/doc/src/images/multicastreceiver-example.png b/examples/network/doc/images/multicastreceiver-example.png
index 8de11cda63..8de11cda63 100644
--- a/doc/src/images/multicastreceiver-example.png
+++ b/examples/network/doc/images/multicastreceiver-example.png
diff --git a/doc/src/images/multicastsender-example.png b/examples/network/doc/images/multicastsender-example.png
index a619b047e3..a619b047e3 100644
--- a/doc/src/images/multicastsender-example.png
+++ b/examples/network/doc/images/multicastsender-example.png
diff --git a/doc/src/images/network-chat-example.png b/examples/network/doc/images/network-chat-example.png
index 949bb07d87..949bb07d87 100644
--- a/doc/src/images/network-chat-example.png
+++ b/examples/network/doc/images/network-chat-example.png
diff --git a/doc/src/images/securesocketclient.png b/examples/network/doc/images/securesocketclient.png
index 8736cbc264..8736cbc264 100644
--- a/doc/src/images/securesocketclient.png
+++ b/examples/network/doc/images/securesocketclient.png
diff --git a/doc/src/images/securesocketclient2.png b/examples/network/doc/images/securesocketclient2.png
index 23db851e61..23db851e61 100644
--- a/doc/src/images/securesocketclient2.png
+++ b/examples/network/doc/images/securesocketclient2.png
diff --git a/doc/src/images/threadedfortuneserver-example.png b/examples/network/doc/images/threadedfortuneserver-example.png
index 57c66a5605..57c66a5605 100644
--- a/doc/src/images/threadedfortuneserver-example.png
+++ b/examples/network/doc/images/threadedfortuneserver-example.png
diff --git a/doc/src/images/torrent-example.png b/examples/network/doc/images/torrent-example.png
index 1032716e04..1032716e04 100644
--- a/doc/src/images/torrent-example.png
+++ b/examples/network/doc/images/torrent-example.png
diff --git a/doc/src/examples/blockingfortuneclient.qdoc b/examples/network/doc/src/blockingfortuneclient.qdoc
index 6c3be78859..90bf439354 100644
--- a/doc/src/examples/blockingfortuneclient.qdoc
+++ b/examples/network/doc/src/blockingfortuneclient.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/blockingfortuneclient
+    \example blockingfortuneclient
     \title Blocking Fortune Client Example
 
     The Blocking Fortune Client example shows how to create a client for a
@@ -53,7 +53,7 @@
     \endlist
 
     The implementation is very similar to the
-    \l{network/fortuneclient}{Fortune Client} example, but instead of having
+    \l{fortuneclient}{Fortune Client} example, but instead of having
     QTcpSocket as a member of the main class, doing asynchronous networking in
     the main thread, we will do all network operations in a separate thread
     and use QTcpSocket's blocking API.
@@ -69,7 +69,7 @@
     We will start with the FortuneThread class, which handles the network
     code.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.h 0
+    \snippet blockingfortuneclient/fortunethread.h 0
 
     FortuneThread is a QThread subclass that provides an API for scheduling
     requests for fortunes, and it has signals for delivering fortunes and
@@ -83,15 +83,15 @@
     FortuneThread's data members from different threads concurrently, we use
     QMutex to synchronize access.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 2
+    \snippet blockingfortuneclient/fortunethread.cpp 2
 
     The requestNewFortune() function stores the host name and port of the
     fortune server as member data, and we lock the mutex with QMutexLocker to
     protect this data. We then start the thread, unless it is already
     running. We will come back to the QWaitCondition::wakeOne() call later.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 4
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 5
+    \snippet blockingfortuneclient/fortunethread.cpp 4
+    \snippet blockingfortuneclient/fortunethread.cpp 5
 
     In the run() function, we start by acquiring the mutex lock, fetching the
     host name and port from the member data, and then releasing the lock
@@ -104,7 +104,7 @@
 
     The run() function now enters a loop:
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 6
+    \snippet blockingfortuneclient/fortunethread.cpp 6
 
     The loop will continue requesting fortunes for as long as \e quit is
     false. We start our first request by creating a QTcpSocket on the stack,
@@ -114,7 +114,7 @@
     \l{QTcpSocket::connected()}{connected()} or
     \l{QTcpSocket::error()}{error()}.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 8
+    \snippet blockingfortuneclient/fortunethread.cpp 8
 
     But since we are running in a non-GUI thread, we do not have to worry
     about blocking the user interface. So instead of entering an event loop,
@@ -129,8 +129,8 @@
     After this statement, we have a connected socket to work with. Now it's
     time to see what the fortune server has sent us.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 9
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 10
+    \snippet blockingfortuneclient/fortunethread.cpp 9
+    \snippet blockingfortuneclient/fortunethread.cpp 10
 
     This step is to read the size of the packet. Although we are only reading
     two bytes here, and the \c while loop may seem to overdo it, we present this
@@ -140,43 +140,43 @@
     we abort the operation. After this statement, we know that we have received
     enough data.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 11
+    \snippet blockingfortuneclient/fortunethread.cpp 11
 
     Now we can create a QDataStream object, passing the socket to
     QDataStream's constructor, and as in the other client examples we set
     the stream protocol version to QDataStream::Qt_4_0, and read the size
     of the packet.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 12
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 13
+    \snippet blockingfortuneclient/fortunethread.cpp 12
+    \snippet blockingfortuneclient/fortunethread.cpp 13
 
     Again, we'll use a loop that waits for more data by calling
     QTcpSocket::waitForReadyRead(). In this loop, we're waiting until
     QTcpSocket::bytesAvailable() returns the full packet size.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 14
+    \snippet blockingfortuneclient/fortunethread.cpp 14
 
     Now that we have all the data that we need, we can use QDataStream to
     read the fortune string from the packet. The resulting fortune is
     delivered by emitting newFortune().
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 15
+    \snippet blockingfortuneclient/fortunethread.cpp 15
 
     The final part of our loop is that we acquire the mutex so that we can
     safely read from our member data. We then let the thread go to sleep by
     calling QWaitCondition::wait(). At this point, we can go back to
     requestNewFortune() and look closed at the call to wakeOne():
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 1
+    \snippet blockingfortuneclient/fortunethread.cpp 1
     \dots
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 3
+    \snippet blockingfortuneclient/fortunethread.cpp 3
 
     What happened here was that because the thread falls asleep waiting for a
     new request, we needed to wake it up again when a new request
     arrives. QWaitCondition is often used in threads to signal a wakeup call
     like this.
 
-    \snippet examples/network/blockingfortuneclient/fortunethread.cpp 0
+    \snippet blockingfortuneclient/fortunethread.cpp 0
 
     Finishing off the FortuneThread walkthrough, this is the destructor that
     sets \e quit to true, wakes up the thread and waits for the thread to exit
@@ -185,30 +185,30 @@
 
     Now for the BlockingClient class:
 
-    \snippet examples/network/blockingfortuneclient/blockingclient.h 0
+    \snippet blockingfortuneclient/blockingclient.h 0
 
     BlockingClient is very similar to the Client class in the
-    \l{network/fortuneclient}{Fortune Client} example, but in this class
+    \l{fortuneclient}{Fortune Client} example, but in this class
     we store a FortuneThread member instead of a pointer to a QTcpSocket.
     When the user clicks the "Get Fortune" button, the same slot is called,
     but its implementation is slightly different:
 
-    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 0
-    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 1
+    \snippet blockingfortuneclient/blockingclient.cpp 0
+    \snippet blockingfortuneclient/blockingclient.cpp 1
 
     We connect our FortuneThread's two signals newFortune() and error() (which
     are somewhat similar to QTcpSocket::readyRead() and QTcpSocket::error() in
     the previous example) to requestNewFortune() and displayError().
 
-    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 2
+    \snippet blockingfortuneclient/blockingclient.cpp 2
 
     The requestNewFortune() slot calls FortuneThread::requestNewFortune(),
     which \e shedules the request. When the thread has received a new fortune
     and emits newFortune(), our showFortune() slot is called:
 
-    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 3
+    \snippet blockingfortuneclient/blockingclient.cpp 3
     \codeline
-    \snippet examples/network/blockingfortuneclient/blockingclient.cpp 4
+    \snippet blockingfortuneclient/blockingclient.cpp 4
     
     Here, we simply display the fortune we received as the argument.
 
diff --git a/doc/src/examples/broadcastreceiver.qdoc b/examples/network/doc/src/broadcastreceiver.qdoc
index ec8bbd7cc4..61abcca15f 100644
--- a/doc/src/examples/broadcastreceiver.qdoc
+++ b/examples/network/doc/src/broadcastreceiver.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/broadcastreceiver
+    \example broadcastreceiver
     \title Broadcast Receiver Example
 
     The Broadcast Receiver example shows how to receive information that is broadcasted
diff --git a/doc/src/examples/broadcastsender.qdoc b/examples/network/doc/src/broadcastsender.qdoc
index 91a3080712..79127efbfb 100644
--- a/doc/src/examples/broadcastsender.qdoc
+++ b/examples/network/doc/src/broadcastsender.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/broadcastsender
+    \example broadcastsender
     \title Broadcast Sender Example
 
     The Broadcast Sender example shows how to broadcast information to multiple clients
diff --git a/doc/src/examples/fortuneclient.qdoc b/examples/network/doc/src/fortuneclient.qdoc
index 3b43682899..ccf5d8f150 100644
--- a/doc/src/examples/fortuneclient.qdoc
+++ b/examples/network/doc/src/fortuneclient.qdoc
@@ -26,19 +26,19 @@
 ****************************************************************************/
 
 /*!
-    \example network/fortuneclient
+    \example fortuneclient
     \title Fortune Client Example
 
     The Fortune Client example shows how to create a client for a simple
     network service using QTcpSocket. It is intended to be run alongside the
-    \l{network/fortuneserver}{Fortune Server} example or
-    the \l{network/threadedfortuneserver}{Threaded Fortune Server} example.
+    \l{fortuneserver}{Fortune Server} example or
+    the \l{threadedfortuneserver}{Threaded Fortune Server} example.
 
     \image fortuneclient-example.png Screenshot of the Fortune Client example
 
     This example uses a simple QDataStream-based data transfer protocol to
     request a line of text from a fortune server (from the
-    \l{network/fortuneserver}{Fortune Server} example). The client requests a
+    \l{fortuneserver}{Fortune Server} example). The client requests a
     fortune by simply connecting to the server. The server then responds with
     a 16-bit (quint16) integer containing the length of the fortune text,
     followed by a QString.
@@ -62,12 +62,12 @@
     \endlist
 
     In this example, we will demonstrate the asynchronous approach. The
-    \l{network/blockingfortuneclient}{Blocking Fortune Client} example
+    \l{blockingfortuneclient}{Blocking Fortune Client} example
     illustrates the synchronous approach.
 
     Our class contains some data and a few private slots:
 
-    \snippet examples/network/fortuneclient/client.h 0
+    \snippet fortuneclient/client.h 0
 
     Other than the widgets that make up the GUI, the data members include a
     QTcpSocket pointer, a copy of the fortune text currently displayed, and
@@ -77,23 +77,23 @@
     widget as parent, so that we won't have to worry about deleting the
     socket:
 
-    \snippet examples/network/fortuneclient/client.cpp 0
+    \snippet fortuneclient/client.cpp 0
     \dots
-    \snippet examples/network/fortuneclient/client.cpp 1
+    \snippet fortuneclient/client.cpp 1
 
     The only QTcpSocket signals we need in this example are
     QTcpSocket::readyRead(), signifying that data has been received, and
     QTcpSocket::error(), which we will use to catch any connection errors:
 
     \dots
-    \snippet examples/network/fortuneclient/client.cpp 3
+    \snippet fortuneclient/client.cpp 3
     \dots
-    \snippet examples/network/fortuneclient/client.cpp 5
+    \snippet fortuneclient/client.cpp 5
 
     Clicking the \uicontrol{Get Fortune} button will invoke the \c
     requestNewFortune() slot:
 
-    \snippet examples/network/fortuneclient/client.cpp 6
+    \snippet fortuneclient/client.cpp 6
 
     In this slot, we initialize \c blockSize to 0, preparing to read a new block
     of data.  Because we allow the user to click \uicontrol{Get Fortune} before the
@@ -119,7 +119,7 @@
 
     Let's go through the \l{QTcpSocket::error()}{error()} case first:
 
-    \snippet examples/network/fortuneclient/client.cpp 13
+    \snippet fortuneclient/client.cpp 13
 
     We pop up all errors in a dialog using
     QMessageBox::information(). QTcpSocket::RemoteHostClosedError is silently
@@ -129,9 +129,9 @@
     Now for the \l{QTcpSocket::readyRead()}{readyRead()} alternative. This
     signal is connected to \c Client::readFortune():
 
-    \snippet examples/network/fortuneclient/client.cpp 8
+    \snippet fortuneclient/client.cpp 8
     \codeline
-    \snippet examples/network/fortuneclient/client.cpp 10
+    \snippet fortuneclient/client.cpp 10
 
     The protocol is based on QDataStream, so we start by creating a stream
     object, passing the socket to QDataStream's constructor. We then
@@ -148,9 +148,9 @@
     with the size of the packet, so first we need to ensure that we can read
     the size, then we will wait until QTcpSocket has received the full packet.
 
-    \snippet examples/network/fortuneclient/client.cpp 11
+    \snippet fortuneclient/client.cpp 11
     \codeline
-    \snippet examples/network/fortuneclient/client.cpp 12
+    \snippet fortuneclient/client.cpp 12
 
     We proceed by using QDataStream's streaming operator to read the fortune
     from the socket into a QString. Once read, we can call QLabel::setText()
diff --git a/doc/src/examples/fortuneserver.qdoc b/examples/network/doc/src/fortuneserver.qdoc
index 1f6def6c20..0bc50283c3 100644
--- a/doc/src/examples/fortuneserver.qdoc
+++ b/examples/network/doc/src/fortuneserver.qdoc
@@ -26,45 +26,45 @@
 ****************************************************************************/
 
 /*!
-    \example network/fortuneserver
+    \example fortuneserver
     \title Fortune Server Example
 
     The Fortune Server example shows how to create a server for a simple
     network service. It is intended to be run alongside the
-    \l{network/fortuneclient}{Fortune Client} example or the
-    \l{network/blockingfortuneclient}{Blocking Fortune Client} example.
+    \l{fortuneclient}{Fortune Client} example or the
+    \l{blockingfortuneclient}{Blocking Fortune Client} example.
 
     \image fortuneserver-example.png Screenshot of the Fortune Server example
 
     This example uses QTcpServer to accept incoming TCP connections, and a
     simple QDataStream based data transfer protocol to write a fortune to the
-    connecting client (from the \l{network/fortuneclient}{Fortune Client}
+    connecting client (from the \l{fortuneclient}{Fortune Client}
     example), before closing the connection.
 
-    \snippet examples/network/fortuneserver/server.h 0
+    \snippet fortuneserver/server.h 0
 
     The server is implemented using a simple class with only one slot, for
     handling incoming connections.
 
-    \snippet examples/network/fortuneserver/server.cpp 1
+    \snippet fortuneserver/server.cpp 1
 
     In its constructor, our Server object calls QTcpServer::listen() to set up
     a QTcpServer to listen on all addresses, on an arbitrary port. In then
     displays the port QTcpServer picked in a label, so that user knows which
     port the fortune client should connect to.
 
-    \snippet examples/network/fortuneserver/server.cpp 2
+    \snippet fortuneserver/server.cpp 2
 
     Our server generates a list of random fortunes that is can send to
     connecting clients.
 
-    \snippet examples/network/fortuneserver/server.cpp 3
+    \snippet fortuneserver/server.cpp 3
 
     When a client connects to our server, QTcpServer will emit
     QTcpServer::newConnection(). In turn, this will invoke our
     sendFortune() slot:
 
-    \snippet examples/network/fortuneserver/server.cpp 4
+    \snippet fortuneserver/server.cpp 4
 
     The purpose of this slot is to select a random line from our list of
     fortunes, encode it into a QByteArray using QDataStream, and then write it
@@ -75,7 +75,7 @@
     we can communicate with clients from future versions of Qt. (See
     QDataStream::setVersion().)
 
-    \snippet examples/network/fortuneserver/server.cpp 6
+    \snippet fortuneserver/server.cpp 6
 
     At the start of our QByteArray, we reserve space for a 16 bit integer that
     will contain the total size of the data block we are sending. We continue
@@ -84,14 +84,14 @@
     total size of the array. By doing this, we provide a way for clients to
     verify how much data they can expect before reading the whole packet.
 
-    \snippet examples/network/fortuneserver/server.cpp 7
+    \snippet fortuneserver/server.cpp 7
 
     We then call QTcpServer::newPendingConnection(), which returns the
     QTcpSocket representing the server side of the connection. By connecting
     QTcpSocket::disconnected() to QObject::deleteLater(), we ensure that the
     socket will be deleted after disconnecting.
 
-    \snippet examples/network/fortuneserver/server.cpp 8
+    \snippet fortuneserver/server.cpp 8
 
     The encoded fortune is written using QTcpSocket::write(), and we finally
     call QTcpSocket::disconnectFromHost(), which will close the connection
diff --git a/doc/src/examples/googlesuggest.qdoc b/examples/network/doc/src/googlesuggest.qdoc
index 3af12456b0..b083f0cd58 100644
--- a/doc/src/examples/googlesuggest.qdoc
+++ b/examples/network/doc/src/googlesuggest.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/googlesuggest
+    \example googlesuggest
     \title Google Suggest Example
 
     The Google Suggest example demonstrates how to use the QNetworkAccessManager
@@ -48,7 +48,7 @@
     This class implements an event filter and a number of functions to display
     the search results and to determent when and how to perform the search.
 
-    \snippet examples/network/googlesuggest/googlesuggest.h 1
+    \snippet googlesuggest/googlesuggest.h 1
 
     The class connects to a QLineEdit and uses a QTreeWidget to display the
     results. A QTimer controls the start of the network requests that are
@@ -60,7 +60,7 @@
     queries. This is the basis for the query. The letters typed into the search
     box will be added to the query to perform the search itself.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 1
+    \snippet googlesuggest/googlesuggest.cpp 1
 
     In the constructor, we set the parent of this GSuggestCompletion instance
     to be the QLineEdit passed in. For simplicity, the QLineEdit is also stored
@@ -84,12 +84,12 @@
     Finally, we connect the networkManagers \c finished() signal with the \c
     handleNetworkData() slot to handle the incoming data.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 2
+    \snippet googlesuggest/googlesuggest.cpp 2
 
     Since the QTreeWidget popup has been instantiated as a toplevel widget, the
     destructor has to delete it explicitly from memory to avoid a memory leak.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 3
+    \snippet googlesuggest/googlesuggest.cpp 3
 
     The event filter handles mouse press and key press events that are
     delivered to the popup. For mouse press events we just hide the popup and
@@ -106,13 +106,13 @@
     popup is hidden. This way the user's typing will not be interrupted by the
     popping up of the completion list.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 4
+    \snippet googlesuggest/googlesuggest.cpp 4
 
     The \c showCompletion() function populates the QTreeWidget with the results
     returned from the query. It takes two QStringLists, one with the suggested
     search terms and the other with the corresponding number of hits.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 5
+    \snippet googlesuggest/googlesuggest.cpp 5
 
     A QTreeWidgetItem is created for each index in the list and inserted into
     the QTreeWidget. Finally, we adjust position and size of the popup to make
@@ -124,24 +124,24 @@
     make the \c editor QLineEdit emit the returnPressed() signal, to which the
     application can connect to open the respective web page.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 6
+    \snippet googlesuggest/googlesuggest.cpp 6
 
     The \c autoSuggest() slot is called when the timer times out, and uses the
     text in the editor to build the complete search query. The query is then
     passed to the QNetworkAccessManager's \c get() function to start the
     request.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 7
+    \snippet googlesuggest/googlesuggest.cpp 7
 
     The function \c preventSuggest() stops the timer to prevent further
     requests from being started.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 8
+    \snippet googlesuggest/googlesuggest.cpp 8
 
     When the network request is finished, the QNetworkAccessManager delivers the
     data received from the server through the networkReply object.
 
-    \snippet examples/network/googlesuggest/googlesuggest.cpp 9
+    \snippet googlesuggest/googlesuggest.cpp 9
 
     To extract the data from the reply we use the \c readAll() function, which
     is inherited from QIODevice and returns a QByteArray. Since this data is
@@ -160,14 +160,14 @@
     A \c GSuggestCompletion member provides the SearchBox with the request
     functionality and the suggestions returned from the Google search engine.
 
-    \snippet examples/network/googlesuggest/searchbox.h 1
+    \snippet googlesuggest/searchbox.h 1
 
     \section1 SearchBox Class Implementation
 
     The search box constructor instantiates the GSuggestCompletion object and
     connects the returnPressed() signal to the doSearch() slot.
 
-    \snippet examples/network/googlesuggest/searchbox.cpp 1
+    \snippet googlesuggest/searchbox.cpp 1
 
     The function \c doSearch() stops the completer from sending any further
     queries to the search engine.
@@ -175,6 +175,6 @@
     Further, the function extracts the selected search phrase and opens it
     in the default web browser using QDesktopServices.
 
-    \snippet examples/network/googlesuggest/searchbox.cpp 2
+    \snippet googlesuggest/searchbox.cpp 2
 
 */
diff --git a/doc/src/examples/http.qdoc b/examples/network/doc/src/http.qdoc
index 7ca474b385..6b30a83c96 100644
--- a/doc/src/examples/http.qdoc
+++ b/examples/network/doc/src/http.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/http
+    \example http
     \title HTTP Example
 
     The HTTP example demonstrates a simple HTTP client that shows how to fetch files
diff --git a/doc/src/examples/loopback.qdoc b/examples/network/doc/src/loopback.qdoc
index 5f684447ca..ecae81307b 100644
--- a/doc/src/examples/loopback.qdoc
+++ b/examples/network/doc/src/loopback.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/loopback
+    \example loopback
     \title Loopback Example
 
     The Loopback example shows how to communicate between simple clients and servers on a local
diff --git a/doc/src/examples/multicastreceiver.qdoc b/examples/network/doc/src/multicastreceiver.qdoc
index 7e306d232c..e36e01a38c 100644
--- a/doc/src/examples/multicastreceiver.qdoc
+++ b/examples/network/doc/src/multicastreceiver.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/multicastreceiver
+    \example multicastreceiver
     \title Multicast Receiver Example
 
     The Multicast Receiever example shows how to receive information that is
diff --git a/doc/src/examples/multicastsender.qdoc b/examples/network/doc/src/multicastsender.qdoc
index 687f760a38..a1d70caf86 100644
--- a/doc/src/examples/multicastsender.qdoc
+++ b/examples/network/doc/src/multicastsender.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/multicastsender
+    \example multicastsender
     \title Multicast Sender Example
 
     The Multicast Sender example shows how to send information to multiple
diff --git a/doc/src/examples/network-chat.qdoc b/examples/network/doc/src/network-chat.qdoc
index e79a521c3d..3e0d7540b9 100644
--- a/doc/src/examples/network-chat.qdoc
+++ b/examples/network/doc/src/network-chat.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/network-chat
+    \example network-chat
     \title Network Chat Example
 
     The Network Chat example demonstrates a stateful peer-to-peer Chat client
diff --git a/doc/src/examples/securesocketclient.qdoc b/examples/network/doc/src/securesocketclient.qdoc
index 11d9aaefcc..b740af3531 100644
--- a/doc/src/examples/securesocketclient.qdoc
+++ b/examples/network/doc/src/securesocketclient.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/securesocketclient
+    \example securesocketclient
     \title Secure Socket Client Example
 
     The Secure Socket Client example shows how to use QSslSocket to
diff --git a/doc/src/examples/threadedfortuneserver.qdoc b/examples/network/doc/src/threadedfortuneserver.qdoc
index 6b84be85c8..33b6892363 100644
--- a/doc/src/examples/threadedfortuneserver.qdoc
+++ b/examples/network/doc/src/threadedfortuneserver.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/threadedfortuneserver
+    \example threadedfortuneserver
     \title Threaded Fortune Server Example
 
     The Threaded Fortune Server example shows how to create a server for a
@@ -36,25 +36,25 @@
     \image threadedfortuneserver-example.png
 
     The implementation of this example is similar to that of the
-    \l{network/fortuneserver}{Fortune Server} example, but here we will
+    \l{fortuneserver}{Fortune Server} example, but here we will
     implement a subclass of QTcpServer that starts each connection in a
     different thread.
 
     For this we need two classes: FortuneServer, a QTcpServer subclass, and
     FortuneThread, which inherits QThread.
 
-    \snippet examples/network/threadedfortuneserver/fortuneserver.h 0
+    \snippet threadedfortuneserver/fortuneserver.h 0
 
     FortuneServer inherits QTcpServer and reimplements
     QTcpServer::incomingConnection(). We also use it for storing the list of
     random fortunes. 
     
-    \snippet examples/network/threadedfortuneserver/fortuneserver.cpp 0
+    \snippet threadedfortuneserver/fortuneserver.cpp 0
 
     We use FortuneServer's constructor to simply generate the list of
     fortunes.
 
-    \snippet examples/network/threadedfortuneserver/fortuneserver.cpp 1
+    \snippet threadedfortuneserver/fortuneserver.cpp 1
 
     Our implementation of QTcpServer::incomingConnection() creates a
     FortuneThread object, passing the incoming socket descriptor and a random
@@ -63,18 +63,18 @@
     gets deleted once it has finished. We can then call QThread::start(),
     which starts the thread.
 
-    \snippet examples/network/threadedfortuneserver/fortunethread.h 0
+    \snippet threadedfortuneserver/fortunethread.h 0
 
     Moving on to the FortuneThread class, this is a QThread subclass whose job
     is to write the fortune to the connected socket. The class reimplements
     QThread::run(), and it has a signal for reporting errors.
 
-    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 0
+    \snippet threadedfortuneserver/fortunethread.cpp 0
     
     FortuneThread's constructor simply stores the socket descriptor and
     fortune text, so that they are available for run() later on.
 
-    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 1
+    \snippet threadedfortuneserver/fortunethread.cpp 1
 
     The first thing our run() function does is to create a QTcpSocket object
     on the stack. What's worth noticing is that we are creating this object
@@ -83,19 +83,19 @@
     to our socket from the main thread while we are accessing it from
     FortuneThread::run().
 
-    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 2
+    \snippet threadedfortuneserver/fortunethread.cpp 2
 
     The socket is initialized by calling QTcpSocket::setSocketDescriptor(),
     passing our socket descriptor as an argument. We expect this to succeed,
     but just to be sure, (although unlikely, the system may run out of
     resources,) we catch the return value and report any error.
 
-    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 3
+    \snippet threadedfortuneserver/fortunethread.cpp 3
 
-    As with the \l{network/fortuneserver}{Fortune Server} example, we encode
+    As with the \l{fortuneserver}{Fortune Server} example, we encode
     the fortune into a QByteArray using QDataStream.
 
-    \snippet examples/network/threadedfortuneserver/fortunethread.cpp 4
+    \snippet threadedfortuneserver/fortunethread.cpp 4
 
     But unlike the previous example, we finish off by calling
     QTcpSocket::waitForDisconnected(), which blocks the calling thread until
diff --git a/doc/src/examples/torrent.qdoc b/examples/network/doc/src/torrent.qdoc
index 9e9750e842..a13d447277 100644
--- a/doc/src/examples/torrent.qdoc
+++ b/examples/network/doc/src/torrent.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example network/torrent
+    \example torrent
     \title Torrent Example
 
     The Torrent example is a functional BitTorrent client that
diff --git a/doc/src/images/2dpainting-example.png b/examples/opengl/doc/images/2dpainting-example.png
index 2a77e7d7d5..2a77e7d7d5 100644
--- a/doc/src/images/2dpainting-example.png
+++ b/examples/opengl/doc/images/2dpainting-example.png
diff --git a/doc/src/images/cube.png b/examples/opengl/doc/images/cube.png
index 95dfc984dd..95dfc984dd 100644
--- a/doc/src/images/cube.png
+++ b/examples/opengl/doc/images/cube.png
diff --git a/doc/src/images/cube_faces.png b/examples/opengl/doc/images/cube_faces.png
index 2c7102a94c..2c7102a94c 100644
--- a/doc/src/images/cube_faces.png
+++ b/examples/opengl/doc/images/cube_faces.png
diff --git a/doc/src/images/framebufferobject2-example.png b/examples/opengl/doc/images/framebufferobject2-example.png
index bafb05a08b..bafb05a08b 100644
--- a/doc/src/images/framebufferobject2-example.png
+++ b/examples/opengl/doc/images/framebufferobject2-example.png
diff --git a/doc/src/images/grabber-example.png b/examples/opengl/doc/images/grabber-example.png
index 6a05b94bec..6a05b94bec 100644
--- a/doc/src/images/grabber-example.png
+++ b/examples/opengl/doc/images/grabber-example.png
diff --git a/doc/src/images/hellogl-es-example.png b/examples/opengl/doc/images/hellogl-es-example.png
index 7e55f09a7a..7e55f09a7a 100644
--- a/doc/src/images/hellogl-es-example.png
+++ b/examples/opengl/doc/images/hellogl-es-example.png
diff --git a/doc/src/images/hellogl-example.png b/examples/opengl/doc/images/hellogl-example.png
index ecb3a3a7b0..ecb3a3a7b0 100644
--- a/doc/src/images/hellogl-example.png
+++ b/examples/opengl/doc/images/hellogl-example.png
diff --git a/doc/src/images/overpainting-example.png b/examples/opengl/doc/images/overpainting-example.png
index 0368dcabc8..0368dcabc8 100644
--- a/doc/src/images/overpainting-example.png
+++ b/examples/opengl/doc/images/overpainting-example.png
diff --git a/doc/src/images/pbuffers-example.png b/examples/opengl/doc/images/pbuffers-example.png
index c34a6fd02b..c34a6fd02b 100644
--- a/doc/src/images/pbuffers-example.png
+++ b/examples/opengl/doc/images/pbuffers-example.png
diff --git a/doc/src/images/pbuffers2-example.png b/examples/opengl/doc/images/pbuffers2-example.png
index 4a9c7175a3..4a9c7175a3 100644
--- a/doc/src/images/pbuffers2-example.png
+++ b/examples/opengl/doc/images/pbuffers2-example.png
diff --git a/doc/src/images/samplebuffers-example.png b/examples/opengl/doc/images/samplebuffers-example.png
index b751c143b3..b751c143b3 100644
--- a/doc/src/images/samplebuffers-example.png
+++ b/examples/opengl/doc/images/samplebuffers-example.png
diff --git a/doc/src/images/textures-example.png b/examples/opengl/doc/images/textures-example.png
index b583ede063..b583ede063 100644
--- a/doc/src/images/textures-example.png
+++ b/examples/opengl/doc/images/textures-example.png
diff --git a/doc/src/examples/2dpainting.qdoc b/examples/opengl/doc/src/2dpainting.qdoc
index d2d19b6e3b..7239ddbf3d 100644
--- a/doc/src/examples/2dpainting.qdoc
+++ b/examples/opengl/doc/src/2dpainting.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/2dpainting
+    \example 2dpainting
     \title 2D Painting Example
 
     The 2D Painting example shows how QPainter and QGLWidget can be used
@@ -66,7 +66,7 @@
 
     The \c Helper class is minimal:
 
-    \snippet examples/opengl/2dpainting/helper.h 0
+    \snippet 2dpainting/helper.h 0
 
     Apart from the constructor, it only provides a \c paint() function to paint
     using a painter supplied by one of our widget subclasses.
@@ -76,7 +76,7 @@
     The constructor of the class sets up the resources it needs to paint
     content onto a widget:
 
-    \snippet examples/opengl/2dpainting/helper.cpp 0
+    \snippet 2dpainting/helper.cpp 0
 
     The actual painting is performed in the \c paint() function. This takes
     a QPainter that has already been set up to paint onto a paint device
@@ -84,7 +84,7 @@
     about the region to be painted, and a measure of the elapsed time (in
     milliseconds) since the paint device was last updated.
 
-    \snippet examples/opengl/2dpainting/helper.cpp 1
+    \snippet 2dpainting/helper.cpp 1
 
     We begin painting by filling in the region contained in the paint event
     before translating the origin of the coordinate system so that the rest
@@ -95,13 +95,13 @@
     animate them so that they appear to move outward and around the coordinate
     system's origin:
 
-    \snippet examples/opengl/2dpainting/helper.cpp 2
+    \snippet 2dpainting/helper.cpp 2
 
     Since the coordinate system is rotated many times during
     this process, we \l{QPainter::save()}{save()} the QPainter's state
     beforehand and \l{QPainter::restore()}{restore()} it afterwards.
 
-    \snippet examples/opengl/2dpainting/helper.cpp 3
+    \snippet 2dpainting/helper.cpp 3
 
     We draw some text at the origin to complete the effect.
 
@@ -110,7 +110,7 @@
     The \c Widget class provides a basic custom widget that we use to
     display the simple animation painted by the \c Helper class.
 
-    \snippet examples/opengl/2dpainting/widget.h 0
+    \snippet 2dpainting/widget.h 0
 
     Apart from the constructor, it only contains a
     \l{QWidget::paintEvent()}{paintEvent()} function, that lets us draw
@@ -125,12 +125,12 @@
     \c Helper object supplied and calling the base class's constructor,
     and enforces a fixed size for the widget:
 
-    \snippet examples/opengl/2dpainting/widget.cpp 0
+    \snippet 2dpainting/widget.cpp 0
 
     The \c animate() slot is called whenever a timer, which we define later, times
     out:
 
-    \snippet examples/opengl/2dpainting/widget.cpp 1
+    \snippet 2dpainting/widget.cpp 1
 
     Here, we determine the interval that has elapsed since the timer last
     timed out, and we add it to any existing value before repainting the
@@ -142,14 +142,14 @@
     to implement a paint event that sets up a QPainter for the widget and calls
     the helper's \c paint() function:
 
-    \snippet examples/opengl/2dpainting/widget.cpp 2
+    \snippet 2dpainting/widget.cpp 2
 
     \section1 GLWidget Class Definition
 
     The \c GLWidget class definition is basically the same as the \c Widget
     class except that it is derived from QGLWidget.
 
-    \snippet examples/opengl/2dpainting/glwidget.h 0
+    \snippet 2dpainting/glwidget.h 0
 
     Again, the member variables record the \c Helper used to paint the
     widget and the elapsed time since the previous update.
@@ -158,7 +158,7 @@
 
     The constructor differs a little from the \c Widget class's constructor:
 
-    \snippet examples/opengl/2dpainting/glwidget.cpp 0
+    \snippet 2dpainting/glwidget.cpp 0
 
     As well as initializing the \c elapsed member variable and storing the
     \c Helper object used to paint the widget, the base class's constructor
@@ -169,11 +169,11 @@
     The \c animate() slot is exactly the same as that provided by the \c Widget
     class:
 
-    \snippet examples/opengl/2dpainting/glwidget.cpp 1
+    \snippet 2dpainting/glwidget.cpp 1
 
     The \c paintEvent() is almost the same as that found in the \c Widget class:
 
-    \snippet examples/opengl/2dpainting/glwidget.cpp 2
+    \snippet 2dpainting/glwidget.cpp 2
 
     Since anti-aliasing will be enabled if available, we only need to set up
     a QPainter on the widget and call the helper's \c paint() function to display
@@ -183,7 +183,7 @@
 
     The \c Window class has a basic, minimal definition:
 
-    \snippet examples/opengl/2dpainting/window.h 0
+    \snippet 2dpainting/window.h 0
 
     It contains a single \c Helper object that will be shared between all
     widgets.
@@ -193,7 +193,7 @@
     The constructor does all the work, creating a widget of each type and
     inserting them with labels into a layout:
 
-    \snippet examples/opengl/2dpainting/window.cpp 0
+    \snippet 2dpainting/window.cpp 0
 
     A timer with a 50 millisecond time out is constructed for animation purposes,
     and connected to the \c animate() slots of the \c Widget and \c GLWidget objects.
diff --git a/examples/opengl/doc/src/cube.qdoc b/examples/opengl/doc/src/cube.qdoc
new file mode 100644
index 0000000000..578c0c9ef9
--- /dev/null
+++ b/examples/opengl/doc/src/cube.qdoc
@@ -0,0 +1,178 @@
+/****************************************************************************
+**
+** 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:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** 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 cube
+    \group all-examples
+    \title Cube OpenGL ES 2.0 example
+
+    The Cube OpenGL ES 2.0 example shows how to write mouse rotateable
+    textured 3D cube using OpenGL ES 2.0 with Qt. It shows how to handle
+    polygon geometries efficiently and how to write simple vertex and
+    fragment shader for programmable graphics pipeline. In addition it
+    shows how to use quaternions for representing 3D object orientation.
+
+    This example has been written for OpenGL ES 2.0 but it works also on
+    desktop OpenGL because this example is simple enough and for the
+    most parts desktop OpenGL API is same. It compiles also without OpenGL
+    support but then it just shows a label stating that OpenGL support is
+    required.
+
+    \image cube.png Screenshot of the Cube example running on N900
+
+    The example consist of two classes:
+
+    \list
+    \li \c MainWidget extends QGLWidget and contains OpenGL ES 2.0
+        initialization and drawing and mouse and timer event handling
+    \li \c GeometryEngine handles polygon geometries. Transfers polygon geometry
+        to vertex buffer objects and draws geometries from vertex buffer objects.
+    \endlist
+
+    We'll start by initializing OpenGL ES 2.0 in \c MainWidget.
+
+    \tableofcontents
+
+    \section1 Initializing OpenGL ES 2.0
+
+    Since OpenGL ES 2.0 doesn't support fixed graphics pipeline anymore it has to
+    be implemented by ourselves. This makes graphics pipeline very flexible but
+    in the same time it becomes more difficult because user has to implement graphics
+    pipeline to get even the simplest example running. It also makes graphics pipeline
+    more efficient because user can decide what kind of pipeline is needed for the
+    application.
+
+    First we have to implement vertex shader. It gets vertex data and
+    model-view-projection matrix (MVP) as parameters. It transforms vertex position
+    using MVP matrix to screen space and passes texture coordinate to
+    fragment shader. Texture coordinate will be automatically interpolated on polygon
+    faces.
+
+    \snippet cube/vshader.glsl 0
+
+    After that we need to implement second part of the graphics pipeline - fragment
+    shader. For this exercise we need to implement fragment shader that handles
+    texturing. It gets interpolated texture coordinate as a parameter and looks up
+    fragment color from the given texture.
+
+    \snippet cube/fshader.glsl 0
+
+    Using \c QGLShaderProgram we can compile, link and bind shader code to
+    graphics pipeline. This code uses Qt Resource files to access shader source code.
+
+    \snippet cube/mainwidget.cpp 3
+
+    The following code enables depth buffering and back face culling.
+
+    \snippet cube/mainwidget.cpp 2
+
+    \section1 Loading textures from Qt Resource files
+
+    \c QGLWidget interface implements methods for loading textures from QImage to GL
+    texture memory. We still need to use OpenGL provided functions for specifying
+    the GL texture unit and configuring texture filtering options.
+
+    \snippet cube/mainwidget.cpp 4
+
+    \section1 Cube Geometry
+
+    There are many ways to render polygons in OpenGL but the most efficient way is
+    to use only triangle strip primitives and render vertices from graphics hardware
+    memory. OpenGL has a mechanism to create buffer objects to this memory area and
+    transfer vertex data to these buffers. In OpenGL terminology these are referred
+    as Vertex Buffer Objects (VBO).
+
+    \image cube_faces.png Cube faces and vertices
+
+    This is how cube faces break down to triangles. Vertices are ordered this way
+    to get vertex ordering correct using triangle strips. OpenGL determines triangle
+    front and back face based on vertex ordering. By default OpenGL uses
+    counter-clockwise order for front faces. This information is used by back face
+    culling which improves rendering performance by not rendering back faces of the
+    triangles. This way graphics pipeline can omit rendering sides of the triangle that
+    aren't facing towards screen.
+
+    Creating vertex buffer objects and transferring data to them is quite simple using
+    OpenGL provided functions.
+
+    \snippet cube/geometryengine.cpp 0
+
+    \snippet cube/geometryengine.cpp 1
+
+    Drawing primitives from VBOs and telling programmable graphics pipeline how to
+    locate vertex data requires few steps. First we need to bind VBOs to be used.
+    After that we bind shader program attribute names and configure what
+    kind of data it has in the bound VBO. Finally we'll draw triangle
+    strip primitives using indices from the other VBO.
+
+    \snippet cube/geometryengine.cpp 2
+
+    \section1 Perspective projection
+
+    Using \c QMatrix4x4 helper methods it's really easy to calculate perpective
+    projection matrix. This matrix is used to project vertices to screen space.
+
+    \snippet cube/mainwidget.cpp 5
+
+    \section1 Orientation of the 3D object
+
+    Quaternions are handy way to represent orientation of the 3D object. Quaternions
+    involve quite complex mathematics but fortunately all the necessary mathematics
+    behind quaternions is implemented in \c QQuaternion. That allows us to store
+    cube orientation in quaternion and rotating cube around given axis is quite
+    simple.
+
+    The following code calculates rotation axis and angular speed based on mouse events.
+
+    \snippet cube/mainwidget.cpp 0
+
+    \c QBasicTimer is used to animate scene and update cube orientation. Rotations
+    can be concatenated simply by multiplying quaternions.
+
+    \snippet cube/mainwidget.cpp 1
+
+    Model-view matrix is calculated using the quaternion and by moving world by Z axis.
+    This matrix is multiplied with the projection matrix to get MVP matrix for shader
+    program.
+
+    \snippet cube/mainwidget.cpp 6
+
+*/
diff --git a/doc/src/examples/framebufferobject2.qdoc b/examples/opengl/doc/src/framebufferobject2.qdoc
index 9be0557f16..44b6fc6018 100644
--- a/doc/src/examples/framebufferobject2.qdoc
+++ b/examples/opengl/doc/src/framebufferobject2.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/framebufferobject2
+    \example framebufferobject2
     \title Framebuffer Object 2 Example
 
     The Framebuffer Object 2 example demonstrates how to use the
diff --git a/doc/src/examples/grabber.qdoc b/examples/opengl/doc/src/grabber.qdoc
index 8cdd9ef1a1..12e1483c9a 100644
--- a/doc/src/examples/grabber.qdoc
+++ b/examples/opengl/doc/src/grabber.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/grabber
+    \example grabber
     \title Grabber Example
 
     The Grabber examples shows how to retrieve the contents of an OpenGL framebuffer.
diff --git a/doc/src/examples/hellogl.qdoc b/examples/opengl/doc/src/hellogl.qdoc
index f6f8591ad0..2f866a3642 100644
--- a/doc/src/examples/hellogl.qdoc
+++ b/examples/opengl/doc/src/hellogl.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/hellogl
+    \example hellogl
     \title Hello GL Example
 
     The Hello GL example demonstrates the basic use of the OpenGL-related classes
@@ -48,18 +48,18 @@
     constructor, destructor, \l{QWidget::sizeHint()}{sizeHint()}, and
     \l{QWidget::minimumSizeHint()}{minimumSizeHint()} functions:
 
-    \snippet examples/opengl/hellogl/glwidget.h 0
+    \snippet hellogl/glwidget.h 0
 
     We use a destructor to ensure that any OpenGL-specific data structures
     are deleted when the widget is no longer needed (although in this case nothing
     needs cleaning up).
 
-    \snippet examples/opengl/hellogl/glwidget.h 1
+    \snippet hellogl/glwidget.h 1
 
     The signals and slots are used to allow other objects to interact with the
     3D scene.
 
-    \snippet examples/opengl/hellogl/glwidget.h 2
+    \snippet hellogl/glwidget.h 2
 
     OpenGL initialization, viewport resizing, and painting are handled by
     reimplementing the QGLWidget::initializeGL(), QGLWidget::resizeGL(), and
@@ -67,7 +67,7 @@
     directly with the scene using the mouse, we reimplement
     QWidget::mousePressEvent() and QWidget::mouseMoveEvent().
 
-    \snippet examples/opengl/hellogl/glwidget.h 3
+    \snippet hellogl/glwidget.h 3
 
     The rest of the class contains utility functions and variables that are
     used to construct and hold orientation information for the scene. The
@@ -86,27 +86,27 @@
     the pointer to the QtLogo object to null, and sets up some colors for
     later use.
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 0
+    \snippet hellogl/glwidget.cpp 0
 
     We also implement a destructor to release OpenGL-related resources when the
     widget is deleted:
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 1
+    \snippet hellogl/glwidget.cpp 1
 
     In this case nothing requires cleaning up.
 
     We provide size hint functions to ensure that the widget is shown at a
     reasonable size:
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 2
+    \snippet hellogl/glwidget.cpp 2
     \codeline
-    \snippet examples/opengl/hellogl/glwidget.cpp 3
-    \snippet examples/opengl/hellogl/glwidget.cpp 4
+    \snippet hellogl/glwidget.cpp 3
+    \snippet hellogl/glwidget.cpp 4
 
     The widget provides three slots that enable other components in the
     example to change the orientation of the scene:
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 5
+    \snippet hellogl/glwidget.cpp 5
 
     In the above slot, the \c xRot variable is updated only if the new angle
     is different to the old one, the \c xRotationChanged() signal is emitted to
@@ -124,7 +124,7 @@
     certain rendering flags, and setting other properties used to customize the
     rendering process.
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 6
+    \snippet hellogl/glwidget.cpp 6
 
     In this example, we reimplement the function to set the background color,
     create a QtLogo object instance which will contain all the geometry to
@@ -143,7 +143,7 @@
     based on the length of the smallest side of the widget to ensure that
     the scene is not distorted if the widget has sides of unequal length:
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 8
+    \snippet hellogl/glwidget.cpp 8
 
     A discussion of the projection transformation used is outside the scope of
     this example. Please consult the OpenGL reference documentation for an
@@ -156,7 +156,7 @@
     decorated with pure OpenGL content, we reimplement QGLWidget::paintGL()
     \e instead of reimplementing QWidget::paintEvent():
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 7
+    \snippet hellogl/glwidget.cpp 7
 
     In this example, we clear the widget using the background color that
     we defined in the \l{QGLWidget::initializeGL()}{initializeGL()} function,
@@ -172,13 +172,13 @@
     The \l{QWidget::mousePressEvent()}{mousePressEvent()} function simply
     records the position of the mouse when a button is initially pressed:
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 9
+    \snippet hellogl/glwidget.cpp 9
 
     The \l{QWidget::mouseMoveEvent()}{mouseMoveEvent()} function uses the
     previous location of the mouse cursor to determine how much the object
     in the scene should be rotated, and in which direction:
 
-    \snippet examples/opengl/hellogl/glwidget.cpp 10
+    \snippet hellogl/glwidget.cpp 10
 
     Since the user is expected to hold down the mouse button and drag the
     cursor to rotate the object, the cursor's position is updated every time
@@ -189,14 +189,14 @@
     This class encapsulates the OpenGL geometry data which will be rendered
     in the basic 3D scene.
 
-    \snippet examples/opengl/shared/qtlogo.h 0
+    \snippet shared/qtlogo.h 0
 
     The geometry is divided into a list of parts which may be rendered in
     different ways.  The data itself is contained in a Geometry structure that
     includes the vertices, their lighting normals and index values which
     point into the vertices, grouping them into faces.
 
-    \snippet examples/opengl/shared/qtlogo.cpp 0
+    \snippet shared/qtlogo.cpp 0
 
     The data in the Geometry class is stored in QVector<QVector3D> members
     which are convenient for use with OpenGL because they expose raw
@@ -204,7 +204,7 @@
     are included for adding new vertex data, either with smooth normals, or
     facetted normals; and for enabling the geometry ready for rendering.
 
-    \snippet examples/opengl/shared/qtlogo.cpp 1
+    \snippet shared/qtlogo.cpp 1
 
     The higher level Patch class has methods for accumulating the geometry
     one face at a time, and treating collections of faces or "patches" with
@@ -212,14 +212,14 @@
     may be added as triangles or quads, at the OpenGL level all data is
     treated as triangles for compatibility with OpenGL/ES.
 
-    \snippet examples/opengl/shared/qtlogo.cpp 2
+    \snippet shared/qtlogo.cpp 2
 
     Drawing a Patch is simply acheived by applying any transformation,
     and material effect, then drawing the data using the index range for
     the patch.  The model-view matrix is saved and then restored so that
     any transformation does not affect other parts of the scene.
 
-    \snippet examples/opengl/shared/qtlogo.cpp 3
+    \snippet shared/qtlogo.cpp 3
 
     The geometry is built once on construction of the QtLogo, and it is
     paramaterized on a number of divisions - which controls how "chunky" the
@@ -231,7 +231,7 @@
     details) which only exist during the build phase, to assemble the parts
     of the scene.
 
-    \snippet examples/opengl/shared/qtlogo.cpp 4
+    \snippet shared/qtlogo.cpp 4
 
     Finally the complete QtLogo scene is simply drawn by enabling the data arrays
     and then iterating over the parts, calling draw() on each one.
@@ -241,7 +241,7 @@
     The \c Window class is used as a container for the \c GLWidget used to
     display the scene:
 
-    \snippet examples/opengl/hellogl/window.h 0
+    \snippet hellogl/window.h 0
 
     In addition, it contains sliders that are used to change the orientation
     of the object in the scene.
@@ -251,7 +251,7 @@
     The constructor constructs an instance of the \c GLWidget class and some
     sliders to manipulate its contents.
 
-    \snippet examples/opengl/hellogl/window.cpp 0
+    \snippet hellogl/window.cpp 0
 
     We connect the \l{QAbstractSlider::valueChanged()}{valueChanged()} signal
     from each of the sliders to the appropriate slots in \c{glWidget}.
@@ -263,7 +263,7 @@
     \l{QAbstractSlider::setValue()}{setValue()} slots in the
     corresponding sliders.
 
-    \snippet examples/opengl/hellogl/window.cpp 1
+    \snippet hellogl/window.cpp 1
 
     The sliders are placed horizontally in a layout alongside the \c GLWidget,
     and initialized with suitable default values.
@@ -272,7 +272,7 @@
     that it is set up with a suitable range, step value, tick interval, and
     page step value before returning it to the calling function:
 
-    \snippet examples/opengl/hellogl/window.cpp 2
+    \snippet hellogl/window.cpp 2
 
     \section1 Summary
 
diff --git a/doc/src/examples/hellogl_es.qdoc b/examples/opengl/doc/src/hellogl_es.qdoc
index 212e760542..8764eda4d6 100644
--- a/doc/src/examples/hellogl_es.qdoc
+++ b/examples/opengl/doc/src/hellogl_es.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/hellogl_es
+    \example hellogl_es
     \title Hello GL ES Example
 
     The Hello GL ES example is the \l{Hello GL Example} ported to OpenGL ES.
@@ -59,18 +59,18 @@
     sides of the quad and hardcode a distance of 0.05f. We also compute the
     correct normal for each face and store them in another QList.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 0
+    \snippet hellogl_es/glwidget.cpp 0
 
     And then we convert the complete list of vertexes and the list of normals
     into the native OpenGL ES format that we can use with the OpenGL ES API.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 1
+    \snippet hellogl_es/glwidget.cpp 1
 
     In \c paintQtLogo() we draw the triangle array using OpenGL ES. We use
     q_vertexTypeEnum to abstract the fact that our vertex and normal arrays
     are either in float or in fixed point format.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 2
+    \snippet hellogl_es/glwidget.cpp 2
 
     \section1 Using QGLPainter
 
@@ -78,42 +78,42 @@
     the rasterizer and cache them in a QImage. This happends only once during
     the initialiazation.
 
-    \snippet examples/opengl/hellogl_es/bubble.cpp 0
+    \snippet hellogl_es/bubble.cpp 0
 
     For each bubble this QImage is then drawn to the QGLWidget by using the
     according QPainter with transparency enabled.
 
-    \snippet examples/opengl/hellogl_es/bubble.cpp 1
+    \snippet hellogl_es/bubble.cpp 1
 
     Another difference beetwen OpenGL and OpenGL ES is that OpenGL ES does not
     support glPushAttrib(GL_ALL_ATTRIB_BITS). So we have to restore all the
     OpenGL states ourselves, after we created the QPainter in
     GLWidget::paintGL().
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 3
+    \snippet hellogl_es/glwidget.cpp 3
 
     Setting up up the model view matrix and setting the right OpenGL states is
     done in the same way as for standard OpenGL.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 4
+    \snippet hellogl_es/glwidget.cpp 4
 
     Now we have to restore the OpenGL state for the QPainter. This is not done
     automatically for OpenGL ES.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 5
+    \snippet hellogl_es/glwidget.cpp 5
 
     Now we use the QPainter to draw the transparent bubbles.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 6
+    \snippet hellogl_es/glwidget.cpp 6
 
     In the end, we calculate the framerate and display it using the QPainter
     again.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 7
+    \snippet hellogl_es/glwidget.cpp 7
 
     After we finished all the drawing operations we swap the screen buffer.
 
-    \snippet examples/opengl/hellogl_es/glwidget.cpp 8
+    \snippet hellogl_es/glwidget.cpp 8
 
     \section1 Summary
 
diff --git a/doc/src/examples/overpainting.qdoc b/examples/opengl/doc/src/overpainting.qdoc
index d20ee64698..e24af4c3ca 100644
--- a/doc/src/examples/overpainting.qdoc
+++ b/examples/opengl/doc/src/overpainting.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/overpainting
+    \example overpainting
     \title Overpainting Example
 
     The Overpainting example shows how QPainter can be used
@@ -62,11 +62,11 @@
     class as a whole, we show the first few lines of the class and only
     discuss the changes we have made to the rest of it:
 
-    \snippet examples/opengl/overpainting/glwidget.h 0
+    \snippet overpainting/glwidget.h 0
     \dots
-    \snippet examples/opengl/overpainting/glwidget.h 1
+    \snippet overpainting/glwidget.h 1
     \dots
-    \snippet examples/opengl/overpainting/glwidget.h 4
+    \snippet overpainting/glwidget.h 4
 
     As usual, the widget uses \l{QGLWidget::initializeGL()}{initializeGL()}
     to set up geometry for our scene and perform OpenGL initialization tasks.
@@ -94,7 +94,7 @@
     relevant to this example. In the constructor, we initialize a QTimer to
     control the animation:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 0
+    \snippet overpainting/glwidget.cpp 0
 
     We turn off the widget's \l{QWidget::autoFillBackground}{autoFillBackground} property to
     instruct OpenGL not to paint a background for the widget when
@@ -103,13 +103,13 @@
     As in the \l{Hello GL Example}{Hello GL} example, the destructor is responsible
     for freeing any OpenGL-related resources:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 1
+    \snippet overpainting/glwidget.cpp 1
 
     The \c initializeGL() function is fairly minimal, only setting up the QtLogo
     object used in the scene.  See the \l{Hello GL Example}{Hello GL} example
     for details of the QtLogo class.
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 2
+    \snippet overpainting/glwidget.cpp 2
 
     To cooperate fully with QPainter, we defer matrix stack operations and attribute
     initialization until the widget needs to be updated.
@@ -126,12 +126,12 @@
     and other attributes. We use an OpenGL stack operation to preserve the
     original matrix state, allowing us to recover it later:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 4
+    \snippet overpainting/glwidget.cpp 4
 
     We define a color to use for the widget's background, and set up various
     attributes that define how the scene will be rendered.
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 6
+    \snippet overpainting/glwidget.cpp 6
 
     We call the \c setupViewport() private function to set up the
     projection used for the scene. This is unnecessary in OpenGL
@@ -144,21 +144,21 @@
     an OpenGL call to paint it before positioning the object defined earlier
     in the scene:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 7
+    \snippet overpainting/glwidget.cpp 7
 
     Once the QtLogo object's draw method has been executed, the GL
     states we changed and the matrix stack needs to be restored to its
     original state at the start of this function before we can begin
     overpainting:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 8
+    \snippet overpainting/glwidget.cpp 8
 
     With the 3D graphics done, we construct a QPainter for use on the widget
     and simply overpaint the widget with 2D graphics; in this case, using a
     helper class to draw a number of translucent bubbles onto the widget,
     and calling \c drawInstructions() to overlay some instructions:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 10
+    \snippet overpainting/glwidget.cpp 10
 
     When QPainter::end() is called, suitable OpenGL-specific calls are made to
     write the scene, and its additional contents, onto the widget.
@@ -173,14 +173,14 @@
     sets up the dimensions of the viewport and defines a projection
     transformation:
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 11
+    \snippet overpainting/glwidget.cpp 11
 
     Ideally, we want to arrange the 2D graphics to suit the widget's dimensions.
     To achieve this, we implement the \l{QWidget::showEvent()}{showEvent()} handler,
     creating new graphic elements (bubbles) if necessary at appropriate positions
     in the widget.
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 12
+    \snippet overpainting/glwidget.cpp 12
 
     This function only has an effect if less than 20 bubbles have already been
     created.
@@ -189,7 +189,7 @@
     the \l{QTimer::timeout()}{timeout()} signal. This keeps the bubbles moving
     around.
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 13
+    \snippet overpainting/glwidget.cpp 13
 
     We simply iterate over the bubbles in the \c bubbles list, updating the
     widget before and after each of them is moved.
@@ -197,13 +197,13 @@
     The \c setupViewport() function is called from \c paintEvent()
     and \c resizeGL().
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 14
+    \snippet overpainting/glwidget.cpp 14
 
     The \c drawInstructions() function is used to prepare some basic
     instructions that will be painted with the other 2D graphics over
     the 3D scene.
 
-    \snippet examples/opengl/overpainting/glwidget.cpp 15
+    \snippet overpainting/glwidget.cpp 15
 
     \section1 Summary
 
diff --git a/doc/src/examples/pbuffers.qdoc b/examples/opengl/doc/src/pbuffers.qdoc
index d87427b56a..baa657e14e 100644
--- a/doc/src/examples/pbuffers.qdoc
+++ b/examples/opengl/doc/src/pbuffers.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/pbuffers
+    \example pbuffers
     \title Pixel Buffers Example
 
     The Pixel Buffers example demonstrates how to use the
diff --git a/doc/src/examples/pbuffers2.qdoc b/examples/opengl/doc/src/pbuffers2.qdoc
index f05b2dd13b..efa53b06cc 100644
--- a/doc/src/examples/pbuffers2.qdoc
+++ b/examples/opengl/doc/src/pbuffers2.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/pbuffers2
+    \example pbuffers2
     \title Pixel Buffers 2 Example
 
     The Pixel Buffers 2 example demonstrates how to use the
diff --git a/doc/src/examples/samplebuffers.qdoc b/examples/opengl/doc/src/samplebuffers.qdoc
index 3b3c0c564b..93d8b54b4a 100644
--- a/doc/src/examples/samplebuffers.qdoc
+++ b/examples/opengl/doc/src/samplebuffers.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/samplebuffers
+    \example samplebuffers
     \title Sample Buffers Example
 
     The Sample Buffers example demonstrates how to use and enable
diff --git a/doc/src/examples/textures.qdoc b/examples/opengl/doc/src/textures.qdoc
index 79e664b305..b7e694239d 100644
--- a/doc/src/examples/textures.qdoc
+++ b/examples/opengl/doc/src/textures.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example opengl/textures
+    \example textures
     \title Textures Example
 
     The Textures example demonstrates the use of Qt's image classes as textures in
diff --git a/doc/src/images/cachedtable-example.png b/examples/sql/doc/images/cachedtable-example.png
index db770dfdf2..db770dfdf2 100644
--- a/doc/src/images/cachedtable-example.png
+++ b/examples/sql/doc/images/cachedtable-example.png
diff --git a/doc/src/images/drilldown-example.png b/examples/sql/doc/images/drilldown-example.png
index 68353f704a..68353f704a 100644
--- a/doc/src/images/drilldown-example.png
+++ b/examples/sql/doc/images/drilldown-example.png
diff --git a/doc/src/images/masterdetail-example.png b/examples/sql/doc/images/masterdetail-example.png
index bc282b7a78..bc282b7a78 100644
--- a/doc/src/images/masterdetail-example.png
+++ b/examples/sql/doc/images/masterdetail-example.png
diff --git a/doc/src/images/querymodel-example.png b/examples/sql/doc/images/querymodel-example.png
index 908d500e1f..908d500e1f 100644
--- a/doc/src/images/querymodel-example.png
+++ b/examples/sql/doc/images/querymodel-example.png
diff --git a/doc/src/images/relationaltablemodel-example.png b/examples/sql/doc/images/relationaltablemodel-example.png
index 44fc858562..44fc858562 100644
--- a/doc/src/images/relationaltablemodel-example.png
+++ b/examples/sql/doc/images/relationaltablemodel-example.png
diff --git a/doc/src/images/sql-widget-mapper.png b/examples/sql/doc/images/sql-widget-mapper.png
index dfa64aba9e..dfa64aba9e 100644
--- a/doc/src/images/sql-widget-mapper.png
+++ b/examples/sql/doc/images/sql-widget-mapper.png
diff --git a/doc/src/images/sqlbrowser-demo.png b/examples/sql/doc/images/sqlbrowser-demo.png
index 101ec5a0a3..101ec5a0a3 100644
--- a/doc/src/images/sqlbrowser-demo.png
+++ b/examples/sql/doc/images/sqlbrowser-demo.png
diff --git a/doc/src/images/tablemodel-example.png b/examples/sql/doc/images/tablemodel-example.png
index 3ae2a8c05c..3ae2a8c05c 100644
--- a/doc/src/images/tablemodel-example.png
+++ b/examples/sql/doc/images/tablemodel-example.png
diff --git a/doc/src/images/widgetmapper-sql-mapping-table.png b/examples/sql/doc/images/widgetmapper-sql-mapping-table.png
index 98734b34b6..98734b34b6 100644
--- a/doc/src/images/widgetmapper-sql-mapping-table.png
+++ b/examples/sql/doc/images/widgetmapper-sql-mapping-table.png
diff --git a/doc/src/images/widgetmapper-sql-mapping.png b/examples/sql/doc/images/widgetmapper-sql-mapping.png
index 88718c6a8b..88718c6a8b 100644
--- a/doc/src/images/widgetmapper-sql-mapping.png
+++ b/examples/sql/doc/images/widgetmapper-sql-mapping.png
diff --git a/doc/src/examples/cachedtable.qdoc b/examples/sql/doc/src/cachedtable.qdoc
index e3c0e40f8f..863cbce61e 100644
--- a/doc/src/examples/cachedtable.qdoc
+++ b/examples/sql/doc/src/cachedtable.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/cachedtable
+    \example cachedtable
     \title Cached Table Example
 
     The Cached Table example shows how a table view can be used to access a database,
@@ -45,7 +45,7 @@
     The \c TableEditor class inherits QDialog making the table editor
     widget a top-level dialog window.
 
-    \snippet examples/sql/cachedtable/tableeditor.h 0
+    \snippet cachedtable/tableeditor.h 0
 
     The \c TableEditor constructor takes two arguments: The first is a
     pointer to the parent widget and is passed on to the base class
@@ -73,14 +73,14 @@
     Before we can use the \c TableEditor class, we must create a
     connection to the database containing the table we want to edit:
 
-    \snippet examples/sql/cachedtable/main.cpp 0
+    \snippet cachedtable/main.cpp 0
 
     The \c createConnection() function is a helper function provided
     for convenience. It is defined in the \c connection.h file which
     is located in the \c sql example directory (all the examples in
     the \c sql directory use this function to connect to a database).
 
-    \snippet examples/sql/connection.h 0
+    \snippet connection.h 0
 
     The \c createConnection function opens a connection to an
     in-memory SQLITE database and creates a test table.  If you want
@@ -93,7 +93,7 @@
     constructor and the \c submit() slot. In the constructor we create
     and customize the data model and the various window elements:
 
-    \snippet examples/sql/cachedtable/tableeditor.cpp 0
+    \snippet cachedtable/tableeditor.cpp 0
 
     First we create the data model and set the SQL database table we
     want the model to operate on. Note that the
@@ -116,7 +116,7 @@
     the \l {QSqlQueryModel::setHeaderData()}{setHeaderData()} function
     that the model inherits from the QSqlQueryModel class.
 
-    \snippet examples/sql/cachedtable/tableeditor.cpp 1
+    \snippet cachedtable/tableeditor.cpp 1
 
     Then we create a table view. The QTableView class provides a
     default model/view implementation of a table view, i.e. it
@@ -129,7 +129,7 @@
     To make the view present our data, we pass our model to the view
     using the \l {QAbstractItemView::setModel()}{setModel()} function.
 
-    \snippet examples/sql/cachedtable/tableeditor.cpp 2
+    \snippet cachedtable/tableeditor.cpp 2
 
     The \c {TableEditor}'s buttons are regular QPushButton objects. We
     add them to a button box to ensure that the buttons are presented
@@ -150,7 +150,7 @@
     use. They exist as flags so you can OR them together in the
     constructor.
 
-    \snippet examples/sql/cachedtable/tableeditor.cpp 3
+    \snippet cachedtable/tableeditor.cpp 3
 
     We connect the \uicontrol Quit button to the table editor's \l
     {QWidget::close()}{close()} slot, and the \uicontrol Submit button to
@@ -159,13 +159,13 @@
     to our model's \l {QSqlTableModel::revertAll()}{revertAll()} slot,
     reverting all pending changes (i.e., restoring the original data).
 
-    \snippet examples/sql/cachedtable/tableeditor.cpp 4
+    \snippet cachedtable/tableeditor.cpp 4
 
     In the end we add the button box and the table view to a layout,
     install the layout on the table editor widget, and set the
     editor's window title.
 
-    \snippet examples/sql/cachedtable/tableeditor.cpp 5
+    \snippet cachedtable/tableeditor.cpp 5
 
     The \c submit() slot is called whenever the users hit the \uicontrol
     Submit button to save their changes.
diff --git a/doc/src/examples/drilldown.qdoc b/examples/sql/doc/src/drilldown.qdoc
index f8086c193e..9a7d0d003b 100644
--- a/doc/src/examples/drilldown.qdoc
+++ b/examples/sql/doc/src/drilldown.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/drilldown
+    \example drilldown
     \title Drill Down Example
 
     The Drill Down example shows how to read data from a database as
@@ -66,7 +66,7 @@
     The \c InformationWindow class is a custom widget inheriting
     QWidget:
 
-    \snippet examples/sql/drilldown/informationwindow.h 0
+    \snippet drilldown/informationwindow.h 0
 
     When we create an information window, we pass the associated
     location ID, a parent, and a pointer to the database, to the
@@ -81,14 +81,14 @@
     we will emit a signal carrying the ID and file name as parameters
     whenever the users changes the associated image.
 
-    \snippet examples/sql/drilldown/informationwindow.h 1
+    \snippet drilldown/informationwindow.h 1
 
     Since we allow the users to alter some of the location data, we
     must provide functionality for reverting and submitting their
     changes. The \c enableButtons() slot is provided for convenience
     to enable and disable the various buttons when required.
 
-    \snippet examples/sql/drilldown/informationwindow.h 2
+    \snippet drilldown/informationwindow.h 2
 
     The \c createButtons() function is also a convenience function,
     provided to simplify the constructor. As mentioned above we store
@@ -114,15 +114,15 @@
     pointer to a QSqlRelationalTableModel object providing an editable
     data model (with foreign key support) for our database table.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 0
-    \snippet examples/sql/drilldown/informationwindow.cpp 1
+    \snippet drilldown/informationwindow.cpp 0
+    \snippet drilldown/informationwindow.cpp 1
 
     First we create the various widgets required to display the data
     contained in the database. Most of the widgets are created in a
     straight forward manner. But note the combobox displaying the
     name of the image file:
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 2
+    \snippet drilldown/informationwindow.cpp 2
 
     In this example, the information about the offices are stored in a
     database table called "offices". When creating the model,
@@ -143,7 +143,7 @@
     column we want to be visible using the QComboBox::setModelColumn()
     function.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 3
+    \snippet drilldown/informationwindow.cpp 3
 
     Then we create the mapper. The QDataWidgetMapper class allows us
     to create data-aware widgets by mapping them to sections of an
@@ -169,7 +169,7 @@
     combobox functionality for fields that are foreign keys into other
     tables (like "imagefile" in our "trolltechoffices" table).
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 4
+    \snippet drilldown/informationwindow.cpp 4
 
     Finally, we connect the "something's changed" signals in the
     editors to our custom \c enableButtons() slot, enabling the users
@@ -182,7 +182,7 @@
     our widget is in fact a window, with a window system frame and a
     title bar.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 5
+    \snippet drilldown/informationwindow.cpp 5
 
     When a window is created, it is not deleted until the main
     application exits (i.e., if the user closes the information
@@ -192,7 +192,7 @@
     determine whether a window already exists for a given location
     when the user requests information about it.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 6
+    \snippet drilldown/informationwindow.cpp 6
 
     The \c revert() slot is triggered whenever the user hits the \uicontrol
     Revert button.
@@ -204,7 +204,7 @@
     slot to reset the editor widgets, repopulating all widgets with
     the current data of the model.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 7
+    \snippet drilldown/informationwindow.cpp 7
 
     Likewise, the \c submit() slot is triggered whenever the users
     decide to submit their changes by pressing the \uicontrol Submit button.
@@ -223,7 +223,7 @@
     file names differ, we store the new file name and emit the \c
     imageChanged() signal.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 8
+    \snippet drilldown/informationwindow.cpp 8
 
     The \c createButtons() function is provided for convenience, i.e.,
     to simplify the constructor.
@@ -236,7 +236,7 @@
     Submit and \uicontrol Revert buttons to the corresponding \c submit()
     and \c revert() slots.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 9
+    \snippet drilldown/informationwindow.cpp 9
 
     The QDialogButtonBox class is a widget that presents buttons in a
     layout that is appropriate to the current widget style. Dialogs
@@ -258,7 +258,7 @@
     the user has made wil be preserved until the user expliclity
     revert or submit them.
 
-    \snippet examples/sql/drilldown/informationwindow.cpp 10
+    \snippet drilldown/informationwindow.cpp 10
 
     The \c enableButtons() slot is called to enable the buttons
     whenever the user changes the presented data. Likewise, when the
@@ -274,9 +274,9 @@
     The \c View class represents the main application window and
     inherits QGraphicsView:
 
-    \snippet examples/sql/drilldown/view.h 0
+    \snippet drilldown/view.h 0
     \codeline
-    \snippet examples/sql/drilldown/view.h 1
+    \snippet drilldown/view.h 1
 
     The QGraphicsView class is part of the \l {Graphics View
     Framework} which we will use to display the images of Nokia's
@@ -293,7 +293,7 @@
     {InformationWindow}'s \c imageChanged() signal that is emitted
     whenever the user changes a location's image.
 
-    \snippet examples/sql/drilldown/view.h 2
+    \snippet drilldown/view.h 2
 
     The \c addItems() function is a convenience function provided to
     simplify the constructor. It is called only once, creating the
@@ -307,7 +307,7 @@
     latter function is in turn called from our custom \c
     mouseReleaseEvent() implementation.
 
-    \snippet examples/sql/drilldown/view.h 3
+    \snippet drilldown/view.h 3
 
     Finally we declare a QSqlRelationalTableModel pointer. As
     previously mentioned, the QSqlRelationalTableModel class provides
@@ -328,7 +328,7 @@
     names of the available image files, we only have to create a
     QSqlRelationalTableModel object for the office table:
 
-    \snippet examples/sql/drilldown/view.cpp 0
+    \snippet drilldown/view.cpp 0
 
     The reason is that once we have a model with the office details,
     we can create a relation to the available image files using
@@ -344,7 +344,7 @@
     {QSqlRelationalTableModel::}{select()} function to populate our
     model.
 
-    \snippet examples/sql/drilldown/view.cpp 1
+    \snippet drilldown/view.cpp 1
 
     Then we create the contents of our view, i.e., the scene and its
     items. The location labels are regular QGraphicsTextItem objects,
@@ -356,7 +356,7 @@
     Finally, we set the main application widget's size constraints and
     window title.
 
-    \snippet examples/sql/drilldown/view.cpp 3
+    \snippet drilldown/view.cpp 3
 
     The \c addItems() function is called only once, i.e., when
     creating the main application window. For each row in the database
@@ -377,7 +377,7 @@
     events). Please see the \l{Graphics View Framework} documentation
     and the \l{Graphics View Examples} for more details.
 
-    \snippet examples/sql/drilldown/view.cpp 5
+    \snippet drilldown/view.cpp 5
 
     We reimplement QGraphicsView's \l
     {QGraphicsView::}{mouseReleaseEvent()} event handler to respond to
@@ -390,7 +390,7 @@
     of a given type. Note that if the event is not related to any of
     our image items, we pass it on to the base class implementation.
 
-    \snippet examples/sql/drilldown/view.cpp 6
+    \snippet drilldown/view.cpp 6
 
     The \c showInformation() function is given an \c ImageItem object
     as argument, and starts off by extracting the item's location
@@ -407,14 +407,14 @@
     this widget's \c updateImage() slot, before we give it a suitable
     position and add it to the list of existing windows.
 
-    \snippet examples/sql/drilldown/view.cpp 7
+    \snippet drilldown/view.cpp 7
 
     The \c updateImage() slot takes a location ID and the name of an
     image files as arguments. It filters out the image items, and
     updates the one that correspond to the given location ID, with the
     provided image file.
 
-    \snippet examples/sql/drilldown/view.cpp 8
+    \snippet drilldown/view.cpp 8
 
     The \c findWindow() function simply searches through the list of
     existing windows, returning a pointer to the window that matches
@@ -428,7 +428,7 @@
     image items. It inherits QGraphicsPixmapItem and reimplements its
     hover event handlers:
 
-    \snippet examples/sql/drilldown/imageitem.h 0
+    \snippet drilldown/imageitem.h 0
 
     In addition, we implement a public \c id() function to be able to
     identify the associated location and a public \c adjust() function
@@ -456,7 +456,7 @@
     constructor's arguments (the pixmap, parent and scene) on to the
     base class constructor:
 
-    \snippet examples/sql/drilldown/imageitem.cpp 0
+    \snippet drilldown/imageitem.cpp 0
 
     Then we store the ID for future reference, and ensure that our
     item will accept hover events. Hover events are delivered when
@@ -482,9 +482,9 @@
     Finally, we call \c adjust() to ensure that the item is given the
     preferred size.
 
-    \snippet examples/sql/drilldown/imageitem.cpp 1
+    \snippet drilldown/imageitem.cpp 1
     \codeline
-    \snippet examples/sql/drilldown/imageitem.cpp 2
+    \snippet drilldown/imageitem.cpp 2
 
     Whenever the mouse cursor enters or leave the image item, the
     corresponding event handlers are triggered: We first set the time
@@ -503,7 +503,7 @@
     item stack once the animation is completed. Finally, if the time
     line is not already running, we start it.
 
-    \snippet examples/sql/drilldown/imageitem.cpp 3
+    \snippet drilldown/imageitem.cpp 3
 
     When the time line is running, it triggers the \c setFrame() slot
     whenever the current frame changes due to the connection we
@@ -520,11 +520,11 @@
 
     In the end, only the following convenience functions remain:
 
-    \snippet examples/sql/drilldown/imageitem.cpp 4
+    \snippet drilldown/imageitem.cpp 4
     \codeline
-    \snippet examples/sql/drilldown/imageitem.cpp 5
+    \snippet drilldown/imageitem.cpp 5
     \codeline
-    \snippet examples/sql/drilldown/imageitem.cpp 6
+    \snippet drilldown/imageitem.cpp 6
 
     The \c adjust() function defines and applies a transformation
     matrix, ensuring that our image item appears with the preferred
diff --git a/doc/src/examples/masterdetail.qdoc b/examples/sql/doc/src/masterdetail.qdoc
index 2b9e270b03..c8ec68f639 100644
--- a/doc/src/examples/masterdetail.qdoc
+++ b/examples/sql/doc/src/masterdetail.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/masterdetail
+    \example masterdetail
     \title Master Detail Example
 
     The Master Detail Example shows how to present data from different
diff --git a/doc/src/examples/querymodel.qdoc b/examples/sql/doc/src/querymodel.qdoc
index 88ac0d7297..2d1f3c90b1 100644
--- a/doc/src/examples/querymodel.qdoc
+++ b/examples/sql/doc/src/querymodel.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/querymodel
+    \example querymodel
     \title Query Model Example
 
     The Query Model example shows how to make customized versions of
diff --git a/doc/src/examples/relationaltablemodel.qdoc b/examples/sql/doc/src/relationaltablemodel.qdoc
index b1b9492a23..619554ff91 100644
--- a/doc/src/examples/relationaltablemodel.qdoc
+++ b/examples/sql/doc/src/relationaltablemodel.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*! 
-    \example sql/relationaltablemodel
+    \example relationaltablemodel
     \title Relational Table Model Example
 
     The Relational Table Model example shows how to use table views with a relational
diff --git a/doc/src/examples/sqlbrowser.qdoc b/examples/sql/doc/src/sqlbrowser.qdoc
index 81cf2d049d..302964cf75 100644
--- a/doc/src/examples/sqlbrowser.qdoc
+++ b/examples/sql/doc/src/sqlbrowser.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/sqlbrowser
+    \example sqlbrowser
     \title SQL Browser
 
     The SQL Browser example shows how a data browser can be used to visualize
diff --git a/doc/src/examples/sqlwidgetmapper.qdoc b/examples/sql/doc/src/sqlwidgetmapper.qdoc
index b9ea28849e..cc1c51c97f 100644
--- a/doc/src/examples/sqlwidgetmapper.qdoc
+++ b/examples/sql/doc/src/sqlwidgetmapper.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example sql/sqlwidgetmapper
+    \example sqlwidgetmapper
     \title SQL Widget Mapper Example
 
     The SQL Widget Mapper example shows how to use a map information from a
@@ -50,7 +50,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/sql/sqlwidgetmapper/window.h Window definition
+    \snippet sqlwidgetmapper/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
@@ -67,7 +67,7 @@
     we create a SQLite database containing a "person" table with primary key,
     name, address and type fields.
 
-    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up the main table
+    \snippet sqlwidgetmapper/window.cpp Set up the main table
 
     On each row of the table, we insert default values for these fields,
     including values for the address types that correspond to the address
@@ -78,7 +78,7 @@
     We create an "addresstype" table containing the identifiers used in the
     "person" table and the corresponding strings:
 
-    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up the address type table
+    \snippet sqlwidgetmapper/window.cpp Set up the address type table
 
     The "typeid" field in the "person" table is related to the contents of
     the "addresstype" table via a relation in a QSqlRelationalTableModel.
@@ -98,7 +98,7 @@
     In the first part, we set up the model used to hold the data, then we set
     up the widgets used for the user interface:
 
-    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up widgets
+    \snippet sqlwidgetmapper/window.cpp Set up widgets
 
     We obtain a model for the combo box from the main model, based on the
     relation we set up for the "typeid" field. The call to the combo box's
@@ -113,7 +113,7 @@
     Next, we set up the widget mapper, relating each input widget to a field
     in the model:
 
-    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up the mapper
+    \snippet sqlwidgetmapper/window.cpp Set up the mapper
 
     For the combo box, we already know the index of the field in the model
     from the \c{setupModel()} function. We use a QSqlRelationalDelegate as
@@ -127,12 +127,12 @@
     The rest of the constructor is very similar to that of the
     \l{Simple Widget Mapper Example}:
 
-    \snippet examples/sql/sqlwidgetmapper/window.cpp Set up connections and layouts
+    \snippet sqlwidgetmapper/window.cpp Set up connections and layouts
 
     We show the implementation of the \c{updateButtons()} slot for
     completeness:
 
-    \snippet examples/sql/sqlwidgetmapper/window.cpp Slot for updating the buttons
+    \snippet sqlwidgetmapper/window.cpp Slot for updating the buttons
 
     \omit
     \section1 Delegate Class Definition and Implementation
@@ -140,7 +140,7 @@
     The delegate we use to mediate interaction between the widget mapper and
     the input widgets is a small QItemDelegate subclass:
 
-    \snippet examples/sql/sqlwidgetmapper/delegate.h Delegate class definition
+    \snippet sqlwidgetmapper/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}
@@ -153,7 +153,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/sql/sqlwidgetmapper/delegate.cpp setEditorData implementation
+    \snippet sqlwidgetmapper/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,
@@ -168,7 +168,7 @@
     process, taking the value stored in the widget's \c currentIndex property
     and storing it back in the model:
 
-    \snippet examples/sql/sqlwidgetmapper/delegate.cpp setModelData implementation
+    \snippet sqlwidgetmapper/delegate.cpp setModelData implementation
     \endomit
 
     \section1 Summary and Further Reading
diff --git a/doc/src/examples/tablemodel.qdoc b/examples/sql/doc/src/tablemodel.qdoc
index c0b0d596b5..1a08048dd9 100644
--- a/doc/src/examples/tablemodel.qdoc
+++ b/examples/sql/doc/src/tablemodel.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*! 
-    \example sql/tablemodel
+    \example tablemodel
     \title Table Model Example
 
     The Table Model example shows how to use a specialized SQL table model with table
diff --git a/doc/src/examples/customcompleter.qdoc b/examples/tools/doc/src/customcompleter.qdoc
index b46d747e02..98a95e47a4 100644
--- a/doc/src/examples/customcompleter.qdoc
+++ b/examples/tools/doc/src/customcompleter.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example tools/customcompleter
+    \example customcompleter
     \title Custom Completer Example
 
     The Custom Completer example shows how to provide string-completion
diff --git a/doc/src/examples/customtype.qdoc b/examples/tools/doc/src/customtype.qdoc
index b2f86d6890..b2f86d6890 100644
--- a/doc/src/examples/customtype.qdoc
+++ b/examples/tools/doc/src/customtype.qdoc
diff --git a/examples/widgets/doc/images/itemviewspuzzle-example.png b/examples/widgets/doc/images/itemviewspuzzle-example.png
new file mode 100644
index 0000000000..05ae28be81
--- /dev/null
+++ b/examples/widgets/doc/images/itemviewspuzzle-example.png
diff --git a/src/widgets/doc/src/addressbook-fr.qdoc b/examples/widgets/doc/src/addressbook-fr.qdoc
index e2cca88f46..53bf89f3bd 100644
--- a/src/widgets/doc/src/addressbook-fr.qdoc
+++ b/examples/widgets/doc/src/addressbook-fr.qdoc
@@ -46,7 +46,7 @@
     \li Les entrées/sorties
     \endlist
 
-    Le code source du tutoriel est distribué avec Qt dans le dossier \c examples/tutorials/addressbook
+    Le code source du tutoriel est distribué avec Qt dans le dossier \c tutorials/addressbook
 
     Les chapitres du tutoriel:
 
diff --git a/src/widgets/doc/src/addressbook.qdoc b/examples/widgets/doc/src/addressbook-tutorial.qdoc
index ceab60e87a..c1e39643f9 100644
--- a/src/widgets/doc/src/addressbook.qdoc
+++ b/examples/widgets/doc/src/addressbook-tutorial.qdoc
@@ -56,7 +56,7 @@
     Tutorial contents:
 
     \list 1
-    \li \l{widgets/tutorials/addressbook/part1}{Designing the User Interface}
+    \li \l{tutorials/addressbook/part1}{Designing the User Interface}
     \li \l{tutorials/addressbook/part2}{Adding Addresses}
     \li \l{tutorials/addressbook/part3}{Navigating between Entries}
     \li \l{tutorials/addressbook/part4}{Editing and Removing Addresses}
@@ -65,7 +65,7 @@
     \li \l{tutorials/addressbook/part7}{Additional Features}
     \endlist
 
-    The tutorial source code is located in \c{examples/tutorials/addressbook}.
+    The tutorial source code is located in \c{tutorials/addressbook}.
 
     Although this little application does not look much like a
     fully-fledged modern GUI application, it uses many of the basic
diff --git a/examples/widgets/doc/addressbook.qdoc b/examples/widgets/doc/src/addressbook.qdoc
index 9b4ede5775..9b4ede5775 100644
--- a/examples/widgets/doc/addressbook.qdoc
+++ b/examples/widgets/doc/src/addressbook.qdoc
diff --git a/examples/widgets/doc/affine.qdoc b/examples/widgets/doc/src/affine.qdoc
index c69794d511..c69794d511 100644
--- a/examples/widgets/doc/affine.qdoc
+++ b/examples/widgets/doc/src/affine.qdoc
diff --git a/examples/widgets/doc/analogclock.qdoc b/examples/widgets/doc/src/analogclock.qdoc
index bb4bdb54ae..bb4bdb54ae 100644
--- a/examples/widgets/doc/analogclock.qdoc
+++ b/examples/widgets/doc/src/analogclock.qdoc
diff --git a/examples/widgets/doc/animatedtiles.qdoc b/examples/widgets/doc/src/animatedtiles.qdoc
index 4fe25388cf..4fe25388cf 100644
--- a/examples/widgets/doc/animatedtiles.qdoc
+++ b/examples/widgets/doc/src/animatedtiles.qdoc
diff --git a/examples/widgets/doc/appchooser.qdoc b/examples/widgets/doc/src/appchooser.qdoc
index 092db7c29e..092db7c29e 100644
--- a/examples/widgets/doc/appchooser.qdoc
+++ b/examples/widgets/doc/src/appchooser.qdoc
diff --git a/examples/widgets/doc/application.qdoc b/examples/widgets/doc/src/application.qdoc
index 5465f99e99..5465f99e99 100644
--- a/examples/widgets/doc/application.qdoc
+++ b/examples/widgets/doc/src/application.qdoc
diff --git a/doc/src/examples/applicationicon.qdoc b/examples/widgets/doc/src/applicationicon.qdoc
index 6f54ff6bfd..8c8f762894 100644
--- a/doc/src/examples/applicationicon.qdoc
+++ b/examples/widgets/doc/src/applicationicon.qdoc
@@ -40,7 +40,7 @@
     extension. You also need a \c .desktop file that gives the window manager
     hints about the application, such as name, type and icon.
 
-    \quotefile examples/widgets/applicationicon/applicationicon.desktop
+    \quotefile applicationicon/applicationicon.desktop
 
     The \c Icon field should also contain the name of the executable. On the
     device, application icons are stored in the
@@ -52,7 +52,7 @@
     For Maemo, we need to add that the \c .desktop and icon file should be
     installed.
 
-    \quotefile examples/widgets/applicationicon/applicationicon.pro
+    \quotefile applicationicon/applicationicon.pro
 
     Currently, Qt Creator doesn't include the icon and desktop files in the
     application package for Maemo, merely the executable file is included. As a
diff --git a/examples/widgets/doc/basicdrawing.qdoc b/examples/widgets/doc/src/basicdrawing.qdoc
index 899aa361f8..899aa361f8 100644
--- a/examples/widgets/doc/basicdrawing.qdoc
+++ b/examples/widgets/doc/src/basicdrawing.qdoc
diff --git a/examples/widgets/doc/basicgraphicslayouts.qdoc b/examples/widgets/doc/src/basicgraphicslayouts.qdoc
index 9f52b3eafa..9f52b3eafa 100644
--- a/examples/widgets/doc/basicgraphicslayouts.qdoc
+++ b/examples/widgets/doc/src/basicgraphicslayouts.qdoc
diff --git a/examples/widgets/doc/basiclayouts.qdoc b/examples/widgets/doc/src/basiclayouts.qdoc
index a0f083ba58..a0f083ba58 100644
--- a/examples/widgets/doc/basiclayouts.qdoc
+++ b/examples/widgets/doc/src/basiclayouts.qdoc
diff --git a/examples/widgets/doc/basicsortfiltermodel.qdoc b/examples/widgets/doc/src/basicsortfiltermodel.qdoc
index 0ecf4a0629..0ecf4a0629 100644
--- a/examples/widgets/doc/basicsortfiltermodel.qdoc
+++ b/examples/widgets/doc/src/basicsortfiltermodel.qdoc
diff --git a/examples/widgets/doc/blurpicker.qdoc b/examples/widgets/doc/src/blurpicker.qdoc
index bd57acb061..bd57acb061 100644
--- a/examples/widgets/doc/blurpicker.qdoc
+++ b/examples/widgets/doc/src/blurpicker.qdoc
diff --git a/examples/widgets/doc/borderlayout.qdoc b/examples/widgets/doc/src/borderlayout.qdoc
index aaff2dda1d..aaff2dda1d 100644
--- a/examples/widgets/doc/borderlayout.qdoc
+++ b/examples/widgets/doc/src/borderlayout.qdoc
diff --git a/examples/widgets/doc/boxes.qdoc b/examples/widgets/doc/src/boxes.qdoc
index aa34a61bc3..aa34a61bc3 100644
--- a/examples/widgets/doc/boxes.qdoc
+++ b/examples/widgets/doc/src/boxes.qdoc
diff --git a/examples/widgets/doc/calculator.qdoc b/examples/widgets/doc/src/calculator.qdoc
index 8480d90477..8480d90477 100644
--- a/examples/widgets/doc/calculator.qdoc
+++ b/examples/widgets/doc/src/calculator.qdoc
diff --git a/examples/widgets/doc/calendar.qdoc b/examples/widgets/doc/src/calendar.qdoc
index b7fa7c8617..b7fa7c8617 100644
--- a/examples/widgets/doc/calendar.qdoc
+++ b/examples/widgets/doc/src/calendar.qdoc
diff --git a/examples/widgets/doc/calendarwidget.qdoc b/examples/widgets/doc/src/calendarwidget.qdoc
index c6e86d1668..c6e86d1668 100644
--- a/examples/widgets/doc/calendarwidget.qdoc
+++ b/examples/widgets/doc/src/calendarwidget.qdoc
diff --git a/examples/widgets/doc/charactermap.qdoc b/examples/widgets/doc/src/charactermap.qdoc
index fee2a42156..fee2a42156 100644
--- a/examples/widgets/doc/charactermap.qdoc
+++ b/examples/widgets/doc/src/charactermap.qdoc
diff --git a/examples/widgets/doc/chart.qdoc b/examples/widgets/doc/src/chart.qdoc
index 44263d1027..44263d1027 100644
--- a/examples/widgets/doc/chart.qdoc
+++ b/examples/widgets/doc/src/chart.qdoc
diff --git a/examples/widgets/doc/chip.qdoc b/examples/widgets/doc/src/chip.qdoc
index 966c16900a..966c16900a 100644
--- a/examples/widgets/doc/chip.qdoc
+++ b/examples/widgets/doc/src/chip.qdoc
diff --git a/examples/widgets/doc/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc
index 0c357b7286..0c357b7286 100644
--- a/examples/widgets/doc/classwizard.qdoc
+++ b/examples/widgets/doc/src/classwizard.qdoc
diff --git a/examples/widgets/doc/codeeditor.qdoc b/examples/widgets/doc/src/codeeditor.qdoc
index 695ac5c4ce..695ac5c4ce 100644
--- a/examples/widgets/doc/codeeditor.qdoc
+++ b/examples/widgets/doc/src/codeeditor.qdoc
diff --git a/examples/widgets/doc/coloreditorfactory.qdoc b/examples/widgets/doc/src/coloreditorfactory.qdoc
index a2c02f8c1d..a2c02f8c1d 100644
--- a/examples/widgets/doc/coloreditorfactory.qdoc
+++ b/examples/widgets/doc/src/coloreditorfactory.qdoc
diff --git a/examples/widgets/doc/combowidgetmapper.qdoc b/examples/widgets/doc/src/combowidgetmapper.qdoc
index 949014930d..949014930d 100644
--- a/examples/widgets/doc/combowidgetmapper.qdoc
+++ b/examples/widgets/doc/src/combowidgetmapper.qdoc
diff --git a/examples/widgets/doc/composition.qdoc b/examples/widgets/doc/src/composition.qdoc
index 6aca01d255..6aca01d255 100644
--- a/examples/widgets/doc/composition.qdoc
+++ b/examples/widgets/doc/src/composition.qdoc
diff --git a/examples/widgets/doc/concentriccircles.qdoc b/examples/widgets/doc/src/concentriccircles.qdoc
index 67bc125dbe..67bc125dbe 100644
--- a/examples/widgets/doc/concentriccircles.qdoc
+++ b/examples/widgets/doc/src/concentriccircles.qdoc
diff --git a/examples/widgets/doc/configdialog.qdoc b/examples/widgets/doc/src/configdialog.qdoc
index 9acea72a3b..9acea72a3b 100644
--- a/examples/widgets/doc/configdialog.qdoc
+++ b/examples/widgets/doc/src/configdialog.qdoc
diff --git a/examples/widgets/doc/customsortfiltermodel.qdoc b/examples/widgets/doc/src/customsortfiltermodel.qdoc
index 4dce820f9c..4dce820f9c 100644
--- a/examples/widgets/doc/customsortfiltermodel.qdoc
+++ b/examples/widgets/doc/src/customsortfiltermodel.qdoc
diff --git a/examples/widgets/doc/deform.qdoc b/examples/widgets/doc/src/deform.qdoc
index 8195f90ffa..8195f90ffa 100644
--- a/examples/widgets/doc/deform.qdoc
+++ b/examples/widgets/doc/src/deform.qdoc
diff --git a/examples/widgets/doc/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc
index b61a936d52..b61a936d52 100644
--- a/examples/widgets/doc/diagramscene.qdoc
+++ b/examples/widgets/doc/src/diagramscene.qdoc
diff --git a/examples/widgets/doc/digitalclock.qdoc b/examples/widgets/doc/src/digitalclock.qdoc
index 92e8003205..92e8003205 100644
--- a/examples/widgets/doc/digitalclock.qdoc
+++ b/examples/widgets/doc/src/digitalclock.qdoc
diff --git a/examples/widgets/doc/dirview.qdoc b/examples/widgets/doc/src/dirview.qdoc
index a4b799678a..a4b799678a 100644
--- a/examples/widgets/doc/dirview.qdoc
+++ b/examples/widgets/doc/src/dirview.qdoc
diff --git a/examples/widgets/doc/dockwidgets.qdoc b/examples/widgets/doc/src/dockwidgets.qdoc
index 12f18a538f..12f18a538f 100644
--- a/examples/widgets/doc/dockwidgets.qdoc
+++ b/examples/widgets/doc/src/dockwidgets.qdoc
diff --git a/examples/widgets/doc/draganddroppuzzle.qdoc b/examples/widgets/doc/src/draganddroppuzzle.qdoc
index d0d336f70f..2c90998dc1 100644
--- a/examples/widgets/doc/draganddroppuzzle.qdoc
+++ b/examples/widgets/doc/src/draganddroppuzzle.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example widgets/draganddrop/puzzle
+    \example draganddrop/puzzle
     \title Drag and Drop Puzzle Example
 
     The Drag and Drop Puzzle example demonstrates a way of using the drag and drop system with
diff --git a/examples/widgets/doc/dragdroprobot.qdoc b/examples/widgets/doc/src/dragdroprobot.qdoc
index 60bd4eb4d8..60bd4eb4d8 100644
--- a/examples/widgets/doc/dragdroprobot.qdoc
+++ b/examples/widgets/doc/src/dragdroprobot.qdoc
diff --git a/doc/src/examples/draggableicons.qdoc b/examples/widgets/doc/src/draggableicons.qdoc
index f69dbc4b3d..627aa673e0 100644
--- a/doc/src/examples/draggableicons.qdoc
+++ b/examples/widgets/doc/src/draggableicons.qdoc
@@ -48,7 +48,7 @@
 
     The icon widgets that we use to display icons are subclassed from QLabel:
 
-    \snippet examples/draganddrop/draggableicons/dragwidget.h 0
+    \snippet draganddrop/draggableicons/dragwidget.h 0
 
     Since the QLabel class provides most of what we require for the icon, we
     only need to reimplement the \l QWidget::mousePressEvent() to provide
@@ -59,13 +59,13 @@
     The \c DragWidget constructor sets an attribute on the widget that ensures
     that it will be deleted when it is closed:
 
-    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 0
+    \snippet draganddrop/draggableicons/dragwidget.cpp 0
 
     To enable dragging from the icon, we need to act on a mouse press event.
     We do this by reimplementing \l QWidget::mousePressEvent() and setting up
     a QDrag object.
 
-    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 1
+    \snippet draganddrop/draggableicons/dragwidget.cpp 1
 
     Since we will be sending pixmap data for the icon and information about the
     user's click in the icon widget, we construct a QByteArray and package up the
@@ -74,14 +74,14 @@
     For interoperability, drag and drop operations describe the data they contain
     using MIME types. In Qt, we describe this data using a QMimeData object:
 
-    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 2
+    \snippet draganddrop/draggableicons/dragwidget.cpp 2
 
     We choose an unofficial MIME type for this purpose, and supply the QByteArray
     to the MIME data object.
 
     The drag and drop operation itself is handled by a QDrag object:
 
-    \snippet examples/draganddrop/draggableicons/dragwidget.cpp 3
+    \snippet draganddrop/draggableicons/dragwidget.cpp 3
 
     Here, we pass the data to the drag object, set a pixmap that will be shown
     alongside the cursor during the operation, and define the position of a hot
diff --git a/doc/src/examples/draggabletext.qdoc b/examples/widgets/doc/src/draggabletext.qdoc
index d497206f8b..d497206f8b 100644
--- a/doc/src/examples/draggabletext.qdoc
+++ b/examples/widgets/doc/src/draggabletext.qdoc
diff --git a/examples/widgets/doc/dynamiclayouts.qdoc b/examples/widgets/doc/src/dynamiclayouts.qdoc
index 318f719503..318f719503 100644
--- a/examples/widgets/doc/dynamiclayouts.qdoc
+++ b/examples/widgets/doc/src/dynamiclayouts.qdoc
diff --git a/examples/widgets/doc/easing.qdoc b/examples/widgets/doc/src/easing.qdoc
index 7fb7f59531..7fb7f59531 100644
--- a/examples/widgets/doc/easing.qdoc
+++ b/examples/widgets/doc/src/easing.qdoc
diff --git a/examples/widgets/doc/editabletreemodel.qdoc b/examples/widgets/doc/src/editabletreemodel.qdoc
index 24745b77b8..24745b77b8 100644
--- a/examples/widgets/doc/editabletreemodel.qdoc
+++ b/examples/widgets/doc/src/editabletreemodel.qdoc
diff --git a/examples/widgets/doc/elasticnodes.qdoc b/examples/widgets/doc/src/elasticnodes.qdoc
index 17f14124f8..17f14124f8 100644
--- a/examples/widgets/doc/elasticnodes.qdoc
+++ b/examples/widgets/doc/src/elasticnodes.qdoc
diff --git a/examples/widgets/doc/elidedlabel.qdoc b/examples/widgets/doc/src/elidedlabel.qdoc
index 2ce469d85f..2ce469d85f 100644
--- a/examples/widgets/doc/elidedlabel.qdoc
+++ b/examples/widgets/doc/src/elidedlabel.qdoc
diff --git a/examples/widgets/doc/embeddeddialogs.qdoc b/examples/widgets/doc/src/embeddeddialogs.qdoc
index 24b3abdb37..24b3abdb37 100644
--- a/examples/widgets/doc/embeddeddialogs.qdoc
+++ b/examples/widgets/doc/src/embeddeddialogs.qdoc
diff --git a/examples/widgets/doc/eventtransitions.qdoc b/examples/widgets/doc/src/eventtransitions.qdoc
index ef3f657c3d..ef3f657c3d 100644
--- a/examples/widgets/doc/eventtransitions.qdoc
+++ b/examples/widgets/doc/src/eventtransitions.qdoc
diff --git a/examples/widgets/doc/extension.qdoc b/examples/widgets/doc/src/extension.qdoc
index 040d5d38d9..040d5d38d9 100644
--- a/examples/widgets/doc/extension.qdoc
+++ b/examples/widgets/doc/src/extension.qdoc
diff --git a/examples/widgets/doc/factorial.qdoc b/examples/widgets/doc/src/factorial.qdoc
index 82ab5da536..82ab5da536 100644
--- a/examples/widgets/doc/factorial.qdoc
+++ b/examples/widgets/doc/src/factorial.qdoc
diff --git a/examples/widgets/doc/fademessage.qdoc b/examples/widgets/doc/src/fademessage.qdoc
index 48f98c03ad..48f98c03ad 100644
--- a/examples/widgets/doc/fademessage.qdoc
+++ b/examples/widgets/doc/src/fademessage.qdoc
diff --git a/examples/widgets/doc/fetchmore.qdoc b/examples/widgets/doc/src/fetchmore.qdoc
index 7ea0b30edf..7ea0b30edf 100644
--- a/examples/widgets/doc/fetchmore.qdoc
+++ b/examples/widgets/doc/src/fetchmore.qdoc
diff --git a/examples/widgets/doc/findfiles.qdoc b/examples/widgets/doc/src/findfiles.qdoc
index 594d57472c..594d57472c 100644
--- a/examples/widgets/doc/findfiles.qdoc
+++ b/examples/widgets/doc/src/findfiles.qdoc
diff --git a/examples/widgets/doc/flowlayout.qdoc b/examples/widgets/doc/src/flowlayout.qdoc
index b08b2283aa..b08b2283aa 100644
--- a/examples/widgets/doc/flowlayout.qdoc
+++ b/examples/widgets/doc/src/flowlayout.qdoc
diff --git a/examples/widgets/doc/fontsampler.qdoc b/examples/widgets/doc/src/fontsampler.qdoc
index 8d7f0e0460..8d7f0e0460 100644
--- a/examples/widgets/doc/fontsampler.qdoc
+++ b/examples/widgets/doc/src/fontsampler.qdoc
diff --git a/examples/widgets/doc/frozencolumn.qdoc b/examples/widgets/doc/src/frozencolumn.qdoc
index c65ce1d524..c65ce1d524 100644
--- a/examples/widgets/doc/frozencolumn.qdoc
+++ b/examples/widgets/doc/src/frozencolumn.qdoc
diff --git a/examples/widgets/doc/gradients.qdoc b/examples/widgets/doc/src/gradients.qdoc
index 75f78b56ea..75f78b56ea 100644
--- a/examples/widgets/doc/gradients.qdoc
+++ b/examples/widgets/doc/src/gradients.qdoc
diff --git a/examples/widgets/doc/groupbox.qdoc b/examples/widgets/doc/src/groupbox.qdoc
index d7384d409a..d7384d409a 100644
--- a/examples/widgets/doc/groupbox.qdoc
+++ b/examples/widgets/doc/src/groupbox.qdoc
diff --git a/examples/widgets/doc/icons.qdoc b/examples/widgets/doc/src/icons.qdoc
index b6625db005..b6625db005 100644
--- a/examples/widgets/doc/icons.qdoc
+++ b/examples/widgets/doc/src/icons.qdoc
diff --git a/examples/widgets/doc/imagecomposition.qdoc b/examples/widgets/doc/src/imagecomposition.qdoc
index 3f06f377b4..3f06f377b4 100644
--- a/examples/widgets/doc/imagecomposition.qdoc
+++ b/examples/widgets/doc/src/imagecomposition.qdoc
diff --git a/examples/widgets/doc/imageviewer.qdoc b/examples/widgets/doc/src/imageviewer.qdoc
index 3556d52f7e..3556d52f7e 100644
--- a/examples/widgets/doc/imageviewer.qdoc
+++ b/examples/widgets/doc/src/imageviewer.qdoc
diff --git a/examples/widgets/doc/interview.qdoc b/examples/widgets/doc/src/interview.qdoc
index 35721ccfae..35721ccfae 100644
--- a/examples/widgets/doc/interview.qdoc
+++ b/examples/widgets/doc/src/interview.qdoc
diff --git a/examples/widgets/doc/itemviewspuzzle.qdoc b/examples/widgets/doc/src/itemviewspuzzle.qdoc
index ca8288cf1c..ca8288cf1c 100644
--- a/examples/widgets/doc/itemviewspuzzle.qdoc
+++ b/examples/widgets/doc/src/itemviewspuzzle.qdoc
diff --git a/examples/widgets/doc/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc
index 125e0fec8f..125e0fec8f 100644
--- a/examples/widgets/doc/licensewizard.qdoc
+++ b/examples/widgets/doc/src/licensewizard.qdoc
diff --git a/examples/widgets/doc/lighting.qdoc b/examples/widgets/doc/src/lighting.qdoc
index aafa70f38c..aafa70f38c 100644
--- a/examples/widgets/doc/lighting.qdoc
+++ b/examples/widgets/doc/src/lighting.qdoc
diff --git a/examples/widgets/doc/lineedits.qdoc b/examples/widgets/doc/src/lineedits.qdoc
index c9cb7b5f43..c9cb7b5f43 100644
--- a/examples/widgets/doc/lineedits.qdoc
+++ b/examples/widgets/doc/src/lineedits.qdoc
diff --git a/examples/widgets/doc/mainwindow.qdoc b/examples/widgets/doc/src/mainwindow.qdoc
index b4f6aebed1..b4f6aebed1 100644
--- a/examples/widgets/doc/mainwindow.qdoc
+++ b/examples/widgets/doc/src/mainwindow.qdoc
diff --git a/examples/widgets/doc/mdi.qdoc b/examples/widgets/doc/src/mdi.qdoc
index e8b1b5c9ef..e8b1b5c9ef 100644
--- a/examples/widgets/doc/mdi.qdoc
+++ b/examples/widgets/doc/src/mdi.qdoc
diff --git a/examples/widgets/doc/menus.qdoc b/examples/widgets/doc/src/menus.qdoc
index 3531e439c1..3531e439c1 100644
--- a/examples/widgets/doc/menus.qdoc
+++ b/examples/widgets/doc/src/menus.qdoc
diff --git a/examples/widgets/doc/moveblocks.qdoc b/examples/widgets/doc/src/moveblocks.qdoc
index 8c12280989..8c12280989 100644
--- a/examples/widgets/doc/moveblocks.qdoc
+++ b/examples/widgets/doc/src/moveblocks.qdoc
diff --git a/examples/widgets/doc/movie.qdoc b/examples/widgets/doc/src/movie.qdoc
index e636ce5902..e636ce5902 100644
--- a/examples/widgets/doc/movie.qdoc
+++ b/examples/widgets/doc/src/movie.qdoc
diff --git a/examples/widgets/doc/orderform.qdoc b/examples/widgets/doc/src/orderform.qdoc
index ed40c65093..ed40c65093 100644
--- a/examples/widgets/doc/orderform.qdoc
+++ b/examples/widgets/doc/src/orderform.qdoc
diff --git a/examples/widgets/doc/padnavigator.qdoc b/examples/widgets/doc/src/padnavigator.qdoc
index 8b1da516b5..8b1da516b5 100644
--- a/examples/widgets/doc/padnavigator.qdoc
+++ b/examples/widgets/doc/src/padnavigator.qdoc
diff --git a/examples/widgets/doc/painterpaths.qdoc b/examples/widgets/doc/src/painterpaths.qdoc
index 45b0697cee..45b0697cee 100644
--- a/examples/widgets/doc/painterpaths.qdoc
+++ b/examples/widgets/doc/src/painterpaths.qdoc
diff --git a/examples/widgets/doc/pathstroke.qdoc b/examples/widgets/doc/src/pathstroke.qdoc
index 89a0182934..89a0182934 100644
--- a/examples/widgets/doc/pathstroke.qdoc
+++ b/examples/widgets/doc/src/pathstroke.qdoc
diff --git a/examples/widgets/doc/pingpong.qdoc b/examples/widgets/doc/src/pingpong.qdoc
index c56085d8cf..c56085d8cf 100644
--- a/examples/widgets/doc/pingpong.qdoc
+++ b/examples/widgets/doc/src/pingpong.qdoc
diff --git a/examples/widgets/doc/pixelator.qdoc b/examples/widgets/doc/src/pixelator.qdoc
index 099c382c82..099c382c82 100644
--- a/examples/widgets/doc/pixelator.qdoc
+++ b/examples/widgets/doc/src/pixelator.qdoc
diff --git a/examples/widgets/doc/recentfiles.qdoc b/examples/widgets/doc/src/recentfiles.qdoc
index e2e876b088..e2e876b088 100644
--- a/examples/widgets/doc/recentfiles.qdoc
+++ b/examples/widgets/doc/src/recentfiles.qdoc
diff --git a/examples/widgets/doc/rogue.qdoc b/examples/widgets/doc/src/rogue.qdoc
index 4c65dd2d6e..4c65dd2d6e 100644
--- a/examples/widgets/doc/rogue.qdoc
+++ b/examples/widgets/doc/src/rogue.qdoc
diff --git a/examples/widgets/doc/screenshot.qdoc b/examples/widgets/doc/src/screenshot.qdoc
index 2d41cf0d85..2d41cf0d85 100644
--- a/examples/widgets/doc/screenshot.qdoc
+++ b/examples/widgets/doc/src/screenshot.qdoc
diff --git a/examples/widgets/doc/scribble.qdoc b/examples/widgets/doc/src/scribble.qdoc
index 5749b9ed07..5749b9ed07 100644
--- a/examples/widgets/doc/scribble.qdoc
+++ b/examples/widgets/doc/src/scribble.qdoc
diff --git a/examples/widgets/doc/sdi.qdoc b/examples/widgets/doc/src/sdi.qdoc
index b686888797..b686888797 100644
--- a/examples/widgets/doc/sdi.qdoc
+++ b/examples/widgets/doc/src/sdi.qdoc
diff --git a/examples/widgets/doc/shapedclock.qdoc b/examples/widgets/doc/src/shapedclock.qdoc
index 8d7b856fd6..8d7b856fd6 100644
--- a/examples/widgets/doc/shapedclock.qdoc
+++ b/examples/widgets/doc/src/shapedclock.qdoc
diff --git a/examples/widgets/doc/simpledommodel.qdoc b/examples/widgets/doc/src/simpledommodel.qdoc
index 2564c654fa..2564c654fa 100644
--- a/examples/widgets/doc/simpledommodel.qdoc
+++ b/examples/widgets/doc/src/simpledommodel.qdoc
diff --git a/examples/widgets/doc/simpletreemodel.qdoc b/examples/widgets/doc/src/simpletreemodel.qdoc
index c054352cb8..c054352cb8 100644
--- a/examples/widgets/doc/simpletreemodel.qdoc
+++ b/examples/widgets/doc/src/simpletreemodel.qdoc
diff --git a/examples/widgets/doc/simplewidgetmapper.qdoc b/examples/widgets/doc/src/simplewidgetmapper.qdoc
index 2b7cd2d79a..2b7cd2d79a 100644
--- a/examples/widgets/doc/simplewidgetmapper.qdoc
+++ b/examples/widgets/doc/src/simplewidgetmapper.qdoc
diff --git a/examples/widgets/doc/sipdialog.qdoc b/examples/widgets/doc/src/sipdialog.qdoc
index b5f18cb4be..b5f18cb4be 100644
--- a/examples/widgets/doc/sipdialog.qdoc
+++ b/examples/widgets/doc/src/sipdialog.qdoc
diff --git a/examples/widgets/doc/sliders.qdoc b/examples/widgets/doc/src/sliders.qdoc
index 209d81198d..209d81198d 100644
--- a/examples/widgets/doc/sliders.qdoc
+++ b/examples/widgets/doc/src/sliders.qdoc
diff --git a/examples/widgets/doc/spinboxdelegate.qdoc b/examples/widgets/doc/src/spinboxdelegate.qdoc
index 258811cc4c..258811cc4c 100644
--- a/examples/widgets/doc/spinboxdelegate.qdoc
+++ b/examples/widgets/doc/src/spinboxdelegate.qdoc
diff --git a/examples/widgets/doc/spinboxes.qdoc b/examples/widgets/doc/src/spinboxes.qdoc
index ed4eea6a60..ed4eea6a60 100644
--- a/examples/widgets/doc/spinboxes.qdoc
+++ b/examples/widgets/doc/src/spinboxes.qdoc
diff --git a/examples/widgets/doc/spreadsheet.qdoc b/examples/widgets/doc/src/spreadsheet.qdoc
index 7364f022cb..7364f022cb 100644
--- a/examples/widgets/doc/spreadsheet.qdoc
+++ b/examples/widgets/doc/src/spreadsheet.qdoc
diff --git a/examples/widgets/doc/standarddialogs.qdoc b/examples/widgets/doc/src/standarddialogs.qdoc
index b56642b6ec..b56642b6ec 100644
--- a/examples/widgets/doc/standarddialogs.qdoc
+++ b/examples/widgets/doc/src/standarddialogs.qdoc
diff --git a/examples/widgets/doc/stardelegate.qdoc b/examples/widgets/doc/src/stardelegate.qdoc
index aba8864c2b..aba8864c2b 100644
--- a/examples/widgets/doc/stardelegate.qdoc
+++ b/examples/widgets/doc/src/stardelegate.qdoc
diff --git a/examples/widgets/doc/states.qdoc b/examples/widgets/doc/src/states.qdoc
index 52eda087f1..52eda087f1 100644
--- a/examples/widgets/doc/states.qdoc
+++ b/examples/widgets/doc/src/states.qdoc
diff --git a/examples/widgets/doc/stickman.qdoc b/examples/widgets/doc/src/stickman.qdoc
index cffdb64822..cffdb64822 100644
--- a/examples/widgets/doc/stickman.qdoc
+++ b/examples/widgets/doc/src/stickman.qdoc
diff --git a/examples/widgets/doc/styles.qdoc b/examples/widgets/doc/src/styles.qdoc
index f8be98d2da..f8be98d2da 100644
--- a/examples/widgets/doc/styles.qdoc
+++ b/examples/widgets/doc/src/styles.qdoc
diff --git a/examples/widgets/doc/stylesheet.qdoc b/examples/widgets/doc/src/stylesheet.qdoc
index af45411f8c..af45411f8c 100644
--- a/examples/widgets/doc/stylesheet.qdoc
+++ b/examples/widgets/doc/src/stylesheet.qdoc
diff --git a/examples/widgets/doc/sub-attaq.qdoc b/examples/widgets/doc/src/sub-attaq.qdoc
index ae00eb0926..ae00eb0926 100644
--- a/examples/widgets/doc/sub-attaq.qdoc
+++ b/examples/widgets/doc/src/sub-attaq.qdoc
diff --git a/examples/widgets/doc/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc
index 66727c0030..66727c0030 100644
--- a/examples/widgets/doc/syntaxhighlighter.qdoc
+++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc
diff --git a/examples/widgets/doc/tabdialog.qdoc b/examples/widgets/doc/src/tabdialog.qdoc
index 98983d124b..98983d124b 100644
--- a/examples/widgets/doc/tabdialog.qdoc
+++ b/examples/widgets/doc/src/tabdialog.qdoc
diff --git a/examples/widgets/doc/tablet.qdoc b/examples/widgets/doc/src/tablet.qdoc
index 846a9a357b..846a9a357b 100644
--- a/examples/widgets/doc/tablet.qdoc
+++ b/examples/widgets/doc/src/tablet.qdoc
diff --git a/examples/widgets/doc/tetrix.qdoc b/examples/widgets/doc/src/tetrix.qdoc
index 1a30845024..1a30845024 100644
--- a/examples/widgets/doc/tetrix.qdoc
+++ b/examples/widgets/doc/src/tetrix.qdoc
diff --git a/examples/widgets/doc/textedit.qdoc b/examples/widgets/doc/src/textedit.qdoc
index 1bb596eb6e..1bb596eb6e 100644
--- a/examples/widgets/doc/textedit.qdoc
+++ b/examples/widgets/doc/src/textedit.qdoc
diff --git a/examples/widgets/doc/tooltips.qdoc b/examples/widgets/doc/src/tooltips.qdoc
index e06f080a93..e06f080a93 100644
--- a/examples/widgets/doc/tooltips.qdoc
+++ b/examples/widgets/doc/src/tooltips.qdoc
diff --git a/examples/widgets/doc/trafficlight.qdoc b/examples/widgets/doc/src/trafficlight.qdoc
index ec3578abaa..ec3578abaa 100644
--- a/examples/widgets/doc/trafficlight.qdoc
+++ b/examples/widgets/doc/src/trafficlight.qdoc
diff --git a/examples/widgets/doc/transformations.qdoc b/examples/widgets/doc/src/transformations.qdoc
index 79681a2799..79681a2799 100644
--- a/examples/widgets/doc/transformations.qdoc
+++ b/examples/widgets/doc/src/transformations.qdoc
diff --git a/examples/widgets/doc/trivialwizard.qdoc b/examples/widgets/doc/src/trivialwizard.qdoc
index e27f9cadc2..e27f9cadc2 100644
--- a/examples/widgets/doc/trivialwizard.qdoc
+++ b/examples/widgets/doc/src/trivialwizard.qdoc
diff --git a/examples/widgets/doc/twowaybutton.qdoc b/examples/widgets/doc/src/twowaybutton.qdoc
index 40f8c6f1f3..40f8c6f1f3 100644
--- a/examples/widgets/doc/twowaybutton.qdoc
+++ b/examples/widgets/doc/src/twowaybutton.qdoc
diff --git a/examples/widgets/doc/wiggly.qdoc b/examples/widgets/doc/src/wiggly.qdoc
index e84ab00e61..e84ab00e61 100644
--- a/examples/widgets/doc/wiggly.qdoc
+++ b/examples/widgets/doc/src/wiggly.qdoc
diff --git a/examples/widgets/doc/windowflags.qdoc b/examples/widgets/doc/src/windowflags.qdoc
index e85842b30a..e85842b30a 100644
--- a/examples/widgets/doc/windowflags.qdoc
+++ b/examples/widgets/doc/src/windowflags.qdoc
diff --git a/doc/src/images/saxbookmarks-example.png b/examples/xml/doc/images/saxbookmarks-example.png
index 54d793be56..54d793be56 100644
--- a/doc/src/images/saxbookmarks-example.png
+++ b/examples/xml/doc/images/saxbookmarks-example.png
diff --git a/doc/src/examples/saxbookmarks.qdoc b/examples/xml/doc/src/saxbookmarks.qdoc
index f41ce5c363..05757dba4b 100644
--- a/doc/src/examples/saxbookmarks.qdoc
+++ b/examples/xml/doc/src/saxbookmarks.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-    \example xml/saxbookmarks
+    \example saxbookmarks
     \title SAX Bookmarks Example
 
     The SAX Bookmarks example provides a reader for XML Bookmark Exchange Language (XBEL)
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 52e6ba4c61..cd09a8a0df 100644
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -36,12 +36,12 @@ depends                 += qtcore
 
 headerdirs  += ..
 
-sourcedirs  += ..
+sourcedirs  += .. \
+               ../../../examples/network/doc/src
 
 exampledirs += ../../../examples/network \
                ../ \
                snippets
 
-excludedirs += ../../../examples/widgets/doc
-
-imagedirs   += images
+imagedirs   += images \
+               ../../../examples/network/doc/images
diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
index f17ce1854d..9ec43d7fd1 100644
--- a/src/opengl/doc/qtopengl.qdocconf
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -36,12 +36,12 @@ depends                 += qtcore qtgui qtwidgets
 
 headerdirs  += ..
 
-sourcedirs  += ..
+sourcedirs  += .. \
+               ../../../examples/opengl/doc/src
 
 exampledirs += ../../../examples/opengl \
                ../ \
                snippets
 
-excludedirs += ../../../examples/widgets/doc
-
-imagedirs   += images
+imagedirs   += images \
+               ../../../examples/opengl/doc/images
diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index bed9f9172a..dabe21a44b 100644
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -36,12 +36,12 @@ depends                 += qtcore
 
 headerdirs  += ..
 
-sourcedirs  += ..
+sourcedirs  += .. \
+               ../../../examples/sql/doc/src
 
 exampledirs += ../../../examples/sql \
                ../ \
                snippets
 
-excludedirs += ../../../examples/widgets/doc
-
-imagedirs   += images
+imagedirs   += images \
+               ../../../examples/sql/doc/images
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index c0dd442e51..6a7815d9a2 100644
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -37,7 +37,7 @@ depends                 += qtcore qtgui
 headerdirs  += ..
 
 sourcedirs  += .. \
-               ../../../examples/widgets/doc
+               ../../../examples/widgets/doc/src
 
 exampledirs += ../../../examples/widgets \
                ../../../doc/src/snippets \
diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index 81840262bc..8ad6c8b780 100644
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -36,12 +36,12 @@ depends                 += qtcore
 
 headerdirs  += ..
 
-sourcedirs  += ..
+sourcedirs  += .. \
+               ../../../examples/xml/src
 
 exampledirs += ../../../examples/xml \
                ../ \
                snippets
 
-excludedirs += ../../../examples/widgets/doc
-
-imagedirs   += images
+imagedirs   += images \
+               ../../../examples/xml/images