604 files changed, 1281 insertions, 714 deletions

diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index d7a8f5dc21..f034590ccb 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -1717,7 +1717,7 @@ QColor QColorDialog::currentColor() const
 }
 
 /*!
-    Returns the color that the user selected by clicking the \gui{OK}
+    Returns the color that the user selected by clicking the \uicontrol{OK}
     or equivalent button.
 
     \note This color is not always the same as the color held by the
@@ -1795,7 +1795,7 @@ QColorDialog::ColorDialogOptions QColorDialog::options() const
     of a color dialog.
 
     \value ShowAlphaChannel Allow the user to select the alpha component of a color.
-    \value NoButtons Don't display \gui{OK} and \gui{Cancel} buttons. (Useful for "live dialogs".)
+    \value NoButtons Don't display \uicontrol{OK} and \uicontrol{Cancel} buttons. (Useful for "live dialogs".)
     \value DontUseNativeDialog Use Qt's standard color dialog on the Mac instead of Apple's
                                native color panel.
 
@@ -1819,7 +1819,7 @@ bool QColorDialogPrivate::sharedColorPanelAvailable = true;
 /*!
     \fn void QColorDialog::colorSelected(const QColor &color);
 
-    This signal is emitted just after the user has clicked \gui{OK} to
+    This signal is emitted just after the user has clicked \uicontrol{OK} to
     select a color to use. The chosen color is specified by \a color.
 
     \sa color, currentColorChanged()
@@ -1933,7 +1933,7 @@ QColor QColorDialog::getColor(const QColor &initial, QWidget *parent, const QStr
     initially set to \a initial. The dialog is a child of \a parent.
 
     If \a ok is non-null, \e *\a ok is set to true if the user clicked
-    \gui{OK}, and to false if the user clicked Cancel.
+    \uicontrol{OK}, and to false if the user clicked Cancel.
 
     If the user clicks Cancel, the \a initial value is returned.
 
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 718d64bd27..9410a9b62b 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -181,8 +181,8 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
     exec() function. When the user closes the dialog, exec() will
     provide a useful \link #return return value\endlink. Typically,
     to get the dialog to close and return the appropriate value, we
-    connect a default button, e.g. \gui OK, to the accept() slot and a
-    \gui Cancel button to the reject() slot.
+    connect a default button, e.g. \uicontrol OK, to the accept() slot and a
+    \uicontrol Cancel button to the reject() slot.
     Alternatively you can call the done() slot with \c Accepted or
     \c Rejected.
 
@@ -239,7 +239,7 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
     partial dialog that shows the most commonly used options, and a
     full dialog that shows all the options. Typically an extensible
     dialog will initially appear as a partial dialog, but with a
-    \gui More toggle button. If the user presses the \gui More button down,
+    \uicontrol More toggle button. If the user presses the \uicontrol More button down,
     the dialog is expanded. The \l{Extension Example} shows how to achieve
     extensible dialogs using Qt.
 
@@ -247,8 +247,8 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
     \section1 Return Value (Modal Dialogs)
 
     Modal dialogs are often used in situations where a return value is
-    required, e.g. to indicate whether the user pressed \gui OK or
-    \gui Cancel. A dialog can be closed by calling the accept() or the
+    required, e.g. to indicate whether the user pressed \uicontrol OK or
+    \uicontrol Cancel. A dialog can be closed by calling the accept() or the
     reject() slots, and exec() will return \c Accepted or \c Rejected
     as appropriate. The exec() call returns the result of the dialog.
     The result is also available from result() if the dialog has not
@@ -265,11 +265,11 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
 
     A modal dialog:
 
-    \snippet doc/src/snippets/dialogs/dialogs.cpp 1
+    \snippet dialogs/dialogs.cpp 1
 
     A modeless dialog:
 
-    \snippet doc/src/snippets/dialogs/dialogs.cpp 0
+    \snippet dialogs/dialogs.cpp 0
 
     \sa QDialogButtonBox, QTabWidget, QWidget, QProgressDialog,
         {fowler}{GUI Design Handbook: Dialogs, Standard}, {Extension Example},
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index 3908daec9c..43bb164366 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -108,7 +108,7 @@ Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_h
   functions. On Windows, Mac OS X, KDE and GNOME, these static functions will
   call the native file dialog when possible.
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 0
+  \snippet code/src_gui_dialogs_qfiledialog.cpp 0
 
   In the above example, a modal QFileDialog is created using a static
   function. The dialog initially displays the contents of the "/home/jana"
@@ -119,13 +119,13 @@ Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_h
   If you want to use multiple filters, separate each one with
   \e two semicolons. For example:
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 1
+  \snippet code/src_gui_dialogs_qfiledialog.cpp 1
 
   You can create your own QFileDialog without using the static
   functions. By calling setFileMode(), you can specify what the user must
   select in the dialog:
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 2
+  \snippet code/src_gui_dialogs_qfiledialog.cpp 2
 
   In the above example, the mode of the file dialog is set to
   AnyFile, meaning that the user can select any file, or even specify a
@@ -138,7 +138,7 @@ Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_h
   this indicates what types of objects the user is expected to select.
   Use setNameFilter() to set the dialog's file filter. For example:
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 3
+  \snippet code/src_gui_dialogs_qfiledialog.cpp 3
 
   In the above example, the filter is set to \c{"Images (*.png *.xpm *.jpg)"},
   this means that only files with the extension \c png, \c xpm,
@@ -154,12 +154,12 @@ Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_h
   information alongside each name, such as the file size and modification
   date. Set the mode with setViewMode():
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 4
+  \snippet code/src_gui_dialogs_qfiledialog.cpp 4
 
   The last important function you will need to use when creating your
   own file dialog is selectedFiles().
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 5
+  \snippet code/src_gui_dialogs_qfiledialog.cpp 5
 
   In the above example, a modal file dialog is created and shown. If
   the user clicked OK, the file they selected is put in \c fileName.
@@ -377,7 +377,7 @@ QFileDialog::~QFileDialog()
 
     For instance:
 
-    \snippet doc/src/snippets/filedialogurls.cpp 0
+    \snippet filedialogurls.cpp 0
 
     The file dialog will then look like this:
 
@@ -1100,7 +1100,7 @@ QStringList qt_make_filter_list(const QString &filter)
     text contained in the parentheses is used as the filter. This means
     that these calls are all equivalent:
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 6
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 6
 
     \sa setNameFilters()
 */
@@ -1156,7 +1156,7 @@ QStringList qt_strip_filters(const QStringList &filters)
 
     Sets the \a filters used in the file dialog.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 7
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 7
 */
 void QFileDialog::setNameFilters(const QStringList &filters)
 {
@@ -1707,7 +1707,7 @@ extern QString qt_win_get_existing_directory(const QFileDialogArgs &args);
     This is a convenience static function that returns an existing file
     selected by the user. If the user presses Cancel, it returns a null string.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 8
 
     The function creates a modal file dialog with the given \a parent widget.
     If \a parent is not 0, the dialog will be shown centered over the parent
@@ -1789,7 +1789,7 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
     This is a convenience static function that will return one or more existing
     files selected by the user.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 9
 
     This function creates a modal file dialog with the given \a parent widget.
     If \a parent is not 0, the dialog will be shown centered over the parent
@@ -1826,7 +1826,7 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
     \note If you want to iterate over the list of files, you should iterate
     over a copy. For example:
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 10
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 10
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
@@ -1878,7 +1878,7 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent,
     \a parent is not 0, the dialog will be shown centered over the parent
     widget.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 11
 
     The file dialog's working directory will be set to \a dir. If \a dir
     includes a file name, the file will be selected. Only files that match the
@@ -1962,7 +1962,7 @@ QString QFileDialog::getSaveFileName(QWidget *parent,
     This is a convenience static function that will return an existing
     directory selected by the user.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12
+    \snippet code/src_gui_dialogs_qfiledialog.cpp 12
 
     This function creates a modal file dialog with the given \a parent widget.
     If \a parent is not 0, the dialog will be shown centered over the parent
diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp
index 40cc100c53..06733a8932 100644
--- a/src/widgets/dialogs/qfilesystemmodel.cpp
+++ b/src/widgets/dialogs/qfilesystemmodel.cpp
@@ -95,16 +95,16 @@ QT_BEGIN_NAMESPACE
     A directory model that displays the contents of a default directory
     is usually constructed with a parent object:
 
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 2
+    \snippet shareddirmodel/main.cpp 2
 
     A tree view can be used to display the contents of the model
 
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 4
+    \snippet shareddirmodel/main.cpp 4
 
     and the contents of a particular directory can be displayed by
     setting the tree view's root index:
 
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 7
+    \snippet shareddirmodel/main.cpp 7
 
     The view's root index can be used to control how much of a
     hierarchical model is displayed. QDirModel provides a convenience
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index b267f67422..23fac31822 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -122,10 +122,10 @@ static const Qt::WindowFlags DefaultWindowFlags =
 
   Examples:
 
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp 0
+  \snippet code/src_gui_dialogs_qfontdialog.cpp 0
 
     The dialog can also be used to set a widget's font directly:
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp 1
+  \snippet code/src_gui_dialogs_qfontdialog.cpp 1
   If the user clicks OK the font they chose will be used for myWidget,
   and if they click Cancel the original font is used.
 
@@ -345,20 +345,20 @@ QFontDialog::~QFontDialog()
 /*!
   Executes a modal font dialog and returns a font.
 
-  If the user clicks \gui OK, the selected font is returned. If the user
-  clicks \gui Cancel, the \a initial font is returned.
+  If the user clicks \uicontrol OK, the selected font is returned. If the user
+  clicks \uicontrol Cancel, the \a initial font is returned.
 
   The dialog is constructed with the given \a parent and the options specified
   in \a options. \a title is shown as the window title of the dialog and  \a
   initial is the initially selected font. If the \a ok parameter is not-null,
-  the value it refers to is set to true if the user clicks \gui OK, and set to
-  false if the user clicks \gui Cancel.
+  the value it refers to is set to true if the user clicks \uicontrol OK, and set to
+  false if the user clicks \uicontrol Cancel.
 
   Examples:
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp 2
+  \snippet code/src_gui_dialogs_qfontdialog.cpp 2
 
     The dialog can also be used to set a widget's font directly:
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp 3
+  \snippet code/src_gui_dialogs_qfontdialog.cpp 3
   In this example, if the user clicks OK the font they chose will be
   used, and if they click Cancel the original font is used.
 
@@ -377,16 +377,16 @@ QFont QFontDialog::getFont(bool *ok, const QFont &initial, QWidget *parent, cons
 
   Executes a modal font dialog and returns a font.
 
-  If the user clicks \gui OK, the selected font is returned. If the user
-  clicks \gui Cancel, the Qt default font is returned.
+  If the user clicks \uicontrol OK, the selected font is returned. If the user
+  clicks \uicontrol Cancel, the Qt default font is returned.
 
   The dialog is constructed with the given \a parent.
   If the \a ok parameter is not-null, the value it refers to is set
-  to true if the user clicks \gui OK, and false if the user clicks
-  \gui Cancel.
+  to true if the user clicks \uicontrol OK, and false if the user clicks
+  \uicontrol Cancel.
 
   Example:
-  \snippet doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp 4
+  \snippet code/src_gui_dialogs_qfontdialog.cpp 4
 
   \warning Do not delete \a parent during the execution of the dialog.
            If you want to do this, you should create the dialog
@@ -829,7 +829,7 @@ QFont QFontDialog::currentFont() const
 }
 
 /*!
-    Returns the font that the user selected by clicking the \gui{OK}
+    Returns the font that the user selected by clicking the \uicontrol{OK}
     or equivalent button.
 
     \note This font is not always the same as the font held by the
@@ -849,7 +849,7 @@ QFont QFontDialog::selectedFont() const
     This enum specifies various options that affect the look and feel
     of a font dialog.
 
-    \value NoButtons Don't display \gui{OK} and \gui{Cancel} buttons. (Useful for "live dialogs".)
+    \value NoButtons Don't display \uicontrol{OK} and \uicontrol{Cancel} buttons. (Useful for "live dialogs".)
     \value DontUseNativeDialog Use Qt's standard font dialog on the Mac instead of Apple's
                                native font panel. (Currently, the native dialog is never used,
                                but this is likely to change in future Qt releases.)
diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp
index 737d6bb467..13be3fcbe4 100644
--- a/src/widgets/dialogs/qinputdialog.cpp
+++ b/src/widgets/dialogs/qinputdialog.cpp
@@ -442,9 +442,9 @@ void QInputDialogPrivate::_q_currentRowChanged(const QModelIndex &newIndex,
     getDouble(), and getItem(). All the functions can be used in a similar way,
     for example:
 
-    \snippet examples/dialogs/standarddialogs/dialog.cpp 3
+    \snippet dialogs/standarddialogs/dialog.cpp 3
 
-    The \c ok variable is set to true if the user clicks \gui OK; otherwise it
+    The \c ok variable is set to true if the user clicks \uicontrol OK; otherwise it
     is set to false.
 
     \img inputdialogs.png Input Dialogs
@@ -576,7 +576,7 @@ QString QInputDialog::labelText() const
     This enum specifies various options that affect the look and feel
     of an input dialog.
 
-    \value NoButtons Don't display \gui{OK} and \gui{Cancel} buttons. (Useful for "live dialogs".)
+    \value NoButtons Don't display \uicontrol{OK} and \uicontrol{Cancel} buttons. (Useful for "live dialogs".)
     \value UseListViewForComboBoxItems Use a QListView rather than a non-editable QComboBox for
                                        displaying the items set with setComboBoxItems().
 
@@ -1133,7 +1133,7 @@ void QInputDialog::done(int result)
     edit widget if an input method is active.
 
     If \a ok is nonnull \e *\a ok will be set to true if the user pressed
-    \gui OK and to false if the user pressed \gui Cancel. The dialog's parent
+    \uicontrol OK and to false if the user pressed \uicontrol Cancel. The dialog's parent
     is \a parent. The dialog will be modal and uses the specified widget
     \a flags.
 
@@ -1142,7 +1142,7 @@ void QInputDialog::done(int result)
 
     Use this static function like this:
 
-    \snippet examples/dialogs/standarddialogs/dialog.cpp 3
+    \snippet dialogs/standarddialogs/dialog.cpp 3
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
@@ -1185,8 +1185,8 @@ QString QInputDialog::getText(QWidget *parent, const QString &title, const QStri
     \a step is the amount by which the values change as the user presses the
     arrow buttons to increment or decrement the value.
 
-    If \a ok is nonnull *\a ok will be set to true if the user pressed \gui OK
-    and to false if the user pressed \gui Cancel. The dialog's parent is
+    If \a ok is nonnull *\a ok will be set to true if the user pressed \uicontrol OK
+    and to false if the user pressed \uicontrol Cancel. The dialog's parent is
     \a parent. The dialog will be modal and uses the widget \a flags.
 
     On success, this function returns the integer which has been entered by the
@@ -1194,7 +1194,7 @@ QString QInputDialog::getText(QWidget *parent, const QString &title, const QStri
 
     Use this static function like this:
 
-    \snippet examples/dialogs/standarddialogs/dialog.cpp 0
+    \snippet dialogs/standarddialogs/dialog.cpp 0
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
@@ -1234,8 +1234,8 @@ int QInputDialog::getInt(QWidget *parent, const QString &title, const QString &l
     \a min and \a max are the minimum and maximum values the user may choose.
     \a decimals is the maximum number of decimal places the number may have.
 
-    If \a ok is nonnull, *\a ok will be set to true if the user pressed \gui OK
-    and to false if the user pressed \gui Cancel. The dialog's parent is
+    If \a ok is nonnull, *\a ok will be set to true if the user pressed \uicontrol OK
+    and to false if the user pressed \uicontrol Cancel. The dialog's parent is
     \a parent. The dialog will be modal and uses the widget \a flags.
 
     This function returns the floating point number which has been entered by
@@ -1243,7 +1243,7 @@ int QInputDialog::getInt(QWidget *parent, const QString &title, const QString &l
 
     Use this static function like this:
 
-    \snippet examples/dialogs/standarddialogs/dialog.cpp 1
+    \snippet dialogs/standarddialogs/dialog.cpp 1
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
@@ -1289,7 +1289,7 @@ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QStr
     user may only select one of the existing items.
 
     If \a ok is nonnull \e *\a ok will be set to true if the user pressed
-    \gui OK and to false if the user pressed \gui Cancel. The dialog's parent
+    \uicontrol OK and to false if the user pressed \uicontrol Cancel. The dialog's parent
     is \a parent. The dialog will be modal and uses the widget \a flags.
 
     This function returns the text of the current item, or if \a editable is
@@ -1297,7 +1297,7 @@ double QInputDialog::getDouble(QWidget *parent, const QString &title, const QStr
 
     Use this static function like this:
 
-    \snippet examples/dialogs/standarddialogs/dialog.cpp 2
+    \snippet dialogs/standarddialogs/dialog.cpp 2
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
@@ -1379,7 +1379,7 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri
     \fn void QInputDialog::doubleValueSelected(double value)
 
     This signal is emitted whenever the user selects a double value by
-    accepting the dialog; for example, by clicking the \gui{OK} button.
+    accepting the dialog; for example, by clicking the \uicontrol{OK} button.
     The selected value is specified by \a value.
 
     This signal is only relevant when the input dialog is used in
@@ -1400,7 +1400,7 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri
     \fn void QInputDialog::intValueSelected(int value)
 
     This signal is emitted whenever the user selects a integer value by
-    accepting the dialog; for example, by clicking the \gui{OK} button.
+    accepting the dialog; for example, by clicking the \uicontrol{OK} button.
     The selected value is specified by \a value.
 
     This signal is only relevant when the input dialog is used in
@@ -1421,7 +1421,7 @@ QString QInputDialog::getItem(QWidget *parent, const QString &title, const QStri
     \fn void QInputDialog::textValueSelected(const QString &text)
 
     This signal is emitted whenever the user selects a text string by
-    accepting the dialog; for example, by clicking the \gui{OK} button.
+    accepting the dialog; for example, by clicking the \uicontrol{OK} button.
     The selected string is specified by \a text.
 
     This signal is only relevant when the input dialog is used in
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 92915b1bb1..5c1a2a4a64 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -498,9 +498,9 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
     the message. The simplest configuration is to set only the
     \l{QMessageBox::text} {message text} property.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 5
+    \snippet code/src_gui_dialogs_qmessagebox.cpp 5
 
-    The user must click the \gui{OK} button to dismiss the message
+    The user must click the \uicontrol{OK} button to dismiss the message
     box. The rest of the GUI is blocked until the message box is
     dismissed.
 
@@ -514,13 +514,13 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
     responses. The buttons are specified by combining values from
     StandardButtons using the bitwise OR operator. The display order
     for the buttons is platform-dependent. For example, on Windows,
-    \gui{Save} is displayed to the left of \gui{Cancel}, whereas on
+    \uicontrol{Save} is displayed to the left of \uicontrol{Cancel}, whereas on
     Mac OS, the order is reversed.
 
     Mark one of your standard buttons to be your
     \l{QMessageBox::defaultButton()} {default button}.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 6
+    \snippet code/src_gui_dialogs_qmessagebox.cpp 6
 
     This is the approach recommended in the
     \l{http://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html#//apple_ref/doc/uid/20000961-BABCAJID}
@@ -534,16 +534,16 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
     The exec() slot returns the StandardButtons value of the button
     that was clicked.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 7
+    \snippet code/src_gui_dialogs_qmessagebox.cpp 7
 
     To give the user more information to help him answer the question,
     set the \l{QMessageBox::detailedText} {detailed text} property. If
     the \l{QMessageBox::detailedText} {detailed text} property is set,
-    the \gui{Show Details...} button will be shown.
+    the \uicontrol{Show Details...} button will be shown.
 
     \image msgbox3.png
 
-    Clicking the \gui{Show Details...} button displays the detailed text.
+    Clicking the \uicontrol{Show Details...} button displays the detailed text.
 
     \image msgbox4.png
 
@@ -632,7 +632,7 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
     Static functions are available for creating information(),
     question(), warning(), and critical() message boxes.
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 0
+    \snippet code/src_gui_dialogs_qmessagebox.cpp 0
 
     The \l{dialogs/standarddialogs}{Standard Dialogs} example shows
     how to use QMessageBox and the other built-in Qt dialogs.
@@ -647,7 +647,7 @@ void QMessageBoxPrivate::_q_buttonClicked(QAbstractButton *button)
     platform). You can test the value of clickedButton() after calling
     exec(). For example,
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 2
+    \snippet code/src_gui_dialogs_qmessagebox.cpp 2
 
     \section1 Default and Escape Keys
 
@@ -1028,7 +1028,7 @@ void QMessageBoxPrivate::detectEscapeButton()
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qmessagebox.cpp 3
+    \snippet code/src_gui_dialogs_qmessagebox.cpp 3
 
     \sa standardButton(), button()
 */
@@ -1707,7 +1707,7 @@ void QMessageBox::about(QWidget *parent, const QString &title, const QString &te
     and centered over \a parent (if \a parent is not 0). The message
     includes the version number of Qt being used by the application.
 
-    This is useful for inclusion in the \gui Help menu of an application,
+    This is useful for inclusion in the \uicontrol Help menu of an application,
     as shown in the \l{mainwindows/menus}{Menus} example.
 
     QApplication provides this functionality as a slot.
@@ -1964,7 +1964,7 @@ void QMessageBoxPrivate::retranslateStrings()
     to make it the cancel or close button (clicked when \key Esc is
     pressed).
 
-    \snippet doc/src/snippets/dialogs/dialogs.cpp 2
+    \snippet dialogs/dialogs.cpp 2
 
     The message box is an \l{Qt::ApplicationModal} {application modal}
     dialog box.
diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp
index 350fb57e20..97e628e96b 100644
--- a/src/widgets/dialogs/qprogressdialog.cpp
+++ b/src/widgets/dialogs/qprogressdialog.cpp
@@ -244,7 +244,7 @@ void QProgressDialogPrivate::_q_disconnectOnClose()
   to use for the programmer. Do the operation in a loop, call \l setValue() at
   intervals, and check for cancellation with wasCanceled(). For example:
 
-  \snippet doc/src/snippets/dialogs/dialogs.cpp 3
+  \snippet dialogs/dialogs.cpp 3
 
   A modeless progress dialog is suitable for operations that take
   place in the background, where the user is able to interact with the
@@ -257,11 +257,11 @@ void QProgressDialogPrivate::_q_disconnectOnClose()
   canceled() signal to a slot that stops the operation, and call \l
   setValue() at intervals. For example:
 
-  \snippet doc/src/snippets/dialogs/dialogs.cpp 4
+  \snippet dialogs/dialogs.cpp 4
   \codeline
-  \snippet doc/src/snippets/dialogs/dialogs.cpp 5
+  \snippet dialogs/dialogs.cpp 5
   \codeline
-  \snippet doc/src/snippets/dialogs/dialogs.cpp 6
+  \snippet dialogs/dialogs.cpp 6
 
   In both modes the progress dialog may be customized by
   replacing the child widgets with custom widgets by using setLabel(),
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index ac19ec8d22..36327741c8 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -1809,17 +1809,17 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     \l{dialogs/classwizard}{Class Wizard} and \l{dialogs/licensewizard}{License
     Wizard}.
 
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 1
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 3
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 1
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 3
     \dots
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 4
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 4
     \codeline
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 5
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 7
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 5
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 7
     \dots
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 8
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 8
     \codeline
-    \snippet examples/dialogs/trivialwizard/trivialwizard.cpp 10
+    \snippet dialogs/trivialwizard/trivialwizard.cpp 10
 
     \section1 Wizard Look and Feel
 
@@ -1856,19 +1856,19 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     In addition to the wizard style, there are several options that
     control the look and feel of the wizard. These can be set using
     setOption() or setOptions(). For example, HaveHelpButton makes
-    QWizard show a \gui Help button along with the other wizard
+    QWizard show a \uicontrol Help button along with the other wizard
     buttons.
 
     You can even change the order of the wizard buttons to any
     arbitrary order using setButtonLayout(), and you can add up to
-    three custom buttons (e.g., a \gui Print button) to the button
+    three custom buttons (e.g., a \uicontrol Print button) to the button
     row. This is achieved by calling setButton() or setButtonText()
     with CustomButton1, CustomButton2, or CustomButton3 to set up the
     button, and by enabling the HaveCustomButton1, HaveCustomButton2,
     or HaveCustomButton3 options. Whenever the user clicks a custom
     button, customButtonClicked() is emitted. For example:
 
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 29
+    \snippet dialogs/licensewizard/licensewizard.cpp 29
 
     \section1 Elements of a Wizard Page
 
@@ -1936,12 +1936,12 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     To register a field, call QWizardPage::registerField() field.
     For example:
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 8
+    \snippet dialogs/classwizard/classwizard.cpp 8
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 10
-    \snippet examples/dialogs/classwizard/classwizard.cpp 11
+    \snippet dialogs/classwizard/classwizard.cpp 10
+    \snippet dialogs/classwizard/classwizard.cpp 11
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 13
+    \snippet dialogs/classwizard/classwizard.cpp 13
 
     The above code registers three fields, \c className, \c
     baseClass, and \c qobjectMacro, which are associated with three
@@ -1952,7 +1952,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     The fields of any page are accessible from any other page. For
     example:
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 17
+    \snippet dialogs/classwizard/classwizard.cpp 17
 
     Here, we call QWizardPage::field() to access the contents of the
     \c className field (which was defined in the \c ClassInfoPage)
@@ -1971,7 +1971,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
 
     If an asterisk (\c *) is appended to the name when the property
     is registered, the field is a \e{mandatory field}. When a page has
-    mandatory fields, the \gui Next and/or \gui Finish buttons are
+    mandatory fields, the \uicontrol Next and/or \uicontrol Finish buttons are
     enabled only when all mandatory fields are filled.
 
     To consider a field "filled", QWizard simply checks that the
@@ -1987,7 +1987,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     QWizardPage::completeChanged() signal whenever the page becomes
     complete or incomplete.
 
-    The enabled/disabled state of the \gui Next and/or \gui Finish
+    The enabled/disabled state of the \uicontrol Next and/or \uicontrol Finish
     buttons is one way to perform validation on the user input.
     Another way is to reimplement validateCurrentPage() (or
     QWizardPage::validatePage()) to perform some last-minute
@@ -2005,9 +2005,9 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     them using addPage(). By default, the pages are shown in the
     order in which they were added. For example:
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 0
+    \snippet dialogs/classwizard/classwizard.cpp 0
     \dots
-    \snippet examples/dialogs/classwizard/classwizard.cpp 2
+    \snippet dialogs/classwizard/classwizard.cpp 2
 
     When a page is about to be shown, QWizard calls initializePage()
     (which in turn calls QWizardPage::initializePage()) to fill the
@@ -2016,11 +2016,11 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     based on other pages' fields (see the \l{initialize page}{example
     above}).
 
-    If the user presses \gui Back, cleanupPage() is called (which in
+    If the user presses \uicontrol Back, cleanupPage() is called (which in
     turn calls QWizardPage::cleanupPage()). The default
     implementation resets the page's fields to their original values
     (the values they had before initializePage() was called). If you
-    want the \gui Back button to be non-destructive and keep the
+    want the \uicontrol Back button to be non-destructive and keep the
     values entered by the user, simply enable the IndependentPages
     option.
 
@@ -2037,37 +2037,37 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     In complex wizards, pages are identified by IDs. These IDs are
     typically defined using an enum. For example:
 
-    \snippet examples/dialogs/licensewizard/licensewizard.h 0
+    \snippet dialogs/licensewizard/licensewizard.h 0
     \dots
-    \snippet examples/dialogs/licensewizard/licensewizard.h 2
+    \snippet dialogs/licensewizard/licensewizard.h 2
     \dots
-    \snippet examples/dialogs/licensewizard/licensewizard.h 3
+    \snippet dialogs/licensewizard/licensewizard.h 3
 
     The pages are inserted using setPage(), which takes an ID and an
     instance of QWizardPage (or of a subclass):
 
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 1
+    \snippet dialogs/licensewizard/licensewizard.cpp 1
     \dots
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 8
+    \snippet dialogs/licensewizard/licensewizard.cpp 8
 
     By default, the pages are shown in increasing ID order. To
     provide a dynamic order that depends on the options chosen by the
     user, we must reimplement QWizardPage::nextId(). For example:
 
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 18
+    \snippet dialogs/licensewizard/licensewizard.cpp 18
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 23
+    \snippet dialogs/licensewizard/licensewizard.cpp 23
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 24
+    \snippet dialogs/licensewizard/licensewizard.cpp 24
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 25
+    \snippet dialogs/licensewizard/licensewizard.cpp 25
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 26
+    \snippet dialogs/licensewizard/licensewizard.cpp 26
 
     It would also be possible to put all the logic in one place, in a
     QWizard::nextId() reimplementation. For example:
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qwizard.cpp 0
+    \snippet code/src_gui_dialogs_qwizard.cpp 0
 
     To start at another page than the page with the lowest ID, call
     setStartId().
@@ -2075,7 +2075,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     To test whether a page has been visited or not, call
     hasVisitedPage(). For example:
 
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 27
+    \snippet dialogs/licensewizard/licensewizard.cpp 27
 
     \sa QWizardPage, {Class Wizard Example}, {License Wizard Example}
 */
@@ -2085,12 +2085,12 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
 
     This enum specifies the buttons in a wizard.
 
-    \value BackButton  The \gui Back button (\gui {Go Back} on Mac OS X)
-    \value NextButton  The \gui Next button (\gui Continue on Mac OS X)
-    \value CommitButton  The \gui Commit button
-    \value FinishButton  The \gui Finish button (\gui Done on Mac OS X)
-    \value CancelButton  The \gui Cancel button (see also NoCancelButton)
-    \value HelpButton    The \gui Help button (see also HaveHelpButton)
+    \value BackButton  The \uicontrol Back button (\uicontrol {Go Back} on Mac OS X)
+    \value NextButton  The \uicontrol Next button (\uicontrol Continue on Mac OS X)
+    \value CommitButton  The \uicontrol Commit button
+    \value FinishButton  The \uicontrol Finish button (\uicontrol Done on Mac OS X)
+    \value CancelButton  The \uicontrol Cancel button (see also NoCancelButton)
+    \value HelpButton    The \uicontrol Help button (see also HaveHelpButton)
     \value CustomButton1  The first user-defined button (see also HaveCustomButton1)
     \value CustomButton2  The second user-defined button (see also HaveCustomButton2)
     \value CustomButton3  The third user-defined button (see also HaveCustomButton3)
@@ -2148,18 +2148,18 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     \value IgnoreSubTitles  Don't show any subtitles, even if they are set.
     \value ExtendedWatermarkPixmap  Extend any WatermarkPixmap all the
                                     way down to the window's edge.
-    \value NoDefaultButton  Don't make the \gui Next or \gui Finish button the
+    \value NoDefaultButton  Don't make the \uicontrol Next or \uicontrol Finish button the
                             dialog's \l{QPushButton::setDefault()}{default button}.
-    \value NoBackButtonOnStartPage  Don't show the \gui Back button on the start page.
-    \value NoBackButtonOnLastPage   Don't show the \gui Back button on the last page.
-    \value DisabledBackButtonOnLastPage  Disable the \gui Back button on the last page.
-    \value HaveNextButtonOnLastPage  Show the (disabled) \gui Next button on the last page.
-    \value HaveFinishButtonOnEarlyPages  Show the (disabled) \gui Finish button on non-final pages.
-    \value NoCancelButton  Don't show the \gui Cancel button.
-    \value CancelButtonOnLeft  Put the \gui Cancel button on the left of \gui Back (rather than on
-                               the right of \gui Finish or \gui Next).
-    \value HaveHelpButton  Show the \gui Help button.
-    \value HelpButtonOnRight  Put the \gui Help button on the far right of the button layout
+    \value NoBackButtonOnStartPage  Don't show the \uicontrol Back button on the start page.
+    \value NoBackButtonOnLastPage   Don't show the \uicontrol Back button on the last page.
+    \value DisabledBackButtonOnLastPage  Disable the \uicontrol Back button on the last page.
+    \value HaveNextButtonOnLastPage  Show the (disabled) \uicontrol Next button on the last page.
+    \value HaveFinishButtonOnEarlyPages  Show the (disabled) \uicontrol Finish button on non-final pages.
+    \value NoCancelButton  Don't show the \uicontrol Cancel button.
+    \value CancelButtonOnLeft  Put the \uicontrol Cancel button on the left of \uicontrol Back (rather than on
+                               the right of \uicontrol Finish or \uicontrol Next).
+    \value HaveHelpButton  Show the \uicontrol Help button.
+    \value HelpButtonOnRight  Put the \uicontrol Help button on the far right of the button layout
                               (rather than on the far left).
     \value HaveCustomButton1  Show the first user-defined button (CustomButton1).
     \value HaveCustomButton2  Show the second user-defined button (CustomButton2).
@@ -2363,7 +2363,7 @@ QWizardPage *QWizard::page(int theid) const
     Returns true if the page history contains page \a id; otherwise,
     returns false.
 
-    Pressing \gui Back marks the current page as "unvisited" again.
+    Pressing \uicontrol Back marks the current page as "unvisited" again.
 
     \sa visitedPages()
 */
@@ -2377,7 +2377,7 @@ bool QWizard::hasVisitedPage(int theid) const
     Returns the list of IDs of visited pages, in the order in which the pages
     were visited.
 
-    Pressing \gui Back marks the current page as "unvisited" again.
+    Pressing \uicontrol Back marks the current page as "unvisited" again.
 
     \sa hasVisitedPage()
 */
@@ -2635,10 +2635,10 @@ QWizard::WizardOptions QWizard::options() const
     Sets the text on button \a which to be \a text.
 
     By default, the text on buttons depends on the wizardStyle. For
-    example, on Mac OS X, the \gui Next button is called \gui
+    example, on Mac OS X, the \uicontrol Next button is called \uicontrol
     Continue.
 
-    To add extra buttons to the wizard (e.g., a \gui Print button),
+    To add extra buttons to the wizard (e.g., a \uicontrol Print button),
     one way is to call setButtonText() with CustomButton1,
     CustomButton2, or CustomButton3 to set their text, and make the
     buttons visible using the HaveCustomButton1, HaveCustomButton2,
@@ -2667,7 +2667,7 @@ void QWizard::setButtonText(WizardButton which, const QString &text)
     If a text has ben set using setButtonText(), this text is returned.
 
     By default, the text on buttons depends on the wizardStyle. For
-    example, on Mac OS X, the \gui Next button is called \gui
+    example, on Mac OS X, the \uicontrol Next button is called \uicontrol
     Continue.
 
     \sa button(), setButton(), setButtonText(), QWizardPage::buttonText(),
@@ -2704,7 +2704,7 @@ QString QWizard::buttonText(WizardButton which) const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_dialogs_qwizard.cpp 1
+    \snippet code/src_gui_dialogs_qwizard.cpp 1
 
     \sa setButton(), setButtonText(), setOptions()
 */
@@ -2738,7 +2738,7 @@ void QWizard::setButtonLayout(const QList<WizardButton> &layout)
 /*!
     Sets the button corresponding to role \a which to \a button.
 
-    To add extra buttons to the wizard (e.g., a \gui Print button),
+    To add extra buttons to the wizard (e.g., a \uicontrol Print button),
     one way is to call setButton() with CustomButton1 to
     CustomButton3, and make the buttons visible using the
     HaveCustomButton1 to HaveCustomButton3 options.
@@ -3029,27 +3029,27 @@ QSize QWizard::sizeHint() const
 /*!
     \fn void QWizard::helpRequested()
 
-    This signal is emitted when the user clicks the \gui Help button.
+    This signal is emitted when the user clicks the \uicontrol Help button.
 
-    By default, no \gui Help button is shown. Call
+    By default, no \uicontrol Help button is shown. Call
     setOption(HaveHelpButton, true) to have one.
 
     Example:
 
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 0
+    \snippet dialogs/licensewizard/licensewizard.cpp 0
     \dots
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 5
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 7
+    \snippet dialogs/licensewizard/licensewizard.cpp 5
+    \snippet dialogs/licensewizard/licensewizard.cpp 7
     \dots
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 8
+    \snippet dialogs/licensewizard/licensewizard.cpp 8
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 10
+    \snippet dialogs/licensewizard/licensewizard.cpp 10
     \dots
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 12
+    \snippet dialogs/licensewizard/licensewizard.cpp 12
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 14
+    \snippet dialogs/licensewizard/licensewizard.cpp 14
     \codeline
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 15
+    \snippet dialogs/licensewizard/licensewizard.cpp 15
 
     \sa customButtonClicked()
 */
@@ -3070,7 +3070,7 @@ QSize QWizard::sizeHint() const
 /*!
     Goes back to the previous page.
 
-    This is equivalent to pressing the \gui Back button.
+    This is equivalent to pressing the \uicontrol Back button.
 
     \sa next(), accept(), reject(), restart()
 */
@@ -3086,7 +3086,7 @@ void QWizard::back()
 /*!
     Advances to the next page.
 
-    This is equivalent to pressing the \gui Next or \gui Commit button.
+    This is equivalent to pressing the \uicontrol Next or \uicontrol Commit button.
 
     \sa nextId(), back(), accept(), reject(), restart()
 */
@@ -3253,7 +3253,7 @@ void QWizard::done(int result)
 
     This virtual function is called by QWizard to prepare page \a id
     just before it is shown either as a result of QWizard::restart()
-    being called, or as a result of the user clicking \gui Next. (However, if the \l
+    being called, or as a result of the user clicking \uicontrol Next. (However, if the \l
     QWizard::IndependentPages option is set, this function is only
     called the first time the page is shown.)
 
@@ -3277,7 +3277,7 @@ void QWizard::initializePage(int theid)
     \fn void QWizard::cleanupPage(int id)
 
     This virtual function is called by QWizard to clean up page \a id just before the
-    user leaves it by clicking \gui Back (unless the \l QWizard::IndependentPages option is set).
+    user leaves it by clicking \uicontrol Back (unless the \l QWizard::IndependentPages option is set).
 
     The default implementation calls QWizardPage::cleanupPage() on
     page(\a id).
@@ -3293,15 +3293,15 @@ void QWizard::cleanupPage(int theid)
 
 /*!
     This virtual function is called by QWizard when the user clicks
-    \gui Next or \gui Finish to perform some last-minute validation.
+    \uicontrol Next or \uicontrol Finish to perform some last-minute validation.
     If it returns true, the next page is shown (or the wizard
     finishes); otherwise, the current page stays up.
 
     The default implementation calls QWizardPage::validatePage() on
     the currentPage().
 
-    When possible, it is usually better style to disable the \gui
-    Next or \gui Finish button (by specifying \l{mandatory fields} or
+    When possible, it is usually better style to disable the \uicontrol
+    Next or \uicontrol Finish button (by specifying \l{mandatory fields} or
     by reimplementing QWizardPage::isComplete()) than to reimplement
     validateCurrentPage().
 
@@ -3318,7 +3318,7 @@ bool QWizard::validateCurrentPage()
 
 /*!
     This virtual function is called by QWizard to find out which page
-    to show when the user clicks the \gui Next button.
+    to show when the user clicks the \uicontrol Next button.
 
     The return value is the ID of the next page, or -1 if no page follows.
 
@@ -3362,29 +3362,29 @@ int QWizard::nextId() const
 
     \list
     \li initializePage() is called to initialize the page's contents
-       when the user clicks the wizard's \gui Next button. If you
+       when the user clicks the wizard's \uicontrol Next button. If you
        want to derive the page's default from what the user entered
        on previous pages, this is the function to reimplement.
     \li cleanupPage() is called to reset the page's contents when the
-       user clicks the wizard's \gui Back button.
-    \li validatePage() validates the page when the user clicks \gui
-       Next or \gui Finish. It is often used to show an error message
+       user clicks the wizard's \uicontrol Back button.
+    \li validatePage() validates the page when the user clicks \uicontrol
+       Next or \uicontrol Finish. It is often used to show an error message
        if the user has entered incomplete or invalid information.
     \li nextId() returns the ID of the next page. It is useful when
        \l{creating non-linear wizards}, which allow different
        traversal paths based on the information provided by the user.
-    \li isComplete() is called to determine whether the \gui Next
-       and/or \gui Finish button should be enabled or disabled. If
+    \li isComplete() is called to determine whether the \uicontrol Next
+       and/or \uicontrol Finish button should be enabled or disabled. If
        you reimplement isComplete(), also make sure that
        completeChanged() is emitted whenever the complete state
        changes.
     \endlist
 
-    Normally, the \gui Next button and the \gui Finish button of a
-    wizard are mutually exclusive. If isFinalPage() returns true, \gui
-    Finish is available; otherwise, \gui Next is available. By
+    Normally, the \uicontrol Next button and the \uicontrol Finish button of a
+    wizard are mutually exclusive. If isFinalPage() returns true, \uicontrol
+    Finish is available; otherwise, \uicontrol Next is available. By
     default, isFinalPage() is true only when nextId() returns -1. If
-    you want to show \gui Next and \gui Final simultaneously for a
+    you want to show \uicontrol Next and \uicontrol Final simultaneously for a
     page (letting the user perform an "early finish"), call
     setFinalPage(true) on that page. For wizards that support early
     finishes, you might also want to set the
@@ -3532,7 +3532,7 @@ QPixmap QWizardPage::pixmap(QWizard::WizardPixmap which) const
 /*!
     This virtual function is called by QWizard::initializePage() to
     prepare the page just before it is shown either as a result of QWizard::restart()
-    being called, or as a result of the user clicking \gui Next.
+    being called, or as a result of the user clicking \uicontrol Next.
     (However, if the \l QWizard::IndependentPages option is set, this function is only
     called the first time the page is shown.)
 
@@ -3540,7 +3540,7 @@ QPixmap QWizardPage::pixmap(QWizard::WizardPixmap which) const
     fields are properly initialized based on fields from previous
     pages. For example:
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 17
+    \snippet dialogs/classwizard/classwizard.cpp 17
 
     The default implementation does nothing.
 
@@ -3552,7 +3552,7 @@ void QWizardPage::initializePage()
 
 /*!
     This virtual function is called by QWizard::cleanupPage() when
-    the user leaves the page by clicking \gui Back (unless the \l QWizard::IndependentPages
+    the user leaves the page by clicking \uicontrol Back (unless the \l QWizard::IndependentPages
     option is set).
 
     The default implementation resets the page's fields to their
@@ -3576,14 +3576,14 @@ void QWizardPage::cleanupPage()
 
 /*!
     This virtual function is called by QWizard::validateCurrentPage()
-    when the user clicks \gui Next or \gui Finish to perform some
+    when the user clicks \uicontrol Next or \uicontrol Finish to perform some
     last-minute validation. If it returns true, the next page is shown
     (or the wizard finishes); otherwise, the current page stays up.
 
     The default implementation returns true.
 
-    When possible, it is usually better style to disable the \gui
-    Next or \gui Finish button (by specifying \l{mandatory fields} or
+    When possible, it is usually better style to disable the \uicontrol
+    Next or \uicontrol Finish button (by specifying \l{mandatory fields} or
     reimplementing isComplete()) than to reimplement validatePage().
 
     \sa QWizard::validateCurrentPage(), isComplete()
@@ -3595,7 +3595,7 @@ bool QWizardPage::validatePage()
 
 /*!
     This virtual function is called by QWizard to determine whether
-    the \gui Next or \gui Finish button should be enabled or
+    the \uicontrol Next or \uicontrol Finish button should be enabled or
     disabled.
 
     The default implementation returns true if all \l{mandatory
@@ -3645,7 +3645,7 @@ bool QWizardPage::isComplete() const
 /*!
     Explicitly sets this page to be final if \a finalPage is true.
 
-    After calling setFinalPage(true), isFinalPage() returns true and the \gui
+    After calling setFinalPage(true), isFinalPage() returns true and the \uicontrol
     Finish button is visible (and enabled if isComplete() returns
     true).
 
@@ -3664,7 +3664,7 @@ void QWizardPage::setFinalPage(bool finalPage)
 }
 
 /*!
-    This function is called by QWizard to determine whether the \gui
+    This function is called by QWizard to determine whether the \uicontrol
     Finish button should be shown for this page or not.
 
     By default, it returns true if there is no next page
@@ -3695,12 +3695,12 @@ bool QWizardPage::isFinalPage() const
     sets it to be a normal page.
 
     A commit page is a page that represents an action which cannot be undone
-    by clicking \gui Back or \gui Cancel.
+    by clicking \uicontrol Back or \uicontrol Cancel.
 
-    A \gui Commit button replaces the \gui Next button on a commit page. Clicking this
-    button simply calls QWizard::next() just like clicking \gui Next does.
+    A \uicontrol Commit button replaces the \uicontrol Next button on a commit page. Clicking this
+    button simply calls QWizard::next() just like clicking \uicontrol Next does.
 
-    A page entered directly from a commit page has its \gui Back button disabled.
+    A page entered directly from a commit page has its \uicontrol Back button disabled.
 
     \sa isCommitPage()
 */
@@ -3748,7 +3748,7 @@ void QWizardPage::setButtonText(QWizard::WizardButton which, const QString &text
     this text is returned.
 
     By default, the text on buttons depends on the QWizard::wizardStyle.
-    For example, on Mac OS X, the \gui Next button is called \gui
+    For example, on Mac OS X, the \uicontrol Next button is called \uicontrol
     Continue.
 
     \sa setButtonText(), QWizard::buttonText(), QWizard::setButtonText()
@@ -3768,7 +3768,7 @@ QString QWizardPage::buttonText(QWizard::WizardButton which) const
 
 /*!
     This virtual function is called by QWizard::nextId() to find
-    out which page to show when the user clicks the \gui Next button.
+    out which page to show when the user clicks the \uicontrol Next button.
 
     The return value is the ID of the next page, or -1 if no page follows.
 
@@ -3778,7 +3778,7 @@ QString QWizardPage::buttonText(QWizard::WizardButton which) const
     By reimplementing this function, you can specify a dynamic page
     order. For example:
 
-    \snippet examples/dialogs/licensewizard/licensewizard.cpp 18
+    \snippet dialogs/licensewizard/licensewizard.cpp 18
 
     \sa QWizard::nextId()
 */
@@ -3845,7 +3845,7 @@ void QWizardPage::setField(const QString &name, const QVariant &value)
 
     Example:
 
-    \snippet examples/dialogs/classwizard/classwizard.cpp 17
+    \snippet dialogs/classwizard/classwizard.cpp 17
 
     \sa QWizard::field(), setField(), registerField()
 */
@@ -3868,8 +3868,8 @@ QVariant QWizardPage::field(const QString &name) const
     explicitly about each other.
 
     If \a name ends with an asterisk (\c *), the field is a mandatory
-    field. When a page has mandatory fields, the \gui Next and/or
-    \gui Finish buttons are enabled only when all mandatory fields
+    field. When a page has mandatory fields, the \uicontrol Next and/or
+    \uicontrol Finish buttons are enabled only when all mandatory fields
     are filled. This requires a \a changedSignal to be specified, to
     tell QWizard to recheck the value stored by the mandatory field.
 
diff --git a/src/widgets/doc/images/assistant-toolbar.png b/src/widgets/doc/images/assistant-toolbar.png
new file mode 100644
index 0000000000..1b41825c64
--- /dev/null
+++ b/src/widgets/doc/images/assistant-toolbar.png
diff --git a/src/widgets/doc/images/buttonbox-gnomelayout-horizontal.png b/src/widgets/doc/images/buttonbox-gnomelayout-horizontal.png
new file mode 100644
index 0000000000..b2f74bb6c6
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-gnomelayout-horizontal.png
diff --git a/src/widgets/doc/images/buttonbox-gnomelayout-vertical.png b/src/widgets/doc/images/buttonbox-gnomelayout-vertical.png
new file mode 100644
index 0000000000..e7843dc22d
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-gnomelayout-vertical.png
diff --git a/src/widgets/doc/images/buttonbox-kdelayout-horizontal.png b/src/widgets/doc/images/buttonbox-kdelayout-horizontal.png
new file mode 100644
index 0000000000..5da11f4d7a
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-kdelayout-horizontal.png
diff --git a/src/widgets/doc/images/buttonbox-kdelayout-vertical.png b/src/widgets/doc/images/buttonbox-kdelayout-vertical.png
new file mode 100644
index 0000000000..6f5dfc6b65
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-kdelayout-vertical.png
diff --git a/src/widgets/doc/images/buttonbox-mac-modeless-horizontal.png b/src/widgets/doc/images/buttonbox-mac-modeless-horizontal.png
new file mode 100644
index 0000000000..2e853d34fb
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-mac-modeless-horizontal.png
diff --git a/src/widgets/doc/images/buttonbox-mac-modeless-vertical.png b/src/widgets/doc/images/buttonbox-mac-modeless-vertical.png
new file mode 100644
index 0000000000..f59bd8ddaf
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-mac-modeless-vertical.png
diff --git a/src/widgets/doc/images/buttonbox-maclayout-horizontal.png b/src/widgets/doc/images/buttonbox-maclayout-horizontal.png
new file mode 100644
index 0000000000..89ae84dea0
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-maclayout-horizontal.png
diff --git a/src/widgets/doc/images/buttonbox-maclayout-vertical.png b/src/widgets/doc/images/buttonbox-maclayout-vertical.png
new file mode 100644
index 0000000000..728760029f
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-maclayout-vertical.png
diff --git a/src/widgets/doc/images/buttonbox-winlayout-horizontal.png b/src/widgets/doc/images/buttonbox-winlayout-horizontal.png
new file mode 100644
index 0000000000..dd4ce1c313
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-winlayout-horizontal.png
diff --git a/src/widgets/doc/images/buttonbox-winlayout-vertical.png b/src/widgets/doc/images/buttonbox-winlayout-vertical.png
new file mode 100644
index 0000000000..539de1aa1a
--- /dev/null
+++ b/src/widgets/doc/images/buttonbox-winlayout-vertical.png
diff --git a/doc/src/images/cde-calendarwidget.png b/src/widgets/doc/images/cde-calendarwidget.png
index 9615eaeab8..9615eaeab8 100644
--- a/doc/src/images/cde-calendarwidget.png
+++ b/src/widgets/doc/images/cde-calendarwidget.png
diff --git a/doc/src/images/cde-checkbox.png b/src/widgets/doc/images/cde-checkbox.png
index b2528dc5de..b2528dc5de 100644
--- a/doc/src/images/cde-checkbox.png
+++ b/src/widgets/doc/images/cde-checkbox.png
diff --git a/doc/src/images/cde-combobox.png b/src/widgets/doc/images/cde-combobox.png
index 74586433eb..74586433eb 100644
--- a/doc/src/images/cde-combobox.png
+++ b/src/widgets/doc/images/cde-combobox.png
diff --git a/doc/src/images/cde-dateedit.png b/src/widgets/doc/images/cde-dateedit.png
index ebb24d59cf..ebb24d59cf 100644
--- a/doc/src/images/cde-dateedit.png
+++ b/src/widgets/doc/images/cde-dateedit.png
diff --git a/doc/src/images/cde-datetimeedit.png b/src/widgets/doc/images/cde-datetimeedit.png
index 9ac659a3f3..9ac659a3f3 100644
--- a/doc/src/images/cde-datetimeedit.png
+++ b/src/widgets/doc/images/cde-datetimeedit.png
diff --git a/doc/src/images/cde-dial.png b/src/widgets/doc/images/cde-dial.png
index 956d19cb6c..956d19cb6c 100644
--- a/doc/src/images/cde-dial.png
+++ b/src/widgets/doc/images/cde-dial.png
diff --git a/doc/src/images/cde-doublespinbox.png b/src/widgets/doc/images/cde-doublespinbox.png
index 30a9af66fa..30a9af66fa 100644
--- a/doc/src/images/cde-doublespinbox.png
+++ b/src/widgets/doc/images/cde-doublespinbox.png
diff --git a/doc/src/images/cde-fontcombobox.png b/src/widgets/doc/images/cde-fontcombobox.png
index 043ca1d20f..043ca1d20f 100644
--- a/doc/src/images/cde-fontcombobox.png
+++ b/src/widgets/doc/images/cde-fontcombobox.png
diff --git a/doc/src/images/cde-frame.png b/src/widgets/doc/images/cde-frame.png
index 221576e849..221576e849 100644
--- a/doc/src/images/cde-frame.png
+++ b/src/widgets/doc/images/cde-frame.png
diff --git a/doc/src/images/cde-groupbox.png b/src/widgets/doc/images/cde-groupbox.png
index 8bad69be4e..8bad69be4e 100644
--- a/doc/src/images/cde-groupbox.png
+++ b/src/widgets/doc/images/cde-groupbox.png
diff --git a/doc/src/images/cde-horizontalscrollbar.png b/src/widgets/doc/images/cde-horizontalscrollbar.png
index 6e7cde8da1..6e7cde8da1 100644
--- a/doc/src/images/cde-horizontalscrollbar.png
+++ b/src/widgets/doc/images/cde-horizontalscrollbar.png
diff --git a/doc/src/images/cde-label.png b/src/widgets/doc/images/cde-label.png
index 4e906eaa00..4e906eaa00 100644
--- a/doc/src/images/cde-label.png
+++ b/src/widgets/doc/images/cde-label.png
diff --git a/doc/src/images/cde-lcdnumber.png b/src/widgets/doc/images/cde-lcdnumber.png
index 97324c1a6c..97324c1a6c 100644
--- a/doc/src/images/cde-lcdnumber.png
+++ b/src/widgets/doc/images/cde-lcdnumber.png
diff --git a/doc/src/images/cde-lineedit.png b/src/widgets/doc/images/cde-lineedit.png
index 6c1527ba19..6c1527ba19 100644
--- a/doc/src/images/cde-lineedit.png
+++ b/src/widgets/doc/images/cde-lineedit.png
diff --git a/doc/src/images/cde-listview.png b/src/widgets/doc/images/cde-listview.png
index 2e58140880..2e58140880 100644
--- a/doc/src/images/cde-listview.png
+++ b/src/widgets/doc/images/cde-listview.png
diff --git a/doc/src/images/cde-progressbar.png b/src/widgets/doc/images/cde-progressbar.png
index 41715deb48..41715deb48 100644
--- a/doc/src/images/cde-progressbar.png
+++ b/src/widgets/doc/images/cde-progressbar.png
diff --git a/doc/src/images/cde-pushbutton.png b/src/widgets/doc/images/cde-pushbutton.png
index 2d9bdd25a4..2d9bdd25a4 100644
--- a/doc/src/images/cde-pushbutton.png
+++ b/src/widgets/doc/images/cde-pushbutton.png
diff --git a/doc/src/images/cde-radiobutton.png b/src/widgets/doc/images/cde-radiobutton.png
index e053665f5a..e053665f5a 100644
--- a/doc/src/images/cde-radiobutton.png
+++ b/src/widgets/doc/images/cde-radiobutton.png
diff --git a/doc/src/images/cde-slider.png b/src/widgets/doc/images/cde-slider.png
index bd84371898..bd84371898 100644
--- a/doc/src/images/cde-slider.png
+++ b/src/widgets/doc/images/cde-slider.png
diff --git a/doc/src/images/cde-spinbox.png b/src/widgets/doc/images/cde-spinbox.png
index 5f53c8e902..5f53c8e902 100644
--- a/doc/src/images/cde-spinbox.png
+++ b/src/widgets/doc/images/cde-spinbox.png
diff --git a/doc/src/images/cde-tableview.png b/src/widgets/doc/images/cde-tableview.png
index 7a99217560..7a99217560 100644
--- a/doc/src/images/cde-tableview.png
+++ b/src/widgets/doc/images/cde-tableview.png
diff --git a/doc/src/images/cde-tabwidget.png b/src/widgets/doc/images/cde-tabwidget.png
index 8cf5473fc2..8cf5473fc2 100644
--- a/doc/src/images/cde-tabwidget.png
+++ b/src/widgets/doc/images/cde-tabwidget.png
diff --git a/doc/src/images/cde-textedit.png b/src/widgets/doc/images/cde-textedit.png
index c65b8da8f4..c65b8da8f4 100644
--- a/doc/src/images/cde-textedit.png
+++ b/src/widgets/doc/images/cde-textedit.png
diff --git a/doc/src/images/cde-timeedit.png b/src/widgets/doc/images/cde-timeedit.png
index 6a5a4b953f..6a5a4b953f 100644
--- a/doc/src/images/cde-timeedit.png
+++ b/src/widgets/doc/images/cde-timeedit.png
diff --git a/doc/src/images/cde-toolbox.png b/src/widgets/doc/images/cde-toolbox.png
index c0dd4e9400..c0dd4e9400 100644
--- a/doc/src/images/cde-toolbox.png
+++ b/src/widgets/doc/images/cde-toolbox.png
diff --git a/doc/src/images/cde-toolbutton.png b/src/widgets/doc/images/cde-toolbutton.png
index baff25c25b..baff25c25b 100644
--- a/doc/src/images/cde-toolbutton.png
+++ b/src/widgets/doc/images/cde-toolbutton.png
diff --git a/doc/src/images/cde-treeview.png b/src/widgets/doc/images/cde-treeview.png
index df3184b31b..df3184b31b 100644
--- a/doc/src/images/cde-treeview.png
+++ b/src/widgets/doc/images/cde-treeview.png
diff --git a/src/widgets/doc/images/checkboxes-exclusive.png b/src/widgets/doc/images/checkboxes-exclusive.png
new file mode 100644
index 0000000000..0ada3a046a
--- /dev/null
+++ b/src/widgets/doc/images/checkboxes-exclusive.png
diff --git a/src/widgets/doc/images/checkboxes-non-exclusive.png b/src/widgets/doc/images/checkboxes-non-exclusive.png
new file mode 100644
index 0000000000..4211aaedfb
--- /dev/null
+++ b/src/widgets/doc/images/checkboxes-non-exclusive.png
diff --git a/doc/src/images/cleanlooks-calendarwidget.png b/src/widgets/doc/images/cleanlooks-calendarwidget.png
index 99c57b61ee..99c57b61ee 100644
--- a/doc/src/images/cleanlooks-calendarwidget.png
+++ b/src/widgets/doc/images/cleanlooks-calendarwidget.png
diff --git a/doc/src/images/cleanlooks-checkbox.png b/src/widgets/doc/images/cleanlooks-checkbox.png
index aaf2daae4e..aaf2daae4e 100644
--- a/doc/src/images/cleanlooks-checkbox.png
+++ b/src/widgets/doc/images/cleanlooks-checkbox.png
diff --git a/doc/src/images/cleanlooks-combobox.png b/src/widgets/doc/images/cleanlooks-combobox.png
index 5fff4c87f6..5fff4c87f6 100644
--- a/doc/src/images/cleanlooks-combobox.png
+++ b/src/widgets/doc/images/cleanlooks-combobox.png
diff --git a/doc/src/images/cleanlooks-dateedit.png b/src/widgets/doc/images/cleanlooks-dateedit.png
index 384136a162..384136a162 100644
--- a/doc/src/images/cleanlooks-dateedit.png
+++ b/src/widgets/doc/images/cleanlooks-dateedit.png
diff --git a/doc/src/images/cleanlooks-datetimeedit.png b/src/widgets/doc/images/cleanlooks-datetimeedit.png
index 7a62cebfb4..7a62cebfb4 100644
--- a/doc/src/images/cleanlooks-datetimeedit.png
+++ b/src/widgets/doc/images/cleanlooks-datetimeedit.png
diff --git a/doc/src/images/cleanlooks-dial.png b/src/widgets/doc/images/cleanlooks-dial.png
index 259a0888b6..259a0888b6 100644
--- a/doc/src/images/cleanlooks-dial.png
+++ b/src/widgets/doc/images/cleanlooks-dial.png
diff --git a/doc/src/images/cleanlooks-doublespinbox.png b/src/widgets/doc/images/cleanlooks-doublespinbox.png
index 93b11f919a..93b11f919a 100644
--- a/doc/src/images/cleanlooks-doublespinbox.png
+++ b/src/widgets/doc/images/cleanlooks-doublespinbox.png
diff --git a/doc/src/images/cleanlooks-fontcombobox.png b/src/widgets/doc/images/cleanlooks-fontcombobox.png
index 47a5907f56..47a5907f56 100644
--- a/doc/src/images/cleanlooks-fontcombobox.png
+++ b/src/widgets/doc/images/cleanlooks-fontcombobox.png
diff --git a/doc/src/images/cleanlooks-frame.png b/src/widgets/doc/images/cleanlooks-frame.png
index 2427b08d8f..2427b08d8f 100644
--- a/doc/src/images/cleanlooks-frame.png
+++ b/src/widgets/doc/images/cleanlooks-frame.png
diff --git a/doc/src/images/cleanlooks-groupbox.png b/src/widgets/doc/images/cleanlooks-groupbox.png
index 89c6eb2f39..89c6eb2f39 100644
--- a/doc/src/images/cleanlooks-groupbox.png
+++ b/src/widgets/doc/images/cleanlooks-groupbox.png
diff --git a/doc/src/images/cleanlooks-horizontalscrollbar.png b/src/widgets/doc/images/cleanlooks-horizontalscrollbar.png
index ca1c806c91..ca1c806c91 100644
--- a/doc/src/images/cleanlooks-horizontalscrollbar.png
+++ b/src/widgets/doc/images/cleanlooks-horizontalscrollbar.png
diff --git a/doc/src/images/cleanlooks-label.png b/src/widgets/doc/images/cleanlooks-label.png
index 199758fd69..199758fd69 100644
--- a/doc/src/images/cleanlooks-label.png
+++ b/src/widgets/doc/images/cleanlooks-label.png
diff --git a/doc/src/images/cleanlooks-lcdnumber.png b/src/widgets/doc/images/cleanlooks-lcdnumber.png
index c6e34127cf..c6e34127cf 100644
--- a/doc/src/images/cleanlooks-lcdnumber.png
+++ b/src/widgets/doc/images/cleanlooks-lcdnumber.png
diff --git a/doc/src/images/cleanlooks-lineedit.png b/src/widgets/doc/images/cleanlooks-lineedit.png
index 3e9f1a4be3..3e9f1a4be3 100644
--- a/doc/src/images/cleanlooks-lineedit.png
+++ b/src/widgets/doc/images/cleanlooks-lineedit.png
diff --git a/doc/src/images/cleanlooks-listview.png b/src/widgets/doc/images/cleanlooks-listview.png
index 95f836c66b..95f836c66b 100644
--- a/doc/src/images/cleanlooks-listview.png
+++ b/src/widgets/doc/images/cleanlooks-listview.png
diff --git a/doc/src/images/cleanlooks-progressbar.png b/src/widgets/doc/images/cleanlooks-progressbar.png
index 53fc6c1faa..53fc6c1faa 100644
--- a/doc/src/images/cleanlooks-progressbar.png
+++ b/src/widgets/doc/images/cleanlooks-progressbar.png
diff --git a/src/widgets/doc/images/cleanlooks-pushbutton-menu.png b/src/widgets/doc/images/cleanlooks-pushbutton-menu.png
new file mode 100644
index 0000000000..0d5cb59ec0
--- /dev/null
+++ b/src/widgets/doc/images/cleanlooks-pushbutton-menu.png
diff --git a/doc/src/images/cleanlooks-pushbutton.png b/src/widgets/doc/images/cleanlooks-pushbutton.png
index 7b3b3357c1..7b3b3357c1 100644
--- a/doc/src/images/cleanlooks-pushbutton.png
+++ b/src/widgets/doc/images/cleanlooks-pushbutton.png
diff --git a/doc/src/images/cleanlooks-radiobutton.png b/src/widgets/doc/images/cleanlooks-radiobutton.png
index 4e077688c2..4e077688c2 100644
--- a/doc/src/images/cleanlooks-radiobutton.png
+++ b/src/widgets/doc/images/cleanlooks-radiobutton.png
diff --git a/doc/src/images/cleanlooks-slider.png b/src/widgets/doc/images/cleanlooks-slider.png
index 8dfaa01092..8dfaa01092 100644
--- a/doc/src/images/cleanlooks-slider.png
+++ b/src/widgets/doc/images/cleanlooks-slider.png
diff --git a/doc/src/images/cleanlooks-spinbox.png b/src/widgets/doc/images/cleanlooks-spinbox.png
index ad5b5a01b6..ad5b5a01b6 100644
--- a/doc/src/images/cleanlooks-spinbox.png
+++ b/src/widgets/doc/images/cleanlooks-spinbox.png
diff --git a/doc/src/images/cleanlooks-tableview.png b/src/widgets/doc/images/cleanlooks-tableview.png
index d89fecc5ad..d89fecc5ad 100644
--- a/doc/src/images/cleanlooks-tableview.png
+++ b/src/widgets/doc/images/cleanlooks-tableview.png
diff --git a/doc/src/images/cleanlooks-tabwidget.png b/src/widgets/doc/images/cleanlooks-tabwidget.png
index bcff2967aa..bcff2967aa 100644
--- a/doc/src/images/cleanlooks-tabwidget.png
+++ b/src/widgets/doc/images/cleanlooks-tabwidget.png
diff --git a/doc/src/images/cleanlooks-textedit.png b/src/widgets/doc/images/cleanlooks-textedit.png
index 0c825a1e04..0c825a1e04 100644
--- a/doc/src/images/cleanlooks-textedit.png
+++ b/src/widgets/doc/images/cleanlooks-textedit.png
diff --git a/doc/src/images/cleanlooks-timeedit.png b/src/widgets/doc/images/cleanlooks-timeedit.png
index 00420a2f18..00420a2f18 100644
--- a/doc/src/images/cleanlooks-timeedit.png
+++ b/src/widgets/doc/images/cleanlooks-timeedit.png
diff --git a/doc/src/images/cleanlooks-toolbox.png b/src/widgets/doc/images/cleanlooks-toolbox.png
index 63366e5422..63366e5422 100644
--- a/doc/src/images/cleanlooks-toolbox.png
+++ b/src/widgets/doc/images/cleanlooks-toolbox.png
diff --git a/doc/src/images/cleanlooks-toolbutton.png b/src/widgets/doc/images/cleanlooks-toolbutton.png
index bcf86ea26f..bcf86ea26f 100644
--- a/doc/src/images/cleanlooks-toolbutton.png
+++ b/src/widgets/doc/images/cleanlooks-toolbutton.png
diff --git a/doc/src/images/cleanlooks-treeview.png b/src/widgets/doc/images/cleanlooks-treeview.png
index 5bc4a06a3c..5bc4a06a3c 100644
--- a/doc/src/images/cleanlooks-treeview.png
+++ b/src/widgets/doc/images/cleanlooks-treeview.png
diff --git a/doc/src/images/designer-stylesheet-options.png b/src/widgets/doc/images/designer-stylesheet-options.png
index a6893e770b..a6893e770b 100644
--- a/doc/src/images/designer-stylesheet-options.png
+++ b/src/widgets/doc/images/designer-stylesheet-options.png
diff --git a/doc/src/images/designer-stylesheet-usage.png b/src/widgets/doc/images/designer-stylesheet-usage.png
index f6875900de..f6875900de 100644
--- a/doc/src/images/designer-stylesheet-usage.png
+++ b/src/widgets/doc/images/designer-stylesheet-usage.png
diff --git a/doc/src/images/designer-validator-highlighter.png b/src/widgets/doc/images/designer-validator-highlighter.png
index a6661d5c95..a6661d5c95 100644
--- a/doc/src/images/designer-validator-highlighter.png
+++ b/src/widgets/doc/images/designer-validator-highlighter.png
diff --git a/doc/src/images/filedialogurls.png b/src/widgets/doc/images/filedialogurls.png
index 7d22ef33ae..7d22ef33ae 100644
--- a/doc/src/images/filedialogurls.png
+++ b/src/widgets/doc/images/filedialogurls.png
diff --git a/doc/src/images/frames.png b/src/widgets/doc/images/frames.png
index 13c08508a2..13c08508a2 100644
--- a/doc/src/images/frames.png
+++ b/src/widgets/doc/images/frames.png
diff --git a/src/widgets/doc/images/graphicsview-ellipseitem-pie.png b/src/widgets/doc/images/graphicsview-ellipseitem-pie.png
new file mode 100644
index 0000000000..136175abc2
--- /dev/null
+++ b/src/widgets/doc/images/graphicsview-ellipseitem-pie.png
diff --git a/src/widgets/doc/images/graphicsview-ellipseitem.png b/src/widgets/doc/images/graphicsview-ellipseitem.png
new file mode 100644
index 0000000000..7c7a8e58d0
--- /dev/null
+++ b/src/widgets/doc/images/graphicsview-ellipseitem.png
diff --git a/doc/src/images/graphicsview-items.png b/src/widgets/doc/images/graphicsview-items.png
index 73be2ddaee..73be2ddaee 100644
--- a/doc/src/images/graphicsview-items.png
+++ b/src/widgets/doc/images/graphicsview-items.png
diff --git a/doc/src/images/graphicsview-pathitem.png b/src/widgets/doc/images/graphicsview-pathitem.png
index c1ddd5620a..c1ddd5620a 100644
--- a/doc/src/images/graphicsview-pathitem.png
+++ b/src/widgets/doc/images/graphicsview-pathitem.png
diff --git a/doc/src/images/graphicsview-pixmapitem.png b/src/widgets/doc/images/graphicsview-pixmapitem.png
index d14fac55e0..d14fac55e0 100644
--- a/doc/src/images/graphicsview-pixmapitem.png
+++ b/src/widgets/doc/images/graphicsview-pixmapitem.png
diff --git a/doc/src/images/graphicsview-polygonitem.png b/src/widgets/doc/images/graphicsview-polygonitem.png
index 3cd2232574..3cd2232574 100644
--- a/doc/src/images/graphicsview-polygonitem.png
+++ b/src/widgets/doc/images/graphicsview-polygonitem.png
diff --git a/doc/src/images/graphicsview-rectitem.png b/src/widgets/doc/images/graphicsview-rectitem.png
index a5917e55dd..a5917e55dd 100644
--- a/doc/src/images/graphicsview-rectitem.png
+++ b/src/widgets/doc/images/graphicsview-rectitem.png
diff --git a/doc/src/images/graphicsview-zorder.png b/src/widgets/doc/images/graphicsview-zorder.png
index a1cc3d0168..a1cc3d0168 100644
--- a/doc/src/images/graphicsview-zorder.png
+++ b/src/widgets/doc/images/graphicsview-zorder.png
diff --git a/doc/src/images/gridlayout.png b/src/widgets/doc/images/gridlayout.png
index ae76c0487b..ae76c0487b 100644
--- a/doc/src/images/gridlayout.png
+++ b/src/widgets/doc/images/gridlayout.png
diff --git a/doc/src/images/gtk-calendarwidget.png b/src/widgets/doc/images/gtk-calendarwidget.png
index 568cd1a5da..568cd1a5da 100644
--- a/doc/src/images/gtk-calendarwidget.png
+++ b/src/widgets/doc/images/gtk-calendarwidget.png
diff --git a/doc/src/images/gtk-checkbox.png b/src/widgets/doc/images/gtk-checkbox.png
index 1fd5fc77bf..1fd5fc77bf 100644
--- a/doc/src/images/gtk-checkbox.png
+++ b/src/widgets/doc/images/gtk-checkbox.png
diff --git a/doc/src/images/gtk-combobox.png b/src/widgets/doc/images/gtk-combobox.png
index 3b4544df13..3b4544df13 100644
--- a/doc/src/images/gtk-combobox.png
+++ b/src/widgets/doc/images/gtk-combobox.png
diff --git a/doc/src/images/gtk-dateedit.png b/src/widgets/doc/images/gtk-dateedit.png
index 25229f0b3b..25229f0b3b 100644
--- a/doc/src/images/gtk-dateedit.png
+++ b/src/widgets/doc/images/gtk-dateedit.png
diff --git a/doc/src/images/gtk-datetimeedit.png b/src/widgets/doc/images/gtk-datetimeedit.png
index 0c934a4d0d..0c934a4d0d 100644
--- a/doc/src/images/gtk-datetimeedit.png
+++ b/src/widgets/doc/images/gtk-datetimeedit.png
diff --git a/doc/src/images/gtk-dial.png b/src/widgets/doc/images/gtk-dial.png
index 18e14b3650..18e14b3650 100644
--- a/doc/src/images/gtk-dial.png
+++ b/src/widgets/doc/images/gtk-dial.png
diff --git a/doc/src/images/gtk-doublespinbox.png b/src/widgets/doc/images/gtk-doublespinbox.png
index 3a69043c0b..3a69043c0b 100644
--- a/doc/src/images/gtk-doublespinbox.png
+++ b/src/widgets/doc/images/gtk-doublespinbox.png
diff --git a/doc/src/images/gtk-fontcombobox.png b/src/widgets/doc/images/gtk-fontcombobox.png
index 4cb1bc1343..4cb1bc1343 100644
--- a/doc/src/images/gtk-fontcombobox.png
+++ b/src/widgets/doc/images/gtk-fontcombobox.png
diff --git a/doc/src/images/gtk-frame.png b/src/widgets/doc/images/gtk-frame.png
index c1bf52f6a6..c1bf52f6a6 100644
--- a/doc/src/images/gtk-frame.png
+++ b/src/widgets/doc/images/gtk-frame.png
diff --git a/doc/src/images/gtk-groupbox.png b/src/widgets/doc/images/gtk-groupbox.png
index 6d217c89f9..6d217c89f9 100644
--- a/doc/src/images/gtk-groupbox.png
+++ b/src/widgets/doc/images/gtk-groupbox.png
diff --git a/doc/src/images/gtk-horizontalscrollbar.png b/src/widgets/doc/images/gtk-horizontalscrollbar.png
index 2887730c13..2887730c13 100644
--- a/doc/src/images/gtk-horizontalscrollbar.png
+++ b/src/widgets/doc/images/gtk-horizontalscrollbar.png
diff --git a/doc/src/images/gtk-label.png b/src/widgets/doc/images/gtk-label.png
index 006d0133d8..006d0133d8 100644
--- a/doc/src/images/gtk-label.png
+++ b/src/widgets/doc/images/gtk-label.png
diff --git a/doc/src/images/gtk-lcdnumber.png b/src/widgets/doc/images/gtk-lcdnumber.png
index 142d298ffc..142d298ffc 100644
--- a/doc/src/images/gtk-lcdnumber.png
+++ b/src/widgets/doc/images/gtk-lcdnumber.png
diff --git a/doc/src/images/gtk-lineedit.png b/src/widgets/doc/images/gtk-lineedit.png
index 8fb513c39f..8fb513c39f 100644
--- a/doc/src/images/gtk-lineedit.png
+++ b/src/widgets/doc/images/gtk-lineedit.png
diff --git a/doc/src/images/gtk-listview.png b/src/widgets/doc/images/gtk-listview.png
index d32f8e8aee..d32f8e8aee 100644
--- a/doc/src/images/gtk-listview.png
+++ b/src/widgets/doc/images/gtk-listview.png
diff --git a/doc/src/images/gtk-progressbar.png b/src/widgets/doc/images/gtk-progressbar.png
index 6162484bf3..6162484bf3 100644
--- a/doc/src/images/gtk-progressbar.png
+++ b/src/widgets/doc/images/gtk-progressbar.png
diff --git a/doc/src/images/gtk-pushbutton.png b/src/widgets/doc/images/gtk-pushbutton.png
index f4f4d7c1e4..f4f4d7c1e4 100644
--- a/doc/src/images/gtk-pushbutton.png
+++ b/src/widgets/doc/images/gtk-pushbutton.png
diff --git a/doc/src/images/gtk-radiobutton.png b/src/widgets/doc/images/gtk-radiobutton.png
index b3620fa054..b3620fa054 100644
--- a/doc/src/images/gtk-radiobutton.png
+++ b/src/widgets/doc/images/gtk-radiobutton.png
diff --git a/doc/src/images/gtk-slider.png b/src/widgets/doc/images/gtk-slider.png
index 3d8e0ee89e..3d8e0ee89e 100644
--- a/doc/src/images/gtk-slider.png
+++ b/src/widgets/doc/images/gtk-slider.png
diff --git a/doc/src/images/gtk-spinbox.png b/src/widgets/doc/images/gtk-spinbox.png
index a39eb3aa93..a39eb3aa93 100644
--- a/doc/src/images/gtk-spinbox.png
+++ b/src/widgets/doc/images/gtk-spinbox.png
diff --git a/doc/src/images/gtk-tableview.png b/src/widgets/doc/images/gtk-tableview.png
index a025193188..a025193188 100644
--- a/doc/src/images/gtk-tableview.png
+++ b/src/widgets/doc/images/gtk-tableview.png
diff --git a/doc/src/images/gtk-tabwidget.png b/src/widgets/doc/images/gtk-tabwidget.png
index 089c76dad2..089c76dad2 100644
--- a/doc/src/images/gtk-tabwidget.png
+++ b/src/widgets/doc/images/gtk-tabwidget.png
diff --git a/doc/src/images/gtk-textedit.png b/src/widgets/doc/images/gtk-textedit.png
index e4b91c01c9..e4b91c01c9 100644
--- a/doc/src/images/gtk-textedit.png
+++ b/src/widgets/doc/images/gtk-textedit.png
diff --git a/doc/src/images/gtk-timeedit.png b/src/widgets/doc/images/gtk-timeedit.png
index acf6730a86..acf6730a86 100644
--- a/doc/src/images/gtk-timeedit.png
+++ b/src/widgets/doc/images/gtk-timeedit.png
diff --git a/doc/src/images/gtk-toolbox.png b/src/widgets/doc/images/gtk-toolbox.png
index 25e6137699..25e6137699 100644
--- a/doc/src/images/gtk-toolbox.png
+++ b/src/widgets/doc/images/gtk-toolbox.png
diff --git a/doc/src/images/gtk-toolbutton.png b/src/widgets/doc/images/gtk-toolbutton.png
index f0eb86efc5..f0eb86efc5 100644
--- a/doc/src/images/gtk-toolbutton.png
+++ b/src/widgets/doc/images/gtk-toolbutton.png
diff --git a/doc/src/images/gtk-treeview.png b/src/widgets/doc/images/gtk-treeview.png
index 7b4e3044be..7b4e3044be 100644
--- a/doc/src/images/gtk-treeview.png
+++ b/src/widgets/doc/images/gtk-treeview.png
diff --git a/doc/src/images/javastyle/branchindicatorimage.png b/src/widgets/doc/images/javastyle/branchindicatorimage.png
index f2cfc4b2e9..f2cfc4b2e9 100644
--- a/doc/src/images/javastyle/branchindicatorimage.png
+++ b/src/widgets/doc/images/javastyle/branchindicatorimage.png
diff --git a/doc/src/images/javastyle/button.png b/src/widgets/doc/images/javastyle/button.png
index c3a97425b1..c3a97425b1 100644
--- a/doc/src/images/javastyle/button.png
+++ b/src/widgets/doc/images/javastyle/button.png
diff --git a/doc/src/images/javastyle/checkbox.png b/src/widgets/doc/images/javastyle/checkbox.png
index bc841a6a6d..bc841a6a6d 100644
--- a/doc/src/images/javastyle/checkbox.png
+++ b/src/widgets/doc/images/javastyle/checkbox.png
diff --git a/doc/src/images/javastyle/checkboxexample.png b/src/widgets/doc/images/javastyle/checkboxexample.png
index 69217fb2e5..69217fb2e5 100644
--- a/doc/src/images/javastyle/checkboxexample.png
+++ b/src/widgets/doc/images/javastyle/checkboxexample.png
diff --git a/doc/src/images/javastyle/combobox.png b/src/widgets/doc/images/javastyle/combobox.png
index de9745a218..de9745a218 100644
--- a/doc/src/images/javastyle/combobox.png
+++ b/src/widgets/doc/images/javastyle/combobox.png
diff --git a/doc/src/images/javastyle/comboboximage.png b/src/widgets/doc/images/javastyle/comboboximage.png
index 1f05e5fe86..1f05e5fe86 100644
--- a/doc/src/images/javastyle/comboboximage.png
+++ b/src/widgets/doc/images/javastyle/comboboximage.png
diff --git a/doc/src/images/javastyle/conceptualpushbuttontree.png b/src/widgets/doc/images/javastyle/conceptualpushbuttontree.png
index 910000a6e8..910000a6e8 100644
--- a/doc/src/images/javastyle/conceptualpushbuttontree.png
+++ b/src/widgets/doc/images/javastyle/conceptualpushbuttontree.png
diff --git a/doc/src/images/javastyle/dockwidget.png b/src/widgets/doc/images/javastyle/dockwidget.png
index 4bfec142bf..4bfec142bf 100644
--- a/doc/src/images/javastyle/dockwidget.png
+++ b/src/widgets/doc/images/javastyle/dockwidget.png
diff --git a/doc/src/images/javastyle/dockwidgetimage.png b/src/widgets/doc/images/javastyle/dockwidgetimage.png
index eefe171e3e..eefe171e3e 100644
--- a/doc/src/images/javastyle/dockwidgetimage.png
+++ b/src/widgets/doc/images/javastyle/dockwidgetimage.png
diff --git a/doc/src/images/javastyle/groupbox.png b/src/widgets/doc/images/javastyle/groupbox.png
index a39cd42c9f..a39cd42c9f 100644
--- a/doc/src/images/javastyle/groupbox.png
+++ b/src/widgets/doc/images/javastyle/groupbox.png
diff --git a/doc/src/images/javastyle/groupboximage.png b/src/widgets/doc/images/javastyle/groupboximage.png
index 5baf6092d4..5baf6092d4 100644
--- a/doc/src/images/javastyle/groupboximage.png
+++ b/src/widgets/doc/images/javastyle/groupboximage.png
diff --git a/doc/src/images/javastyle/header.png b/src/widgets/doc/images/javastyle/header.png
index b4546d840e..b4546d840e 100644
--- a/doc/src/images/javastyle/header.png
+++ b/src/widgets/doc/images/javastyle/header.png
diff --git a/doc/src/images/javastyle/headerimage.png b/src/widgets/doc/images/javastyle/headerimage.png
index 41171497d5..41171497d5 100644
--- a/doc/src/images/javastyle/headerimage.png
+++ b/src/widgets/doc/images/javastyle/headerimage.png
diff --git a/doc/src/images/javastyle/menu.png b/src/widgets/doc/images/javastyle/menu.png
index 8d44da4054..8d44da4054 100644
--- a/doc/src/images/javastyle/menu.png
+++ b/src/widgets/doc/images/javastyle/menu.png
diff --git a/doc/src/images/javastyle/menubar.png b/src/widgets/doc/images/javastyle/menubar.png
index e68e4a3a55..e68e4a3a55 100644
--- a/doc/src/images/javastyle/menubar.png
+++ b/src/widgets/doc/images/javastyle/menubar.png
diff --git a/doc/src/images/javastyle/menubarimage.png b/src/widgets/doc/images/javastyle/menubarimage.png
index b0cf28edcc..b0cf28edcc 100644
--- a/doc/src/images/javastyle/menubarimage.png
+++ b/src/widgets/doc/images/javastyle/menubarimage.png
diff --git a/doc/src/images/javastyle/menuimage.png b/src/widgets/doc/images/javastyle/menuimage.png
index 282dde7159..282dde7159 100644
--- a/doc/src/images/javastyle/menuimage.png
+++ b/src/widgets/doc/images/javastyle/menuimage.png
diff --git a/doc/src/images/javastyle/progressbar.png b/src/widgets/doc/images/javastyle/progressbar.png
index de3a838c38..de3a838c38 100644
--- a/doc/src/images/javastyle/progressbar.png
+++ b/src/widgets/doc/images/javastyle/progressbar.png
diff --git a/doc/src/images/javastyle/progressbarimage.png b/src/widgets/doc/images/javastyle/progressbarimage.png
index 433b900ab5..433b900ab5 100644
--- a/doc/src/images/javastyle/progressbarimage.png
+++ b/src/widgets/doc/images/javastyle/progressbarimage.png
diff --git a/doc/src/images/javastyle/pushbutton.png b/src/widgets/doc/images/javastyle/pushbutton.png
index e5f92bea12..e5f92bea12 100644
--- a/doc/src/images/javastyle/pushbutton.png
+++ b/src/widgets/doc/images/javastyle/pushbutton.png
diff --git a/doc/src/images/javastyle/rubberband.png b/src/widgets/doc/images/javastyle/rubberband.png
index 087424a3f0..087424a3f0 100644
--- a/doc/src/images/javastyle/rubberband.png
+++ b/src/widgets/doc/images/javastyle/rubberband.png
diff --git a/doc/src/images/javastyle/rubberbandimage.png b/src/widgets/doc/images/javastyle/rubberbandimage.png
index 2794638dbc..2794638dbc 100644
--- a/doc/src/images/javastyle/rubberbandimage.png
+++ b/src/widgets/doc/images/javastyle/rubberbandimage.png
diff --git a/doc/src/images/javastyle/scrollbar.png b/src/widgets/doc/images/javastyle/scrollbar.png
index c1ecb5d655..c1ecb5d655 100644
--- a/doc/src/images/javastyle/scrollbar.png
+++ b/src/widgets/doc/images/javastyle/scrollbar.png
diff --git a/doc/src/images/javastyle/scrollbarimage.png b/src/widgets/doc/images/javastyle/scrollbarimage.png
index 6d3e29d8dd..6d3e29d8dd 100644
--- a/doc/src/images/javastyle/scrollbarimage.png
+++ b/src/widgets/doc/images/javastyle/scrollbarimage.png
diff --git a/doc/src/images/javastyle/sizegrip.png b/src/widgets/doc/images/javastyle/sizegrip.png
index 667e6fb465..667e6fb465 100644
--- a/doc/src/images/javastyle/sizegrip.png
+++ b/src/widgets/doc/images/javastyle/sizegrip.png
diff --git a/doc/src/images/javastyle/sizegripimage.png b/src/widgets/doc/images/javastyle/sizegripimage.png
index ccbf5254d3..ccbf5254d3 100644
--- a/doc/src/images/javastyle/sizegripimage.png
+++ b/src/widgets/doc/images/javastyle/sizegripimage.png
diff --git a/doc/src/images/javastyle/slider.png b/src/widgets/doc/images/javastyle/slider.png
index a382233f58..a382233f58 100644
--- a/doc/src/images/javastyle/slider.png
+++ b/src/widgets/doc/images/javastyle/slider.png
diff --git a/doc/src/images/javastyle/sliderimage.png b/src/widgets/doc/images/javastyle/sliderimage.png
index df700dd712..df700dd712 100644
--- a/doc/src/images/javastyle/sliderimage.png
+++ b/src/widgets/doc/images/javastyle/sliderimage.png
diff --git a/doc/src/images/javastyle/spinbox.png b/src/widgets/doc/images/javastyle/spinbox.png
index ec9d6e0d75..ec9d6e0d75 100644
--- a/doc/src/images/javastyle/spinbox.png
+++ b/src/widgets/doc/images/javastyle/spinbox.png
diff --git a/doc/src/images/javastyle/spinboximage.png b/src/widgets/doc/images/javastyle/spinboximage.png
index d0d57c8ffb..d0d57c8ffb 100644
--- a/doc/src/images/javastyle/spinboximage.png
+++ b/src/widgets/doc/images/javastyle/spinboximage.png
diff --git a/doc/src/images/javastyle/tab.png b/src/widgets/doc/images/javastyle/tab.png
index 616580c839..616580c839 100644
--- a/doc/src/images/javastyle/tab.png
+++ b/src/widgets/doc/images/javastyle/tab.png
diff --git a/doc/src/images/javastyle/tabwidget.png b/src/widgets/doc/images/javastyle/tabwidget.png
index 737155ccb9..737155ccb9 100644
--- a/doc/src/images/javastyle/tabwidget.png
+++ b/src/widgets/doc/images/javastyle/tabwidget.png
diff --git a/doc/src/images/javastyle/titlebar.png b/src/widgets/doc/images/javastyle/titlebar.png
index 5d7ecc481d..5d7ecc481d 100644
--- a/doc/src/images/javastyle/titlebar.png
+++ b/src/widgets/doc/images/javastyle/titlebar.png
diff --git a/doc/src/images/javastyle/titlebarimage.png b/src/widgets/doc/images/javastyle/titlebarimage.png
index 50287aeb1d..50287aeb1d 100644
--- a/doc/src/images/javastyle/titlebarimage.png
+++ b/src/widgets/doc/images/javastyle/titlebarimage.png
diff --git a/doc/src/images/javastyle/toolbar.png b/src/widgets/doc/images/javastyle/toolbar.png
index e69e8df4c8..e69e8df4c8 100644
--- a/doc/src/images/javastyle/toolbar.png
+++ b/src/widgets/doc/images/javastyle/toolbar.png
diff --git a/doc/src/images/javastyle/toolbarimage.png b/src/widgets/doc/images/javastyle/toolbarimage.png
index b9025f582a..b9025f582a 100644
--- a/doc/src/images/javastyle/toolbarimage.png
+++ b/src/widgets/doc/images/javastyle/toolbarimage.png
diff --git a/doc/src/images/javastyle/toolbox.png b/src/widgets/doc/images/javastyle/toolbox.png
index c5f61ecec8..c5f61ecec8 100644
--- a/doc/src/images/javastyle/toolbox.png
+++ b/src/widgets/doc/images/javastyle/toolbox.png
diff --git a/doc/src/images/javastyle/toolboximage.png b/src/widgets/doc/images/javastyle/toolboximage.png
index 7bcbd26432..7bcbd26432 100644
--- a/doc/src/images/javastyle/toolboximage.png
+++ b/src/widgets/doc/images/javastyle/toolboximage.png
diff --git a/doc/src/images/javastyle/toolbutton.png b/src/widgets/doc/images/javastyle/toolbutton.png
index 9167e83f75..9167e83f75 100644
--- a/doc/src/images/javastyle/toolbutton.png
+++ b/src/widgets/doc/images/javastyle/toolbutton.png
diff --git a/doc/src/images/javastyle/toolbuttonimage.png b/src/widgets/doc/images/javastyle/toolbuttonimage.png
index 3217172fca..3217172fca 100644
--- a/doc/src/images/javastyle/toolbuttonimage.png
+++ b/src/widgets/doc/images/javastyle/toolbuttonimage.png
diff --git a/doc/src/images/javastyle/windowstabimage.png b/src/widgets/doc/images/javastyle/windowstabimage.png
index 485e847844..485e847844 100644
--- a/doc/src/images/javastyle/windowstabimage.png
+++ b/src/widgets/doc/images/javastyle/windowstabimage.png
diff --git a/doc/src/images/licensewizard-flow.png b/src/widgets/doc/images/licensewizard-flow.png
index 76df63a98f..76df63a98f 100644
--- a/doc/src/images/licensewizard-flow.png
+++ b/src/widgets/doc/images/licensewizard-flow.png
diff --git a/doc/src/images/macintosh-calendarwidget.png b/src/widgets/doc/images/macintosh-calendarwidget.png
index 2f743501a9..2f743501a9 100644
--- a/doc/src/images/macintosh-calendarwidget.png
+++ b/src/widgets/doc/images/macintosh-calendarwidget.png
diff --git a/doc/src/images/macintosh-checkbox.png b/src/widgets/doc/images/macintosh-checkbox.png
index d0130e3f22..d0130e3f22 100644
--- a/doc/src/images/macintosh-checkbox.png
+++ b/src/widgets/doc/images/macintosh-checkbox.png
diff --git a/doc/src/images/macintosh-combobox.png b/src/widgets/doc/images/macintosh-combobox.png
index c1dc3c0c96..c1dc3c0c96 100644
--- a/doc/src/images/macintosh-combobox.png
+++ b/src/widgets/doc/images/macintosh-combobox.png
diff --git a/doc/src/images/macintosh-dateedit.png b/src/widgets/doc/images/macintosh-dateedit.png
index 45aee90a9b..45aee90a9b 100644
--- a/doc/src/images/macintosh-dateedit.png
+++ b/src/widgets/doc/images/macintosh-dateedit.png
diff --git a/doc/src/images/macintosh-datetimeedit.png b/src/widgets/doc/images/macintosh-datetimeedit.png
index 62af02d64e..62af02d64e 100644
--- a/doc/src/images/macintosh-datetimeedit.png
+++ b/src/widgets/doc/images/macintosh-datetimeedit.png
diff --git a/doc/src/images/macintosh-dial.png b/src/widgets/doc/images/macintosh-dial.png
index df0ffe23a1..df0ffe23a1 100644
--- a/doc/src/images/macintosh-dial.png
+++ b/src/widgets/doc/images/macintosh-dial.png
diff --git a/doc/src/images/macintosh-doublespinbox.png b/src/widgets/doc/images/macintosh-doublespinbox.png
index a0695ff278..a0695ff278 100644
--- a/doc/src/images/macintosh-doublespinbox.png
+++ b/src/widgets/doc/images/macintosh-doublespinbox.png
diff --git a/doc/src/images/macintosh-fontcombobox.png b/src/widgets/doc/images/macintosh-fontcombobox.png
index 8a5a3c78a3..8a5a3c78a3 100644
--- a/doc/src/images/macintosh-fontcombobox.png
+++ b/src/widgets/doc/images/macintosh-fontcombobox.png
diff --git a/doc/src/images/macintosh-frame.png b/src/widgets/doc/images/macintosh-frame.png
index fee61a3643..fee61a3643 100644
--- a/doc/src/images/macintosh-frame.png
+++ b/src/widgets/doc/images/macintosh-frame.png
diff --git a/doc/src/images/macintosh-groupbox.png b/src/widgets/doc/images/macintosh-groupbox.png
index f6c7bce580..f6c7bce580 100644
--- a/doc/src/images/macintosh-groupbox.png
+++ b/src/widgets/doc/images/macintosh-groupbox.png
diff --git a/doc/src/images/macintosh-horizontalscrollbar.png b/src/widgets/doc/images/macintosh-horizontalscrollbar.png
index 8b63572a9e..8b63572a9e 100644
--- a/doc/src/images/macintosh-horizontalscrollbar.png
+++ b/src/widgets/doc/images/macintosh-horizontalscrollbar.png
diff --git a/doc/src/images/macintosh-label.png b/src/widgets/doc/images/macintosh-label.png
index 753aa4d138..753aa4d138 100644
--- a/doc/src/images/macintosh-label.png
+++ b/src/widgets/doc/images/macintosh-label.png
diff --git a/doc/src/images/macintosh-lcdnumber.png b/src/widgets/doc/images/macintosh-lcdnumber.png
index 2ea9ea0713..2ea9ea0713 100644
--- a/doc/src/images/macintosh-lcdnumber.png
+++ b/src/widgets/doc/images/macintosh-lcdnumber.png
diff --git a/doc/src/images/macintosh-lineedit.png b/src/widgets/doc/images/macintosh-lineedit.png
index 0e992c7ffe..0e992c7ffe 100644
--- a/doc/src/images/macintosh-lineedit.png
+++ b/src/widgets/doc/images/macintosh-lineedit.png
diff --git a/doc/src/images/macintosh-listview.png b/src/widgets/doc/images/macintosh-listview.png
index 346e6427ff..346e6427ff 100644
--- a/doc/src/images/macintosh-listview.png
+++ b/src/widgets/doc/images/macintosh-listview.png
diff --git a/src/widgets/doc/images/macintosh-menu.png b/src/widgets/doc/images/macintosh-menu.png
new file mode 100644
index 0000000000..59bdceaab6
--- /dev/null
+++ b/src/widgets/doc/images/macintosh-menu.png
diff --git a/doc/src/images/macintosh-progressbar.png b/src/widgets/doc/images/macintosh-progressbar.png
index 2dfc8aba81..2dfc8aba81 100644
--- a/doc/src/images/macintosh-progressbar.png
+++ b/src/widgets/doc/images/macintosh-progressbar.png
diff --git a/doc/src/images/macintosh-pushbutton.png b/src/widgets/doc/images/macintosh-pushbutton.png
index 7ec14910d8..7ec14910d8 100644
--- a/doc/src/images/macintosh-pushbutton.png
+++ b/src/widgets/doc/images/macintosh-pushbutton.png
diff --git a/doc/src/images/macintosh-radiobutton.png b/src/widgets/doc/images/macintosh-radiobutton.png
index 8b02f509ff..8b02f509ff 100644
--- a/doc/src/images/macintosh-radiobutton.png
+++ b/src/widgets/doc/images/macintosh-radiobutton.png
diff --git a/doc/src/images/macintosh-slider.png b/src/widgets/doc/images/macintosh-slider.png
index bf0c5464e9..bf0c5464e9 100644
--- a/doc/src/images/macintosh-slider.png
+++ b/src/widgets/doc/images/macintosh-slider.png
diff --git a/doc/src/images/macintosh-spinbox.png b/src/widgets/doc/images/macintosh-spinbox.png
index 4196c37246..4196c37246 100644
--- a/doc/src/images/macintosh-spinbox.png
+++ b/src/widgets/doc/images/macintosh-spinbox.png
diff --git a/doc/src/images/macintosh-tableview.png b/src/widgets/doc/images/macintosh-tableview.png
index e6512494de..e6512494de 100644
--- a/doc/src/images/macintosh-tableview.png
+++ b/src/widgets/doc/images/macintosh-tableview.png
diff --git a/doc/src/images/macintosh-tabwidget.png b/src/widgets/doc/images/macintosh-tabwidget.png
index 1d174a47e6..1d174a47e6 100644
--- a/doc/src/images/macintosh-tabwidget.png
+++ b/src/widgets/doc/images/macintosh-tabwidget.png
diff --git a/doc/src/images/macintosh-textedit.png b/src/widgets/doc/images/macintosh-textedit.png
index 4f0ce36baf..4f0ce36baf 100644
--- a/doc/src/images/macintosh-textedit.png
+++ b/src/widgets/doc/images/macintosh-textedit.png
diff --git a/doc/src/images/macintosh-timeedit.png b/src/widgets/doc/images/macintosh-timeedit.png
index 4bcfce33f8..4bcfce33f8 100644
--- a/doc/src/images/macintosh-timeedit.png
+++ b/src/widgets/doc/images/macintosh-timeedit.png
diff --git a/doc/src/images/macintosh-toolbox.png b/src/widgets/doc/images/macintosh-toolbox.png
index 18d41ea595..18d41ea595 100644
--- a/doc/src/images/macintosh-toolbox.png
+++ b/src/widgets/doc/images/macintosh-toolbox.png
diff --git a/doc/src/images/macintosh-toolbutton.png b/src/widgets/doc/images/macintosh-toolbutton.png
index f91331cc51..f91331cc51 100644
--- a/doc/src/images/macintosh-toolbutton.png
+++ b/src/widgets/doc/images/macintosh-toolbutton.png
diff --git a/doc/src/images/macintosh-treeview.png b/src/widgets/doc/images/macintosh-treeview.png
index afda6d8372..afda6d8372 100644
--- a/doc/src/images/macintosh-treeview.png
+++ b/src/widgets/doc/images/macintosh-treeview.png
diff --git a/doc/src/images/mainwindow-docks.png b/src/widgets/doc/images/mainwindow-docks.png
index 24f42a28ea..24f42a28ea 100644
--- a/doc/src/images/mainwindow-docks.png
+++ b/src/widgets/doc/images/mainwindow-docks.png
diff --git a/doc/src/images/mainwindowlayout.png b/src/widgets/doc/images/mainwindowlayout.png
index 4776ce4f1b..4776ce4f1b 100644
--- a/doc/src/images/mainwindowlayout.png
+++ b/src/widgets/doc/images/mainwindowlayout.png
diff --git a/src/widgets/doc/images/mdi-cascade.png b/src/widgets/doc/images/mdi-cascade.png
new file mode 100644
index 0000000000..ca55a5b894
--- /dev/null
+++ b/src/widgets/doc/images/mdi-cascade.png
diff --git a/src/widgets/doc/images/mdi-tile.png b/src/widgets/doc/images/mdi-tile.png
new file mode 100644
index 0000000000..1486d9654e
--- /dev/null
+++ b/src/widgets/doc/images/mdi-tile.png
diff --git a/doc/src/images/motif-calendarwidget.png b/src/widgets/doc/images/motif-calendarwidget.png
index 4ce6aebc21..4ce6aebc21 100644
--- a/doc/src/images/motif-calendarwidget.png
+++ b/src/widgets/doc/images/motif-calendarwidget.png
diff --git a/doc/src/images/motif-checkbox.png b/src/widgets/doc/images/motif-checkbox.png
index 2a263273a6..2a263273a6 100644
--- a/doc/src/images/motif-checkbox.png
+++ b/src/widgets/doc/images/motif-checkbox.png
diff --git a/doc/src/images/motif-combobox.png b/src/widgets/doc/images/motif-combobox.png
index 2a288d9f40..2a288d9f40 100644
--- a/doc/src/images/motif-combobox.png
+++ b/src/widgets/doc/images/motif-combobox.png
diff --git a/doc/src/images/motif-dateedit.png b/src/widgets/doc/images/motif-dateedit.png
index d00c45ff65..d00c45ff65 100644
--- a/doc/src/images/motif-dateedit.png
+++ b/src/widgets/doc/images/motif-dateedit.png
diff --git a/doc/src/images/motif-datetimeedit.png b/src/widgets/doc/images/motif-datetimeedit.png
index cc43ef888d..cc43ef888d 100644
--- a/doc/src/images/motif-datetimeedit.png
+++ b/src/widgets/doc/images/motif-datetimeedit.png
diff --git a/doc/src/images/motif-dial.png b/src/widgets/doc/images/motif-dial.png
index 36b3ff7be0..36b3ff7be0 100644
--- a/doc/src/images/motif-dial.png
+++ b/src/widgets/doc/images/motif-dial.png
diff --git a/doc/src/images/motif-doublespinbox.png b/src/widgets/doc/images/motif-doublespinbox.png
index 6092913ab0..6092913ab0 100644
--- a/doc/src/images/motif-doublespinbox.png
+++ b/src/widgets/doc/images/motif-doublespinbox.png
diff --git a/doc/src/images/motif-fontcombobox.png b/src/widgets/doc/images/motif-fontcombobox.png
index c07452d85e..c07452d85e 100644
--- a/doc/src/images/motif-fontcombobox.png
+++ b/src/widgets/doc/images/motif-fontcombobox.png
diff --git a/doc/src/images/motif-frame.png b/src/widgets/doc/images/motif-frame.png
index 55dcc32227..55dcc32227 100644
--- a/doc/src/images/motif-frame.png
+++ b/src/widgets/doc/images/motif-frame.png
diff --git a/doc/src/images/motif-groupbox.png b/src/widgets/doc/images/motif-groupbox.png
index 13742b116e..13742b116e 100644
--- a/doc/src/images/motif-groupbox.png
+++ b/src/widgets/doc/images/motif-groupbox.png
diff --git a/doc/src/images/motif-horizontalscrollbar.png b/src/widgets/doc/images/motif-horizontalscrollbar.png
index dab1d3f6f6..dab1d3f6f6 100644
--- a/doc/src/images/motif-horizontalscrollbar.png
+++ b/src/widgets/doc/images/motif-horizontalscrollbar.png
diff --git a/doc/src/images/motif-label.png b/src/widgets/doc/images/motif-label.png
index 7ae6674f50..7ae6674f50 100644
--- a/doc/src/images/motif-label.png
+++ b/src/widgets/doc/images/motif-label.png
diff --git a/doc/src/images/motif-lcdnumber.png b/src/widgets/doc/images/motif-lcdnumber.png
index e2cc9a8058..e2cc9a8058 100644
--- a/doc/src/images/motif-lcdnumber.png
+++ b/src/widgets/doc/images/motif-lcdnumber.png
diff --git a/doc/src/images/motif-lineedit.png b/src/widgets/doc/images/motif-lineedit.png
index a335c8c107..a335c8c107 100644
--- a/doc/src/images/motif-lineedit.png
+++ b/src/widgets/doc/images/motif-lineedit.png
diff --git a/doc/src/images/motif-listview.png b/src/widgets/doc/images/motif-listview.png
index 47bd3eae6d..47bd3eae6d 100644
--- a/doc/src/images/motif-listview.png
+++ b/src/widgets/doc/images/motif-listview.png
diff --git a/src/widgets/doc/images/motif-menubar.png b/src/widgets/doc/images/motif-menubar.png
new file mode 100644
index 0000000000..f1d9f4bb3d
--- /dev/null
+++ b/src/widgets/doc/images/motif-menubar.png
diff --git a/doc/src/images/motif-progressbar.png b/src/widgets/doc/images/motif-progressbar.png
index f6d6979b86..f6d6979b86 100644
--- a/doc/src/images/motif-progressbar.png
+++ b/src/widgets/doc/images/motif-progressbar.png
diff --git a/doc/src/images/motif-pushbutton.png b/src/widgets/doc/images/motif-pushbutton.png
index 9dc6a9db78..9dc6a9db78 100644
--- a/doc/src/images/motif-pushbutton.png
+++ b/src/widgets/doc/images/motif-pushbutton.png
diff --git a/doc/src/images/motif-radiobutton.png b/src/widgets/doc/images/motif-radiobutton.png
index 468e54cfcf..468e54cfcf 100644
--- a/doc/src/images/motif-radiobutton.png
+++ b/src/widgets/doc/images/motif-radiobutton.png
diff --git a/doc/src/images/motif-slider.png b/src/widgets/doc/images/motif-slider.png
index 6301e2b26d..6301e2b26d 100644
--- a/doc/src/images/motif-slider.png
+++ b/src/widgets/doc/images/motif-slider.png
diff --git a/doc/src/images/motif-spinbox.png b/src/widgets/doc/images/motif-spinbox.png
index 9acc2821c8..9acc2821c8 100644
--- a/doc/src/images/motif-spinbox.png
+++ b/src/widgets/doc/images/motif-spinbox.png
diff --git a/doc/src/images/motif-tableview.png b/src/widgets/doc/images/motif-tableview.png
index a1d205aaed..a1d205aaed 100644
--- a/doc/src/images/motif-tableview.png
+++ b/src/widgets/doc/images/motif-tableview.png
diff --git a/doc/src/images/motif-tabwidget.png b/src/widgets/doc/images/motif-tabwidget.png
index 19da66a76c..19da66a76c 100644
--- a/doc/src/images/motif-tabwidget.png
+++ b/src/widgets/doc/images/motif-tabwidget.png
diff --git a/doc/src/images/motif-textedit.png b/src/widgets/doc/images/motif-textedit.png
index 205bc19cfa..205bc19cfa 100644
--- a/doc/src/images/motif-textedit.png
+++ b/src/widgets/doc/images/motif-textedit.png
diff --git a/doc/src/images/motif-timeedit.png b/src/widgets/doc/images/motif-timeedit.png
index 1ad459b886..1ad459b886 100644
--- a/doc/src/images/motif-timeedit.png
+++ b/src/widgets/doc/images/motif-timeedit.png
diff --git a/doc/src/images/motif-toolbox.png b/src/widgets/doc/images/motif-toolbox.png
index 4bc3c37bb2..4bc3c37bb2 100644
--- a/doc/src/images/motif-toolbox.png
+++ b/src/widgets/doc/images/motif-toolbox.png
diff --git a/doc/src/images/motif-toolbutton.png b/src/widgets/doc/images/motif-toolbutton.png
index 8ef51ddd8d..8ef51ddd8d 100644
--- a/doc/src/images/motif-toolbutton.png
+++ b/src/widgets/doc/images/motif-toolbutton.png
diff --git a/doc/src/images/motif-treeview.png b/src/widgets/doc/images/motif-treeview.png
index a7dd0f2466..a7dd0f2466 100644
--- a/doc/src/images/motif-treeview.png
+++ b/src/widgets/doc/images/motif-treeview.png
diff --git a/doc/src/images/msgbox1.png b/src/widgets/doc/images/msgbox1.png
index 1380e20a5f..1380e20a5f 100644
--- a/doc/src/images/msgbox1.png
+++ b/src/widgets/doc/images/msgbox1.png
diff --git a/doc/src/images/msgbox2.png b/src/widgets/doc/images/msgbox2.png
index e7946996e4..e7946996e4 100644
--- a/doc/src/images/msgbox2.png
+++ b/src/widgets/doc/images/msgbox2.png
diff --git a/doc/src/images/msgbox3.png b/src/widgets/doc/images/msgbox3.png
index bd81f4d4da..bd81f4d4da 100644
--- a/doc/src/images/msgbox3.png
+++ b/src/widgets/doc/images/msgbox3.png
diff --git a/doc/src/images/msgbox4.png b/src/widgets/doc/images/msgbox4.png
index dbe6701cdd..dbe6701cdd 100644
--- a/doc/src/images/msgbox4.png
+++ b/src/widgets/doc/images/msgbox4.png
diff --git a/doc/src/images/pangesture.png b/src/widgets/doc/images/pangesture.png
index 24caf91d3b..24caf91d3b 100644
--- a/doc/src/images/pangesture.png
+++ b/src/widgets/doc/images/pangesture.png
diff --git a/doc/src/images/parent-child-widgets.png b/src/widgets/doc/images/parent-child-widgets.png
index 094e2e96b6..094e2e96b6 100644
--- a/doc/src/images/parent-child-widgets.png
+++ b/src/widgets/doc/images/parent-child-widgets.png
diff --git a/doc/src/images/pinchgesture.png b/src/widgets/doc/images/pinchgesture.png
index 95614c4052..95614c4052 100644
--- a/doc/src/images/pinchgesture.png
+++ b/src/widgets/doc/images/pinchgesture.png
diff --git a/doc/src/images/plastique-calendarwidget.png b/src/widgets/doc/images/plastique-calendarwidget.png
index 5e65945c72..5e65945c72 100644
--- a/doc/src/images/plastique-calendarwidget.png
+++ b/src/widgets/doc/images/plastique-calendarwidget.png
diff --git a/doc/src/images/plastique-checkbox.png b/src/widgets/doc/images/plastique-checkbox.png
index 91a5109d65..91a5109d65 100644
--- a/doc/src/images/plastique-checkbox.png
+++ b/src/widgets/doc/images/plastique-checkbox.png
diff --git a/doc/src/images/plastique-colordialog.png b/src/widgets/doc/images/plastique-colordialog.png
index 68bf4d0b4b..68bf4d0b4b 100644
--- a/doc/src/images/plastique-colordialog.png
+++ b/src/widgets/doc/images/plastique-colordialog.png
diff --git a/doc/src/images/plastique-combobox.png b/src/widgets/doc/images/plastique-combobox.png
index e3bf8a321f..e3bf8a321f 100644
--- a/doc/src/images/plastique-combobox.png
+++ b/src/widgets/doc/images/plastique-combobox.png
diff --git a/doc/src/images/plastique-dateedit.png b/src/widgets/doc/images/plastique-dateedit.png
index 2e28a40f01..2e28a40f01 100644
--- a/doc/src/images/plastique-dateedit.png
+++ b/src/widgets/doc/images/plastique-dateedit.png
diff --git a/doc/src/images/plastique-datetimeedit.png b/src/widgets/doc/images/plastique-datetimeedit.png
index 810bf1660a..810bf1660a 100644
--- a/doc/src/images/plastique-datetimeedit.png
+++ b/src/widgets/doc/images/plastique-datetimeedit.png
diff --git a/doc/src/images/plastique-dial.png b/src/widgets/doc/images/plastique-dial.png
index b65e7c78cd..b65e7c78cd 100644
--- a/doc/src/images/plastique-dial.png
+++ b/src/widgets/doc/images/plastique-dial.png
diff --git a/doc/src/images/plastique-doublespinbox.png b/src/widgets/doc/images/plastique-doublespinbox.png
index 627c4a20fe..627c4a20fe 100644
--- a/doc/src/images/plastique-doublespinbox.png
+++ b/src/widgets/doc/images/plastique-doublespinbox.png
diff --git a/doc/src/images/plastique-fontcombobox.png b/src/widgets/doc/images/plastique-fontcombobox.png
index d3823081d8..d3823081d8 100644
--- a/doc/src/images/plastique-fontcombobox.png
+++ b/src/widgets/doc/images/plastique-fontcombobox.png
diff --git a/doc/src/images/plastique-fontdialog.png b/src/widgets/doc/images/plastique-fontdialog.png
index 7e799a8815..7e799a8815 100644
--- a/doc/src/images/plastique-fontdialog.png
+++ b/src/widgets/doc/images/plastique-fontdialog.png
diff --git a/doc/src/images/plastique-frame.png b/src/widgets/doc/images/plastique-frame.png
index 9f81f6cba4..9f81f6cba4 100644
--- a/doc/src/images/plastique-frame.png
+++ b/src/widgets/doc/images/plastique-frame.png
diff --git a/doc/src/images/plastique-groupbox.png b/src/widgets/doc/images/plastique-groupbox.png
index d353c40071..d353c40071 100644
--- a/doc/src/images/plastique-groupbox.png
+++ b/src/widgets/doc/images/plastique-groupbox.png
diff --git a/doc/src/images/plastique-horizontalscrollbar.png b/src/widgets/doc/images/plastique-horizontalscrollbar.png
index d20300c23f..d20300c23f 100644
--- a/doc/src/images/plastique-horizontalscrollbar.png
+++ b/src/widgets/doc/images/plastique-horizontalscrollbar.png
diff --git a/doc/src/images/plastique-label.png b/src/widgets/doc/images/plastique-label.png
index d2a55a862c..d2a55a862c 100644
--- a/doc/src/images/plastique-label.png
+++ b/src/widgets/doc/images/plastique-label.png
diff --git a/doc/src/images/plastique-lcdnumber.png b/src/widgets/doc/images/plastique-lcdnumber.png
index 74149ee158..74149ee158 100644
--- a/doc/src/images/plastique-lcdnumber.png
+++ b/src/widgets/doc/images/plastique-lcdnumber.png
diff --git a/doc/src/images/plastique-lineedit.png b/src/widgets/doc/images/plastique-lineedit.png
index f455383520..f455383520 100644
--- a/doc/src/images/plastique-lineedit.png
+++ b/src/widgets/doc/images/plastique-lineedit.png
diff --git a/doc/src/images/plastique-listview.png b/src/widgets/doc/images/plastique-listview.png
index 64bd00fe1f..64bd00fe1f 100644
--- a/doc/src/images/plastique-listview.png
+++ b/src/widgets/doc/images/plastique-listview.png
diff --git a/src/widgets/doc/images/plastique-menu.png b/src/widgets/doc/images/plastique-menu.png
new file mode 100644
index 0000000000..88df2493af
--- /dev/null
+++ b/src/widgets/doc/images/plastique-menu.png
diff --git a/src/widgets/doc/images/plastique-menubar.png b/src/widgets/doc/images/plastique-menubar.png
new file mode 100644
index 0000000000..642f95d6cf
--- /dev/null
+++ b/src/widgets/doc/images/plastique-menubar.png
diff --git a/doc/src/images/plastique-progressbar.png b/src/widgets/doc/images/plastique-progressbar.png
index fe8dd90274..fe8dd90274 100644
--- a/doc/src/images/plastique-progressbar.png
+++ b/src/widgets/doc/images/plastique-progressbar.png
diff --git a/doc/src/images/plastique-progressdialog.png b/src/widgets/doc/images/plastique-progressdialog.png
index 4373bcac16..4373bcac16 100644
--- a/doc/src/images/plastique-progressdialog.png
+++ b/src/widgets/doc/images/plastique-progressdialog.png
diff --git a/src/widgets/doc/images/plastique-pushbutton-menu.png b/src/widgets/doc/images/plastique-pushbutton-menu.png
new file mode 100644
index 0000000000..d090033aa7
--- /dev/null
+++ b/src/widgets/doc/images/plastique-pushbutton-menu.png
diff --git a/doc/src/images/plastique-pushbutton.png b/src/widgets/doc/images/plastique-pushbutton.png
index 83c44fd38d..83c44fd38d 100644
--- a/doc/src/images/plastique-pushbutton.png
+++ b/src/widgets/doc/images/plastique-pushbutton.png
diff --git a/doc/src/images/plastique-radiobutton.png b/src/widgets/doc/images/plastique-radiobutton.png
index a2c820d7d1..a2c820d7d1 100644
--- a/doc/src/images/plastique-radiobutton.png
+++ b/src/widgets/doc/images/plastique-radiobutton.png
diff --git a/src/widgets/doc/images/plastique-sizegrip.png b/src/widgets/doc/images/plastique-sizegrip.png
new file mode 100644
index 0000000000..09a551efab
--- /dev/null
+++ b/src/widgets/doc/images/plastique-sizegrip.png
diff --git a/doc/src/images/plastique-slider.png b/src/widgets/doc/images/plastique-slider.png
index 492f0fdfbd..492f0fdfbd 100644
--- a/doc/src/images/plastique-slider.png
+++ b/src/widgets/doc/images/plastique-slider.png
diff --git a/doc/src/images/plastique-spinbox.png b/src/widgets/doc/images/plastique-spinbox.png
index af15db3c23..af15db3c23 100644
--- a/doc/src/images/plastique-spinbox.png
+++ b/src/widgets/doc/images/plastique-spinbox.png
diff --git a/doc/src/images/plastique-statusbar.png b/src/widgets/doc/images/plastique-statusbar.png
index c8f9792ab9..c8f9792ab9 100644
--- a/doc/src/images/plastique-statusbar.png
+++ b/src/widgets/doc/images/plastique-statusbar.png
diff --git a/src/widgets/doc/images/plastique-tabbar-truncated.png b/src/widgets/doc/images/plastique-tabbar-truncated.png
new file mode 100644
index 0000000000..8e906d9928
--- /dev/null
+++ b/src/widgets/doc/images/plastique-tabbar-truncated.png
diff --git a/src/widgets/doc/images/plastique-tabbar.png b/src/widgets/doc/images/plastique-tabbar.png
new file mode 100644
index 0000000000..3371dda1b6
--- /dev/null
+++ b/src/widgets/doc/images/plastique-tabbar.png
diff --git a/doc/src/images/plastique-tableview.png b/src/widgets/doc/images/plastique-tableview.png
index b20c1cce7f..b20c1cce7f 100644
--- a/doc/src/images/plastique-tableview.png
+++ b/src/widgets/doc/images/plastique-tableview.png
diff --git a/doc/src/images/plastique-tabwidget.png b/src/widgets/doc/images/plastique-tabwidget.png
index 92ae398844..92ae398844 100644
--- a/doc/src/images/plastique-tabwidget.png
+++ b/src/widgets/doc/images/plastique-tabwidget.png
diff --git a/doc/src/images/plastique-textedit.png b/src/widgets/doc/images/plastique-textedit.png
index a802d75fcc..a802d75fcc 100644
--- a/doc/src/images/plastique-textedit.png
+++ b/src/widgets/doc/images/plastique-textedit.png
diff --git a/doc/src/images/plastique-timeedit.png b/src/widgets/doc/images/plastique-timeedit.png
index 2d70b84c4c..2d70b84c4c 100644
--- a/doc/src/images/plastique-timeedit.png
+++ b/src/widgets/doc/images/plastique-timeedit.png
diff --git a/doc/src/images/plastique-toolbox.png b/src/widgets/doc/images/plastique-toolbox.png
index 10bcd7af62..10bcd7af62 100644
--- a/doc/src/images/plastique-toolbox.png
+++ b/src/widgets/doc/images/plastique-toolbox.png
diff --git a/doc/src/images/plastique-toolbutton.png b/src/widgets/doc/images/plastique-toolbutton.png
index 4e51831408..4e51831408 100644
--- a/doc/src/images/plastique-toolbutton.png
+++ b/src/widgets/doc/images/plastique-toolbutton.png
diff --git a/doc/src/images/plastique-treeview.png b/src/widgets/doc/images/plastique-treeview.png
index db0bc01a25..db0bc01a25 100644
--- a/doc/src/images/plastique-treeview.png
+++ b/src/widgets/doc/images/plastique-treeview.png
diff --git a/doc/src/images/progressBar-stylesheet.png b/src/widgets/doc/images/progressBar-stylesheet.png
index b4bf755b6c..b4bf755b6c 100644
--- a/doc/src/images/progressBar-stylesheet.png
+++ b/src/widgets/doc/images/progressBar-stylesheet.png
diff --git a/doc/src/images/progressBar2-stylesheet.png b/src/widgets/doc/images/progressBar2-stylesheet.png
index 8b5ecc0a66..8b5ecc0a66 100644
--- a/doc/src/images/progressBar2-stylesheet.png
+++ b/src/widgets/doc/images/progressBar2-stylesheet.png
diff --git a/doc/src/images/propagation-custom.png b/src/widgets/doc/images/propagation-custom.png
index 866b44d677..866b44d677 100644
--- a/doc/src/images/propagation-custom.png
+++ b/src/widgets/doc/images/propagation-custom.png
diff --git a/doc/src/images/propagation-standard.png b/src/widgets/doc/images/propagation-standard.png
index b010fccc95..b010fccc95 100644
--- a/doc/src/images/propagation-standard.png
+++ b/src/widgets/doc/images/propagation-standard.png
diff --git a/doc/src/images/qcalendarwidget-grid.png b/src/widgets/doc/images/qcalendarwidget-grid.png
index 3df4dd99e2..3df4dd99e2 100644
--- a/doc/src/images/qcalendarwidget-grid.png
+++ b/src/widgets/doc/images/qcalendarwidget-grid.png
diff --git a/doc/src/images/qcalendarwidget-maximum.png b/src/widgets/doc/images/qcalendarwidget-maximum.png
index 1e78d20e85..1e78d20e85 100644
--- a/doc/src/images/qcalendarwidget-maximum.png
+++ b/src/widgets/doc/images/qcalendarwidget-maximum.png
diff --git a/doc/src/images/qcalendarwidget-minimum.png b/src/widgets/doc/images/qcalendarwidget-minimum.png
index f860429309..f860429309 100644
--- a/doc/src/images/qcalendarwidget-minimum.png
+++ b/src/widgets/doc/images/qcalendarwidget-minimum.png
diff --git a/doc/src/images/qcolumnview.png b/src/widgets/doc/images/qcolumnview.png
index 1d312bf953..1d312bf953 100644
--- a/doc/src/images/qcolumnview.png
+++ b/src/widgets/doc/images/qcolumnview.png
diff --git a/doc/src/images/qdesktopwidget.png b/src/widgets/doc/images/qdesktopwidget.png
index 02f8e8b5ad..02f8e8b5ad 100644
--- a/doc/src/images/qdesktopwidget.png
+++ b/src/widgets/doc/images/qdesktopwidget.png
diff --git a/src/widgets/doc/images/qformlayout-kde.png b/src/widgets/doc/images/qformlayout-kde.png
new file mode 100644
index 0000000000..c32bb12499
--- /dev/null
+++ b/src/widgets/doc/images/qformlayout-kde.png
diff --git a/src/widgets/doc/images/qformlayout-mac.png b/src/widgets/doc/images/qformlayout-mac.png
new file mode 100644
index 0000000000..0a0824efb6
--- /dev/null
+++ b/src/widgets/doc/images/qformlayout-mac.png
diff --git a/src/widgets/doc/images/qformlayout-qpe.png b/src/widgets/doc/images/qformlayout-qpe.png
new file mode 100644
index 0000000000..3abecc5716
--- /dev/null
+++ b/src/widgets/doc/images/qformlayout-qpe.png
diff --git a/src/widgets/doc/images/qformlayout-win.png b/src/widgets/doc/images/qformlayout-win.png
new file mode 100644
index 0000000000..1ed44bdd3b
--- /dev/null
+++ b/src/widgets/doc/images/qformlayout-win.png
diff --git a/doc/src/images/qformlayout-with-6-children.png b/src/widgets/doc/images/qformlayout-with-6-children.png
index f743599702..f743599702 100644
--- a/doc/src/images/qformlayout-with-6-children.png
+++ b/src/widgets/doc/images/qformlayout-with-6-children.png
diff --git a/doc/src/images/qgraphicsproxywidget-embed.png b/src/widgets/doc/images/qgraphicsproxywidget-embed.png
index 10d8f6fddd..10d8f6fddd 100644
--- a/doc/src/images/qgraphicsproxywidget-embed.png
+++ b/src/widgets/doc/images/qgraphicsproxywidget-embed.png
diff --git a/doc/src/images/qgridlayout-with-5-children.png b/src/widgets/doc/images/qgridlayout-with-5-children.png
index 8d0c2962e4..8d0c2962e4 100644
--- a/doc/src/images/qgridlayout-with-5-children.png
+++ b/src/widgets/doc/images/qgridlayout-with-5-children.png
diff --git a/doc/src/images/qhboxlayout-with-5-children.png b/src/widgets/doc/images/qhboxlayout-with-5-children.png
index 9b48dc5c47..9b48dc5c47 100644
--- a/doc/src/images/qhboxlayout-with-5-children.png
+++ b/src/widgets/doc/images/qhboxlayout-with-5-children.png
diff --git a/doc/src/images/qmdisubwindowlayout.png b/src/widgets/doc/images/qmdisubwindowlayout.png
index ffe5cc3949..ffe5cc3949 100644
--- a/doc/src/images/qmdisubwindowlayout.png
+++ b/src/widgets/doc/images/qmdisubwindowlayout.png
diff --git a/src/widgets/doc/images/qscrollarea-noscrollbars.png b/src/widgets/doc/images/qscrollarea-noscrollbars.png
new file mode 100644
index 0000000000..a1520f3e21
--- /dev/null
+++ b/src/widgets/doc/images/qscrollarea-noscrollbars.png
diff --git a/src/widgets/doc/images/qscrollarea-onescrollbar.png b/src/widgets/doc/images/qscrollarea-onescrollbar.png
new file mode 100644
index 0000000000..b4f7976bc4
--- /dev/null
+++ b/src/widgets/doc/images/qscrollarea-onescrollbar.png
diff --git a/src/widgets/doc/images/qscrollarea-twoscrollbars.png b/src/widgets/doc/images/qscrollarea-twoscrollbars.png
new file mode 100644
index 0000000000..bf720e498c
--- /dev/null
+++ b/src/widgets/doc/images/qscrollarea-twoscrollbars.png
diff --git a/doc/src/images/qscrollbar-picture.png b/src/widgets/doc/images/qscrollbar-picture.png
index 898e014c40..898e014c40 100644
--- a/doc/src/images/qscrollbar-picture.png
+++ b/src/widgets/doc/images/qscrollbar-picture.png
diff --git a/src/widgets/doc/images/qscrollbar-values.png b/src/widgets/doc/images/qscrollbar-values.png
new file mode 100644
index 0000000000..cea744b3be
--- /dev/null
+++ b/src/widgets/doc/images/qscrollbar-values.png
diff --git a/src/widgets/doc/images/qspinbox-plusminus.png b/src/widgets/doc/images/qspinbox-plusminus.png
new file mode 100644
index 0000000000..3b35a408a0
--- /dev/null
+++ b/src/widgets/doc/images/qspinbox-plusminus.png
diff --git a/src/widgets/doc/images/qspinbox-updown.png b/src/widgets/doc/images/qspinbox-updown.png
new file mode 100644
index 0000000000..a6caa4419b
--- /dev/null
+++ b/src/widgets/doc/images/qspinbox-updown.png
diff --git a/doc/src/images/qstyle-comboboxes.png b/src/widgets/doc/images/qstyle-comboboxes.png
index aecec914a0..aecec914a0 100644
--- a/doc/src/images/qstyle-comboboxes.png
+++ b/src/widgets/doc/images/qstyle-comboboxes.png
diff --git a/doc/src/images/qstyleoptiontoolbar-position.png b/src/widgets/doc/images/qstyleoptiontoolbar-position.png
index 5eaae7e4cd..5eaae7e4cd 100644
--- a/doc/src/images/qstyleoptiontoolbar-position.png
+++ b/src/widgets/doc/images/qstyleoptiontoolbar-position.png
diff --git a/src/widgets/doc/images/qtableview-resized.png b/src/widgets/doc/images/qtableview-resized.png
new file mode 100644
index 0000000000..813256ee9e
--- /dev/null
+++ b/src/widgets/doc/images/qtableview-resized.png
diff --git a/src/widgets/doc/images/qtwizard-aero1.png b/src/widgets/doc/images/qtwizard-aero1.png
new file mode 100644
index 0000000000..fe9e9bc21c
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-aero1.png
diff --git a/src/widgets/doc/images/qtwizard-aero2.png b/src/widgets/doc/images/qtwizard-aero2.png
new file mode 100644
index 0000000000..261c0651fe
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-aero2.png
diff --git a/src/widgets/doc/images/qtwizard-classic1.png b/src/widgets/doc/images/qtwizard-classic1.png
new file mode 100644
index 0000000000..be3edbecaf
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-classic1.png
diff --git a/src/widgets/doc/images/qtwizard-classic2.png b/src/widgets/doc/images/qtwizard-classic2.png
new file mode 100644
index 0000000000..165f569d1d
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-classic2.png
diff --git a/src/widgets/doc/images/qtwizard-mac1.png b/src/widgets/doc/images/qtwizard-mac1.png
new file mode 100644
index 0000000000..bc8cd9b715
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-mac1.png
diff --git a/src/widgets/doc/images/qtwizard-mac2.png b/src/widgets/doc/images/qtwizard-mac2.png
new file mode 100644
index 0000000000..850f6b85a5
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-mac2.png
diff --git a/doc/src/images/qtwizard-macpage.png b/src/widgets/doc/images/qtwizard-macpage.png
index 1ba3122f91..1ba3122f91 100644
--- a/doc/src/images/qtwizard-macpage.png
+++ b/src/widgets/doc/images/qtwizard-macpage.png
diff --git a/src/widgets/doc/images/qtwizard-modern1.png b/src/widgets/doc/images/qtwizard-modern1.png
new file mode 100644
index 0000000000..223e3ddec3
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-modern1.png
diff --git a/src/widgets/doc/images/qtwizard-modern2.png b/src/widgets/doc/images/qtwizard-modern2.png
new file mode 100644
index 0000000000..d66c374a4c
--- /dev/null
+++ b/src/widgets/doc/images/qtwizard-modern2.png
diff --git a/doc/src/images/qtwizard-nonmacpage.png b/src/widgets/doc/images/qtwizard-nonmacpage.png
index cbe464d57f..cbe464d57f 100644
--- a/doc/src/images/qtwizard-nonmacpage.png
+++ b/src/widgets/doc/images/qtwizard-nonmacpage.png
diff --git a/doc/src/images/qundoview.png b/src/widgets/doc/images/qundoview.png
index 3bdb1cf2ed..3bdb1cf2ed 100644
--- a/doc/src/images/qundoview.png
+++ b/src/widgets/doc/images/qundoview.png
diff --git a/doc/src/images/qvboxlayout-with-5-children.png b/src/widgets/doc/images/qvboxlayout-with-5-children.png
index 57c37d7247..57c37d7247 100644
--- a/doc/src/images/qvboxlayout-with-5-children.png
+++ b/src/widgets/doc/images/qvboxlayout-with-5-children.png
diff --git a/src/widgets/doc/images/simpleanchorlayout-example.png b/src/widgets/doc/images/simpleanchorlayout-example.png
new file mode 100644
index 0000000000..1d5c8ac048
--- /dev/null
+++ b/src/widgets/doc/images/simpleanchorlayout-example.png
diff --git a/doc/src/images/stylesheet-border-image-normal.png b/src/widgets/doc/images/stylesheet-border-image-normal.png
index 8afe3c9a67..8afe3c9a67 100644
--- a/doc/src/images/stylesheet-border-image-normal.png
+++ b/src/widgets/doc/images/stylesheet-border-image-normal.png
diff --git a/src/widgets/doc/images/stylesheet-border-image-stretched.png b/src/widgets/doc/images/stylesheet-border-image-stretched.png
new file mode 100644
index 0000000000..3f9ca92dd3
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-border-image-stretched.png
diff --git a/src/widgets/doc/images/stylesheet-border-image-wrong.png b/src/widgets/doc/images/stylesheet-border-image-wrong.png
new file mode 100644
index 0000000000..19d6e449f4
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-border-image-wrong.png
diff --git a/doc/src/images/stylesheet-boxmodel.png b/src/widgets/doc/images/stylesheet-boxmodel.png
index a0249d77b7..a0249d77b7 100644
--- a/doc/src/images/stylesheet-boxmodel.png
+++ b/src/widgets/doc/images/stylesheet-boxmodel.png
diff --git a/src/widgets/doc/images/stylesheet-branch-closed.png b/src/widgets/doc/images/stylesheet-branch-closed.png
new file mode 100644
index 0000000000..213ffdd88f
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-branch-closed.png
diff --git a/src/widgets/doc/images/stylesheet-branch-end.png b/src/widgets/doc/images/stylesheet-branch-end.png
new file mode 100644
index 0000000000..54915b3b01
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-branch-end.png
diff --git a/src/widgets/doc/images/stylesheet-branch-more.png b/src/widgets/doc/images/stylesheet-branch-more.png
new file mode 100644
index 0000000000..664ad44740
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-branch-more.png
diff --git a/src/widgets/doc/images/stylesheet-branch-open.png b/src/widgets/doc/images/stylesheet-branch-open.png
new file mode 100644
index 0000000000..e8cad95ccf
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-branch-open.png
diff --git a/src/widgets/doc/images/stylesheet-coffee-cleanlooks.png b/src/widgets/doc/images/stylesheet-coffee-cleanlooks.png
new file mode 100644
index 0000000000..e75df0d80a
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-coffee-cleanlooks.png
diff --git a/src/widgets/doc/images/stylesheet-coffee-xp.png b/src/widgets/doc/images/stylesheet-coffee-xp.png
new file mode 100644
index 0000000000..8bedd80ee9
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-coffee-xp.png
diff --git a/src/widgets/doc/images/stylesheet-pagefold-mac.png b/src/widgets/doc/images/stylesheet-pagefold-mac.png
new file mode 100644
index 0000000000..5c061b9cfd
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-pagefold-mac.png
diff --git a/doc/src/images/stylesheet-pagefold.png b/src/widgets/doc/images/stylesheet-pagefold.png
index 5ccb4edbc9..5ccb4edbc9 100644
--- a/doc/src/images/stylesheet-pagefold.png
+++ b/src/widgets/doc/images/stylesheet-pagefold.png
diff --git a/doc/src/images/stylesheet-redbutton1.png b/src/widgets/doc/images/stylesheet-redbutton1.png
index cb03375e12..cb03375e12 100644
--- a/doc/src/images/stylesheet-redbutton1.png
+++ b/src/widgets/doc/images/stylesheet-redbutton1.png
diff --git a/doc/src/images/stylesheet-redbutton2.png b/src/widgets/doc/images/stylesheet-redbutton2.png
index 5325708942..5325708942 100644
--- a/doc/src/images/stylesheet-redbutton2.png
+++ b/src/widgets/doc/images/stylesheet-redbutton2.png
diff --git a/doc/src/images/stylesheet-redbutton3.png b/src/widgets/doc/images/stylesheet-redbutton3.png
index dd976f0760..dd976f0760 100644
--- a/doc/src/images/stylesheet-redbutton3.png
+++ b/src/widgets/doc/images/stylesheet-redbutton3.png
diff --git a/doc/src/images/stylesheet-scrollbar1.png b/src/widgets/doc/images/stylesheet-scrollbar1.png
index 666ff1119a..666ff1119a 100644
--- a/doc/src/images/stylesheet-scrollbar1.png
+++ b/src/widgets/doc/images/stylesheet-scrollbar1.png
diff --git a/doc/src/images/stylesheet-scrollbar2.png b/src/widgets/doc/images/stylesheet-scrollbar2.png
index 439cf8035d..439cf8035d 100644
--- a/doc/src/images/stylesheet-scrollbar2.png
+++ b/src/widgets/doc/images/stylesheet-scrollbar2.png
diff --git a/doc/src/images/stylesheet-treeview.png b/src/widgets/doc/images/stylesheet-treeview.png
index 883d190f36..883d190f36 100644
--- a/doc/src/images/stylesheet-treeview.png
+++ b/src/widgets/doc/images/stylesheet-treeview.png
diff --git a/src/widgets/doc/images/stylesheet-vline.png b/src/widgets/doc/images/stylesheet-vline.png
new file mode 100644
index 0000000000..8f0c336fd8
--- /dev/null
+++ b/src/widgets/doc/images/stylesheet-vline.png
diff --git a/doc/src/images/swipegesture.png b/src/widgets/doc/images/swipegesture.png
index 0b7d35af3a..0b7d35af3a 100644
--- a/doc/src/images/swipegesture.png
+++ b/src/widgets/doc/images/swipegesture.png
diff --git a/doc/src/images/system-tray.png b/src/widgets/doc/images/system-tray.png
index 298b193cf7..298b193cf7 100644
--- a/doc/src/images/system-tray.png
+++ b/src/widgets/doc/images/system-tray.png
diff --git a/doc/src/images/tabWidget-stylesheet1.png b/src/widgets/doc/images/tabWidget-stylesheet1.png
index fc8fc19e74..fc8fc19e74 100644
--- a/doc/src/images/tabWidget-stylesheet1.png
+++ b/src/widgets/doc/images/tabWidget-stylesheet1.png
diff --git a/doc/src/images/tabWidget-stylesheet2.png b/src/widgets/doc/images/tabWidget-stylesheet2.png
index 2cbf2bf36d..2cbf2bf36d 100644
--- a/doc/src/images/tabWidget-stylesheet2.png
+++ b/src/widgets/doc/images/tabWidget-stylesheet2.png
diff --git a/doc/src/images/tabWidget-stylesheet3.png b/src/widgets/doc/images/tabWidget-stylesheet3.png
index f57a9c9f9c..f57a9c9f9c 100644
--- a/doc/src/images/tabWidget-stylesheet3.png
+++ b/src/widgets/doc/images/tabWidget-stylesheet3.png
diff --git a/doc/src/images/tableWidget-stylesheet.png b/src/widgets/doc/images/tableWidget-stylesheet.png
index e99e7a97c8..e99e7a97c8 100644
--- a/doc/src/images/tableWidget-stylesheet.png
+++ b/src/widgets/doc/images/tableWidget-stylesheet.png
diff --git a/doc/src/images/widgetdelegate.png b/src/widgets/doc/images/widgetdelegate.png
index 3df4c4b6a5..3df4c4b6a5 100644
--- a/doc/src/images/widgetdelegate.png
+++ b/src/widgets/doc/images/widgetdelegate.png
diff --git a/doc/src/images/windows-calendarwidget.png b/src/widgets/doc/images/windows-calendarwidget.png
index ad016238ad..ad016238ad 100644
--- a/doc/src/images/windows-calendarwidget.png
+++ b/src/widgets/doc/images/windows-calendarwidget.png
diff --git a/doc/src/images/windows-checkbox.png b/src/widgets/doc/images/windows-checkbox.png
index eb1be4b736..eb1be4b736 100644
--- a/doc/src/images/windows-checkbox.png
+++ b/src/widgets/doc/images/windows-checkbox.png
diff --git a/doc/src/images/windows-combobox.png b/src/widgets/doc/images/windows-combobox.png
index d6bc483494..d6bc483494 100644
--- a/doc/src/images/windows-combobox.png
+++ b/src/widgets/doc/images/windows-combobox.png
diff --git a/doc/src/images/windows-dateedit.png b/src/widgets/doc/images/windows-dateedit.png
index 95587ec62e..95587ec62e 100644
--- a/doc/src/images/windows-dateedit.png
+++ b/src/widgets/doc/images/windows-dateedit.png
diff --git a/doc/src/images/windows-datetimeedit.png b/src/widgets/doc/images/windows-datetimeedit.png
index 6aa1766146..6aa1766146 100644
--- a/doc/src/images/windows-datetimeedit.png
+++ b/src/widgets/doc/images/windows-datetimeedit.png
diff --git a/doc/src/images/windows-dial.png b/src/widgets/doc/images/windows-dial.png
index 0aa3a26159..0aa3a26159 100644
--- a/doc/src/images/windows-dial.png
+++ b/src/widgets/doc/images/windows-dial.png
diff --git a/doc/src/images/windows-doublespinbox.png b/src/widgets/doc/images/windows-doublespinbox.png
index 244b5f66cd..244b5f66cd 100644
--- a/doc/src/images/windows-doublespinbox.png
+++ b/src/widgets/doc/images/windows-doublespinbox.png
diff --git a/doc/src/images/windows-fontcombobox.png b/src/widgets/doc/images/windows-fontcombobox.png
index bf98cad922..bf98cad922 100644
--- a/doc/src/images/windows-fontcombobox.png
+++ b/src/widgets/doc/images/windows-fontcombobox.png
diff --git a/doc/src/images/windows-frame.png b/src/widgets/doc/images/windows-frame.png
index 5979b31b25..5979b31b25 100644
--- a/doc/src/images/windows-frame.png
+++ b/src/widgets/doc/images/windows-frame.png
diff --git a/doc/src/images/windows-groupbox.png b/src/widgets/doc/images/windows-groupbox.png
index 88f46a3832..88f46a3832 100644
--- a/doc/src/images/windows-groupbox.png
+++ b/src/widgets/doc/images/windows-groupbox.png
diff --git a/doc/src/images/windows-horizontalscrollbar.png b/src/widgets/doc/images/windows-horizontalscrollbar.png
index 1f36b9a352..1f36b9a352 100644
--- a/doc/src/images/windows-horizontalscrollbar.png
+++ b/src/widgets/doc/images/windows-horizontalscrollbar.png
diff --git a/doc/src/images/windows-label.png b/src/widgets/doc/images/windows-label.png
index a1c3a396a9..a1c3a396a9 100644
--- a/doc/src/images/windows-label.png
+++ b/src/widgets/doc/images/windows-label.png
diff --git a/doc/src/images/windows-lcdnumber.png b/src/widgets/doc/images/windows-lcdnumber.png
index b463511aab..b463511aab 100644
--- a/doc/src/images/windows-lcdnumber.png
+++ b/src/widgets/doc/images/windows-lcdnumber.png
diff --git a/doc/src/images/windows-lineedit.png b/src/widgets/doc/images/windows-lineedit.png
index 270e4517ff..270e4517ff 100644
--- a/doc/src/images/windows-lineedit.png
+++ b/src/widgets/doc/images/windows-lineedit.png
diff --git a/doc/src/images/windows-listview.png b/src/widgets/doc/images/windows-listview.png
index 2884fae1b1..2884fae1b1 100644
--- a/doc/src/images/windows-listview.png
+++ b/src/widgets/doc/images/windows-listview.png
diff --git a/doc/src/images/windows-progressbar.png b/src/widgets/doc/images/windows-progressbar.png
index 361799a70e..361799a70e 100644
--- a/doc/src/images/windows-progressbar.png
+++ b/src/widgets/doc/images/windows-progressbar.png
diff --git a/doc/src/images/windows-pushbutton.png b/src/widgets/doc/images/windows-pushbutton.png
index 14528d6808..14528d6808 100644
--- a/doc/src/images/windows-pushbutton.png
+++ b/src/widgets/doc/images/windows-pushbutton.png
diff --git a/doc/src/images/windows-radiobutton.png b/src/widgets/doc/images/windows-radiobutton.png
index db328cb563..db328cb563 100644
--- a/doc/src/images/windows-radiobutton.png
+++ b/src/widgets/doc/images/windows-radiobutton.png
diff --git a/doc/src/images/windows-slider.png b/src/widgets/doc/images/windows-slider.png
index fde85024b6..fde85024b6 100644
--- a/doc/src/images/windows-slider.png
+++ b/src/widgets/doc/images/windows-slider.png
diff --git a/doc/src/images/windows-spinbox.png b/src/widgets/doc/images/windows-spinbox.png
index d4e93c584a..d4e93c584a 100644
--- a/doc/src/images/windows-spinbox.png
+++ b/src/widgets/doc/images/windows-spinbox.png
diff --git a/doc/src/images/windows-tableview.png b/src/widgets/doc/images/windows-tableview.png
index 89da89fb5f..89da89fb5f 100644
--- a/doc/src/images/windows-tableview.png
+++ b/src/widgets/doc/images/windows-tableview.png
diff --git a/doc/src/images/windows-tabwidget.png b/src/widgets/doc/images/windows-tabwidget.png
index 8622f7ec6a..8622f7ec6a 100644
--- a/doc/src/images/windows-tabwidget.png
+++ b/src/widgets/doc/images/windows-tabwidget.png
diff --git a/doc/src/images/windows-textedit.png b/src/widgets/doc/images/windows-textedit.png
index fd21ade02f..fd21ade02f 100644
--- a/doc/src/images/windows-textedit.png
+++ b/src/widgets/doc/images/windows-textedit.png
diff --git a/doc/src/images/windows-timeedit.png b/src/widgets/doc/images/windows-timeedit.png
index 6ae0e406bc..6ae0e406bc 100644
--- a/doc/src/images/windows-timeedit.png
+++ b/src/widgets/doc/images/windows-timeedit.png
diff --git a/doc/src/images/windows-toolbox.png b/src/widgets/doc/images/windows-toolbox.png
index 99b471e6df..99b471e6df 100644
--- a/doc/src/images/windows-toolbox.png
+++ b/src/widgets/doc/images/windows-toolbox.png
diff --git a/doc/src/images/windows-toolbutton.png b/src/widgets/doc/images/windows-toolbutton.png
index 9ceb846ed4..9ceb846ed4 100644
--- a/doc/src/images/windows-toolbutton.png
+++ b/src/widgets/doc/images/windows-toolbutton.png
diff --git a/doc/src/images/windows-treeview.png b/src/widgets/doc/images/windows-treeview.png
index f55cd69c79..f55cd69c79 100644
--- a/doc/src/images/windows-treeview.png
+++ b/src/widgets/doc/images/windows-treeview.png
diff --git a/doc/src/images/windowsvista-calendarwidget.png b/src/widgets/doc/images/windowsvista-calendarwidget.png
index 3cb1ab78dc..3cb1ab78dc 100644
--- a/doc/src/images/windowsvista-calendarwidget.png
+++ b/src/widgets/doc/images/windowsvista-calendarwidget.png
diff --git a/doc/src/images/windowsvista-checkbox.png b/src/widgets/doc/images/windowsvista-checkbox.png
index b9bc909988..b9bc909988 100644
--- a/doc/src/images/windowsvista-checkbox.png
+++ b/src/widgets/doc/images/windowsvista-checkbox.png
diff --git a/doc/src/images/windowsvista-combobox.png b/src/widgets/doc/images/windowsvista-combobox.png
index f53192f45a..f53192f45a 100644
--- a/doc/src/images/windowsvista-combobox.png
+++ b/src/widgets/doc/images/windowsvista-combobox.png
diff --git a/doc/src/images/windowsvista-dateedit.png b/src/widgets/doc/images/windowsvista-dateedit.png
index bb79482849..bb79482849 100644
--- a/doc/src/images/windowsvista-dateedit.png
+++ b/src/widgets/doc/images/windowsvista-dateedit.png
diff --git a/doc/src/images/windowsvista-datetimeedit.png b/src/widgets/doc/images/windowsvista-datetimeedit.png
index 0a104de084..0a104de084 100644
--- a/doc/src/images/windowsvista-datetimeedit.png
+++ b/src/widgets/doc/images/windowsvista-datetimeedit.png
diff --git a/doc/src/images/windowsvista-dial.png b/src/widgets/doc/images/windowsvista-dial.png
index 7081269c31..7081269c31 100644
--- a/doc/src/images/windowsvista-dial.png
+++ b/src/widgets/doc/images/windowsvista-dial.png
diff --git a/doc/src/images/windowsvista-doublespinbox.png b/src/widgets/doc/images/windowsvista-doublespinbox.png
index 6efa9379fd..6efa9379fd 100644
--- a/doc/src/images/windowsvista-doublespinbox.png
+++ b/src/widgets/doc/images/windowsvista-doublespinbox.png
diff --git a/doc/src/images/windowsvista-fontcombobox.png b/src/widgets/doc/images/windowsvista-fontcombobox.png
index 3771e84bd4..3771e84bd4 100644
--- a/doc/src/images/windowsvista-fontcombobox.png
+++ b/src/widgets/doc/images/windowsvista-fontcombobox.png
diff --git a/doc/src/images/windowsvista-frame.png b/src/widgets/doc/images/windowsvista-frame.png
index 63b8422d2b..63b8422d2b 100644
--- a/doc/src/images/windowsvista-frame.png
+++ b/src/widgets/doc/images/windowsvista-frame.png
diff --git a/doc/src/images/windowsvista-groupbox.png b/src/widgets/doc/images/windowsvista-groupbox.png
index 967d8878a7..967d8878a7 100644
--- a/doc/src/images/windowsvista-groupbox.png
+++ b/src/widgets/doc/images/windowsvista-groupbox.png
diff --git a/doc/src/images/windowsvista-horizontalscrollbar.png b/src/widgets/doc/images/windowsvista-horizontalscrollbar.png
index 996865d66c..996865d66c 100644
--- a/doc/src/images/windowsvista-horizontalscrollbar.png
+++ b/src/widgets/doc/images/windowsvista-horizontalscrollbar.png
diff --git a/doc/src/images/windowsvista-label.png b/src/widgets/doc/images/windowsvista-label.png
index caef8d8361..caef8d8361 100644
--- a/doc/src/images/windowsvista-label.png
+++ b/src/widgets/doc/images/windowsvista-label.png
diff --git a/doc/src/images/windowsvista-lcdnumber.png b/src/widgets/doc/images/windowsvista-lcdnumber.png
index 911438e2b1..911438e2b1 100644
--- a/doc/src/images/windowsvista-lcdnumber.png
+++ b/src/widgets/doc/images/windowsvista-lcdnumber.png
diff --git a/doc/src/images/windowsvista-lineedit.png b/src/widgets/doc/images/windowsvista-lineedit.png
index 9fcde3a851..9fcde3a851 100644
--- a/doc/src/images/windowsvista-lineedit.png
+++ b/src/widgets/doc/images/windowsvista-lineedit.png
diff --git a/doc/src/images/windowsvista-listview.png b/src/widgets/doc/images/windowsvista-listview.png
index 36a03438ab..36a03438ab 100644
--- a/doc/src/images/windowsvista-listview.png
+++ b/src/widgets/doc/images/windowsvista-listview.png
diff --git a/doc/src/images/windowsvista-progressbar.png b/src/widgets/doc/images/windowsvista-progressbar.png
index 0bda010811..0bda010811 100644
--- a/doc/src/images/windowsvista-progressbar.png
+++ b/src/widgets/doc/images/windowsvista-progressbar.png
diff --git a/doc/src/images/windowsvista-pushbutton.png b/src/widgets/doc/images/windowsvista-pushbutton.png
index 3bc438dc10..3bc438dc10 100644
--- a/doc/src/images/windowsvista-pushbutton.png
+++ b/src/widgets/doc/images/windowsvista-pushbutton.png
diff --git a/doc/src/images/windowsvista-radiobutton.png b/src/widgets/doc/images/windowsvista-radiobutton.png
index fdfd2d66dd..fdfd2d66dd 100644
--- a/doc/src/images/windowsvista-radiobutton.png
+++ b/src/widgets/doc/images/windowsvista-radiobutton.png
diff --git a/doc/src/images/windowsvista-slider.png b/src/widgets/doc/images/windowsvista-slider.png
index be2fffb7b5..be2fffb7b5 100644
--- a/doc/src/images/windowsvista-slider.png
+++ b/src/widgets/doc/images/windowsvista-slider.png
diff --git a/doc/src/images/windowsvista-spinbox.png b/src/widgets/doc/images/windowsvista-spinbox.png
index 4a2293e724..4a2293e724 100644
--- a/doc/src/images/windowsvista-spinbox.png
+++ b/src/widgets/doc/images/windowsvista-spinbox.png
diff --git a/doc/src/images/windowsvista-tableview.png b/src/widgets/doc/images/windowsvista-tableview.png
index 96f4937bc1..96f4937bc1 100644
--- a/doc/src/images/windowsvista-tableview.png
+++ b/src/widgets/doc/images/windowsvista-tableview.png
diff --git a/doc/src/images/windowsvista-tabwidget.png b/src/widgets/doc/images/windowsvista-tabwidget.png
index 259c4f1a89..259c4f1a89 100644
--- a/doc/src/images/windowsvista-tabwidget.png
+++ b/src/widgets/doc/images/windowsvista-tabwidget.png
diff --git a/doc/src/images/windowsvista-textedit.png b/src/widgets/doc/images/windowsvista-textedit.png
index 5e5696623e..5e5696623e 100644
--- a/doc/src/images/windowsvista-textedit.png
+++ b/src/widgets/doc/images/windowsvista-textedit.png
diff --git a/doc/src/images/windowsvista-timeedit.png b/src/widgets/doc/images/windowsvista-timeedit.png
index e24fdd268a..e24fdd268a 100644
--- a/doc/src/images/windowsvista-timeedit.png
+++ b/src/widgets/doc/images/windowsvista-timeedit.png
diff --git a/doc/src/images/windowsvista-toolbox.png b/src/widgets/doc/images/windowsvista-toolbox.png
index 8cfe5f9cab..8cfe5f9cab 100644
--- a/doc/src/images/windowsvista-toolbox.png
+++ b/src/widgets/doc/images/windowsvista-toolbox.png
diff --git a/doc/src/images/windowsvista-toolbutton.png b/src/widgets/doc/images/windowsvista-toolbutton.png
index 0baa9809c1..0baa9809c1 100644
--- a/doc/src/images/windowsvista-toolbutton.png
+++ b/src/widgets/doc/images/windowsvista-toolbutton.png
diff --git a/doc/src/images/windowsvista-treeview.png b/src/widgets/doc/images/windowsvista-treeview.png
index db211e4b5f..db211e4b5f 100644
--- a/doc/src/images/windowsvista-treeview.png
+++ b/src/widgets/doc/images/windowsvista-treeview.png
diff --git a/doc/src/images/windowsxp-calendarwidget.png b/src/widgets/doc/images/windowsxp-calendarwidget.png
index 9a5fa6ebcd..9a5fa6ebcd 100644
--- a/doc/src/images/windowsxp-calendarwidget.png
+++ b/src/widgets/doc/images/windowsxp-calendarwidget.png
diff --git a/doc/src/images/windowsxp-checkbox.png b/src/widgets/doc/images/windowsxp-checkbox.png
index 505d3a3641..505d3a3641 100644
--- a/doc/src/images/windowsxp-checkbox.png
+++ b/src/widgets/doc/images/windowsxp-checkbox.png
diff --git a/doc/src/images/windowsxp-combobox.png b/src/widgets/doc/images/windowsxp-combobox.png
index 2363c8401c..2363c8401c 100644
--- a/doc/src/images/windowsxp-combobox.png
+++ b/src/widgets/doc/images/windowsxp-combobox.png
diff --git a/doc/src/images/windowsxp-dateedit.png b/src/widgets/doc/images/windowsxp-dateedit.png
index 060ba07b2c..060ba07b2c 100644
--- a/doc/src/images/windowsxp-dateedit.png
+++ b/src/widgets/doc/images/windowsxp-dateedit.png
diff --git a/doc/src/images/windowsxp-datetimeedit.png b/src/widgets/doc/images/windowsxp-datetimeedit.png
index 4e41f0fc14..4e41f0fc14 100644
--- a/doc/src/images/windowsxp-datetimeedit.png
+++ b/src/widgets/doc/images/windowsxp-datetimeedit.png
diff --git a/doc/src/images/windowsxp-dial.png b/src/widgets/doc/images/windowsxp-dial.png
index 0aa3a26159..0aa3a26159 100644
--- a/doc/src/images/windowsxp-dial.png
+++ b/src/widgets/doc/images/windowsxp-dial.png
diff --git a/doc/src/images/windowsxp-doublespinbox.png b/src/widgets/doc/images/windowsxp-doublespinbox.png
index 3165a61b93..3165a61b93 100644
--- a/doc/src/images/windowsxp-doublespinbox.png
+++ b/src/widgets/doc/images/windowsxp-doublespinbox.png
diff --git a/doc/src/images/windowsxp-fontcombobox.png b/src/widgets/doc/images/windowsxp-fontcombobox.png
index 96292b84ef..96292b84ef 100644
--- a/doc/src/images/windowsxp-fontcombobox.png
+++ b/src/widgets/doc/images/windowsxp-fontcombobox.png
diff --git a/doc/src/images/windowsxp-frame.png b/src/widgets/doc/images/windowsxp-frame.png
index 5979b31b25..5979b31b25 100644
--- a/doc/src/images/windowsxp-frame.png
+++ b/src/widgets/doc/images/windowsxp-frame.png
diff --git a/doc/src/images/windowsxp-groupbox.png b/src/widgets/doc/images/windowsxp-groupbox.png
index 0b6f7e21ad..0b6f7e21ad 100644
--- a/doc/src/images/windowsxp-groupbox.png
+++ b/src/widgets/doc/images/windowsxp-groupbox.png
diff --git a/doc/src/images/windowsxp-horizontalscrollbar.png b/src/widgets/doc/images/windowsxp-horizontalscrollbar.png
index 38812ec107..38812ec107 100644
--- a/doc/src/images/windowsxp-horizontalscrollbar.png
+++ b/src/widgets/doc/images/windowsxp-horizontalscrollbar.png
diff --git a/doc/src/images/windowsxp-label.png b/src/widgets/doc/images/windowsxp-label.png
index a1c3a396a9..a1c3a396a9 100644
--- a/doc/src/images/windowsxp-label.png
+++ b/src/widgets/doc/images/windowsxp-label.png
diff --git a/doc/src/images/windowsxp-lcdnumber.png b/src/widgets/doc/images/windowsxp-lcdnumber.png
index 102023c8ed..102023c8ed 100644
--- a/doc/src/images/windowsxp-lcdnumber.png
+++ b/src/widgets/doc/images/windowsxp-lcdnumber.png
diff --git a/doc/src/images/windowsxp-lineedit.png b/src/widgets/doc/images/windowsxp-lineedit.png
index 9102b53ca4..9102b53ca4 100644
--- a/doc/src/images/windowsxp-lineedit.png
+++ b/src/widgets/doc/images/windowsxp-lineedit.png
diff --git a/doc/src/images/windowsxp-listview.png b/src/widgets/doc/images/windowsxp-listview.png
index b0fc9bd3a7..b0fc9bd3a7 100644
--- a/doc/src/images/windowsxp-listview.png
+++ b/src/widgets/doc/images/windowsxp-listview.png
diff --git a/src/widgets/doc/images/windowsxp-menu.png b/src/widgets/doc/images/windowsxp-menu.png
new file mode 100644
index 0000000000..b8ca947e73
--- /dev/null
+++ b/src/widgets/doc/images/windowsxp-menu.png
diff --git a/doc/src/images/windowsxp-progressbar.png b/src/widgets/doc/images/windowsxp-progressbar.png
index c8a73d6754..c8a73d6754 100644
--- a/doc/src/images/windowsxp-progressbar.png
+++ b/src/widgets/doc/images/windowsxp-progressbar.png
diff --git a/doc/src/images/windowsxp-pushbutton.png b/src/widgets/doc/images/windowsxp-pushbutton.png
index bf6b7bf15d..bf6b7bf15d 100644
--- a/doc/src/images/windowsxp-pushbutton.png
+++ b/src/widgets/doc/images/windowsxp-pushbutton.png
diff --git a/doc/src/images/windowsxp-radiobutton.png b/src/widgets/doc/images/windowsxp-radiobutton.png
index ad8a908fb2..ad8a908fb2 100644
--- a/doc/src/images/windowsxp-radiobutton.png
+++ b/src/widgets/doc/images/windowsxp-radiobutton.png
diff --git a/doc/src/images/windowsxp-slider.png b/src/widgets/doc/images/windowsxp-slider.png
index 9e2fca7c40..9e2fca7c40 100644
--- a/doc/src/images/windowsxp-slider.png
+++ b/src/widgets/doc/images/windowsxp-slider.png
diff --git a/doc/src/images/windowsxp-spinbox.png b/src/widgets/doc/images/windowsxp-spinbox.png
index e42073cd6b..e42073cd6b 100644
--- a/doc/src/images/windowsxp-spinbox.png
+++ b/src/widgets/doc/images/windowsxp-spinbox.png
diff --git a/doc/src/images/windowsxp-tableview.png b/src/widgets/doc/images/windowsxp-tableview.png
index 5d12137ad5..5d12137ad5 100644
--- a/doc/src/images/windowsxp-tableview.png
+++ b/src/widgets/doc/images/windowsxp-tableview.png
diff --git a/doc/src/images/windowsxp-tabwidget.png b/src/widgets/doc/images/windowsxp-tabwidget.png
index 3c8e777a0b..3c8e777a0b 100644
--- a/doc/src/images/windowsxp-tabwidget.png
+++ b/src/widgets/doc/images/windowsxp-tabwidget.png
diff --git a/doc/src/images/windowsxp-textedit.png b/src/widgets/doc/images/windowsxp-textedit.png
index d89c75c71b..d89c75c71b 100644
--- a/doc/src/images/windowsxp-textedit.png
+++ b/src/widgets/doc/images/windowsxp-textedit.png
diff --git a/doc/src/images/windowsxp-timeedit.png b/src/widgets/doc/images/windowsxp-timeedit.png
index 751cca9e6a..751cca9e6a 100644
--- a/doc/src/images/windowsxp-timeedit.png
+++ b/src/widgets/doc/images/windowsxp-timeedit.png
diff --git a/doc/src/images/windowsxp-toolbox.png b/src/widgets/doc/images/windowsxp-toolbox.png
index 99b471e6df..99b471e6df 100644
--- a/doc/src/images/windowsxp-toolbox.png
+++ b/src/widgets/doc/images/windowsxp-toolbox.png
diff --git a/doc/src/images/windowsxp-toolbutton.png b/src/widgets/doc/images/windowsxp-toolbutton.png
index ea63e16aae..ea63e16aae 100644
--- a/doc/src/images/windowsxp-toolbutton.png
+++ b/src/widgets/doc/images/windowsxp-toolbutton.png
diff --git a/doc/src/images/windowsxp-treeview.png b/src/widgets/doc/images/windowsxp-treeview.png
index 050cc2f4d6..050cc2f4d6 100644
--- a/doc/src/images/windowsxp-treeview.png
+++ b/src/widgets/doc/images/windowsxp-treeview.png
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
new file mode 100644
index 0000000000..c90f25338e
--- /dev/null
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project                 = QtWidgets
+description             = Qt Widgets Reference Documentation
+url                     = http://qt-project.org/doc/qt-5.0/qtwidgets
+version                 = 5.0.0
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = en_US
+qhp.projects            = QtWidgets
+
+qhp.QtWidgets.file         = qtwidgets.qhp
+qhp.QtWidgets.namespace           = org.qt-project.qtwidgets.500
+qhp.QtWidgets.virtualFolder       = qdoc
+qhp.QtWidgets.indexTitle          = Qt Widgets Reference Documentation
+qhp.QtWidgets.indexRoot           =
+
+qhp.QtWidgets.filterAttributes    = qtwidgets 5.0.0 qtrefdoc
+qhp.QtWidgets.customFilters.Qt.name = QtWidgets 5.0.0
+qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets 5.0.0
+qhp.QtWidgets.subprojects         = classes overviews examples
+qhp.QtWidgets.subprojects.classes.title = Classes
+qhp.QtWidgets.subprojects.classes.indexTitle = Qt Widgets' Classes
+qhp.QtWidgets.subprojects.classes.selectors = class fake:headerfile
+qhp.QtWidgets.subprojects.classes.sortPages = true
+qhp.QtWidgets.subprojects.overviews.title = Overviews
+qhp.QtWidgets.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.QtWidgets.subprojects.overviews.selectors = fake:page,group,module
+qhp.QtWidgets.subprojects.examples.title = Qt Widgets Examples
+qhp.QtWidgets.subprojects.examples.indexTitle = Qt Widgets Examples
+qhp.QtWidgets.subprojects.examples.selectors = fake:example
+
+dita.metadata.default.author      = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher   = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir               = ../../../doc/qtwidgets
+tagfile                 = ../../../doc/qtwidgets/qtwidgets.tags
+
+HTML.generatemacrefs    = "true"
+HTML.nobreadcrumbs      = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+    "</head>\n" \
+
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT_NO_EGL \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          QT_DEPRECATED_* \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus \
+                          Q_COMPILER_INITIALIZER_LISTS
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
+
+depends                 += qtcore qtgui
+
+headerdirs  += ..
+
+sourcedirs  += ..
+
+exampledirs += ../../../examples \
+               ../ \
+               snippets
+
+imagedirs   += images
diff --git a/doc/src/snippets/code/doc_src_layout.cpp b/src/widgets/doc/snippets/code/doc_src_layout.cpp
index b6abab61d3..b6abab61d3 100644
--- a/doc/src/snippets/code/doc_src_layout.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_layout.cpp
diff --git a/doc/src/snippets/code/doc_src_qt4-styles.cpp b/src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp
index 9bebb825e4..9bebb825e4 100644
--- a/doc/src/snippets/code/doc_src_qt4-styles.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp
diff --git a/src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp b/src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp
new file mode 100644
index 0000000000..74888e3891
--- /dev/null
+++ b/src/widgets/doc/snippets/code/doc_src_qtwidgets.cpp
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [1]
+#include <QtWidgets>
+//! [1]
diff --git a/src/widgets/doc/snippets/code/doc_src_qtwidgets.pro b/src/widgets/doc/snippets/code/doc_src_qtwidgets.pro
new file mode 100644
index 0000000000..7e3c633dd5
--- /dev/null
+++ b/src/widgets/doc/snippets/code/doc_src_qtwidgets.pro
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#! [0]
+QT += widgets
+#! [0]
diff --git a/doc/src/snippets/code/doc_src_styles.cpp b/src/widgets/doc/snippets/code/doc_src_styles.cpp
index 6c079c6637..6c079c6637 100644
--- a/doc/src/snippets/code/doc_src_styles.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_styles.cpp
diff --git a/doc/src/snippets/code/doc_src_stylesheet.cpp b/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp
index eb02634c6d..eb02634c6d 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.cpp
+++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.cpp
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
index 9acba09c67..9acba09c67 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/src/widgets/doc/snippets/code/doc_src_stylesheet.qdoc
diff --git a/doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
index 1a89ff327f..1a89ff327f 100644
--- a/doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfiledialog.cpp
diff --git a/doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qfontdialog.cpp
index e07ecbca3e..e07ecbca3e 100644
--- a/doc/src/snippets/code/src_gui_dialogs_qfontdialog.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qfontdialog.cpp
diff --git a/src/widgets/doc/snippets/code/src_gui_dialogs_qmessagebox.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qmessagebox.cpp
new file mode 100644
index 0000000000..90bc2e9b0a
--- /dev/null
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qmessagebox.cpp
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+int ret = QMessageBox::warning(this, tr("My Application"),
+                               tr("The document has been modified.\n"
+                                  "Do you want to save your changes?"),
+                               QMessageBox::Save | QMessageBox::Discard
+                               | QMessageBox::Cancel,
+                               QMessageBox::Save);
+//! [0]
+
+
+//! [1]
+QMessageBox msgBox;
+msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+switch (msgBox.exec()) {
+case QMessageBox::Yes:
+    // yes was clicked
+    break;
+case QMessageBox::No:
+    // no was clicked
+    break;
+default:
+    // should never be reached
+    break;
+}
+//! [1]
+
+
+//! [2]
+QMessageBox msgBox;
+QPushButton *connectButton = msgBox.addButton(tr("Connect"), QMessageBox::ActionRole);
+QPushButton *abortButton = msgBox.addButton(QMessageBox::Abort);
+
+msgBox.exec();
+
+if (msgBox.clickedButton() == connectButton) {
+    // connect
+} else if (msgBox.clickedButton() == abortButton) {
+    // abort
+}
+//! [2]
+
+
+//! [3]
+QMessageBox messageBox(this);
+QAbstractButton *disconnectButton =
+      messageBox.addButton(tr("Disconnect"), QMessageBox::ActionRole);
+...
+messageBox.exec();
+if (messageBox.clickedButton() == disconnectButton) {
+    ...
+}
+//! [3]
+
+
+//! [4]
+#include <QApplication>
+#include <QMessageBox>
+
+int main(int argc, char *argv[])
+{
+    QT_REQUIRE_VERSION(argc, argv, "4.0.2")
+
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [4]
+
+//! [5]
+QMessageBox msgBox;
+msgBox.setText("The document has been modified.");
+msgBox.exec();
+//! [5]
+
+//! [6]
+QMessageBox msgBox;
+msgBox.setText("The document has been modified.");
+msgBox.setInformativeText("Do you want to save your changes?");
+msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+msgBox.setDefaultButton(QMessageBox::Save);
+int ret = msgBox.exec();
+//! [6]
+
+//! [7]
+switch (ret) {
+  case QMessageBox::Save:
+      // Save was clicked
+      break;
+  case QMessageBox::Discard:
+      // Don't Save was clicked
+      break;
+  case QMessageBox::Cancel:
+      // Cancel was clicked
+      break;
+  default:
+      // should never be reached
+      break;
+}
+//! [7]
+
+//! [9]
+QMessageBox msgBox(this);
+msgBox.setText(tr("The document has been modified.\n"
+                  "Do you want to save your changes?"));
+msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard
+                          | QMessageBox::Cancel);
+msgBox.setDefaultButton(QMessageBox::Save);
+//! [9]
diff --git a/doc/src/snippets/code/src_gui_dialogs_qwizard.cpp b/src/widgets/doc/snippets/code/src_gui_dialogs_qwizard.cpp
index 47db20da99..47db20da99 100644
--- a/doc/src/snippets/code/src_gui_dialogs_qwizard.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_dialogs_qwizard.cpp
diff --git a/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp b/src/widgets/doc/snippets/code/src_gui_effects_qgraphicseffect.cpp
index 3e0b0b64ee..3e0b0b64ee 100644
--- a/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_effects_qgraphicseffect.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
index 9a974de016..9a974de016 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
index 01df05c084..01df05c084 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
index e3998201af..e3998201af 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
index e508dbfb2b..e508dbfb2b 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp
index 40b240c56f..40b240c56f 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp
index 0e9ceea6a0..0e9ceea6a0 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp
index d07b5f7cf6..d07b5f7cf6 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicsview.cpp
diff --git a/doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp
index da92f2d2e1..da92f2d2e1 100644
--- a/doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qicon.cpp b/src/widgets/doc/snippets/code/src_gui_image_qicon.cpp
index 28ebea8f65..28ebea8f65 100644
--- a/doc/src/snippets/code/src_gui_image_qicon.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_image_qicon.cpp
diff --git a/doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp b/src/widgets/doc/snippets/code/src_gui_image_qpixmapfilter.cpp
index 55d5aa4897..55d5aa4897 100644
--- a/doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_image_qpixmapfilter.cpp
diff --git a/doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qabstractitemview.cpp
index 2a497ff37c..2a497ff37c 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qabstractitemview.cpp
diff --git a/doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
index d968260d39..d968260d39 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp
diff --git a/doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp
index 3f1e11c04c..3f1e11c04c 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp
diff --git a/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
index ae91339867..ae91339867 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp
diff --git a/doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qtablewidget.cpp
index 169fff57b9..169fff57b9 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qtablewidget.cpp
diff --git a/doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp b/src/widgets/doc/snippets/code/src_gui_itemviews_qtreewidget.cpp
index b299d765f3..b299d765f3 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_itemviews_qtreewidget.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qaction.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qaction.cpp
index af876cd872..af876cd872 100644
--- a/doc/src/snippets/code/src_gui_kernel_qaction.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qaction.cpp
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
new file mode 100644
index 0000000000..b32e8c3f39
--- /dev/null
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+int main(int argc, char **argv)
+{
+#ifdef Q_WS_X11
+    bool useGUI = getenv("DISPLAY") != 0;
+#else
+    bool useGUI = true;
+#endif
+    QApplication app(argc, argv, useGUI);
+
+    if (useGUI) {
+       // start GUI version
+       ...
+    } else {
+       // start non-GUI version
+       ...
+    }
+    return app.exec();
+}
+//! [0]
+
+
+//! [1]
+QApplication::setStyle(new QWindowsStyle);
+//! [1]
+
+
+//! [2]
+int main(int argc, char *argv[])
+{
+    QApplication::setColorSpec(QApplication::ManyColor);
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [2]
+
+
+//! [3]
+QSize MyWidget::sizeHint() const
+{
+    return QSize(80, 25).expandedTo(QApplication::globalStrut());
+}
+//! [3]
+
+
+//! [4]
+void showAllHiddenTopLevelWidgets()
+{
+    foreach (QWidget *widget, QApplication::topLevelWidgets()) {
+        if (widget->isHidden())
+            widget->show();
+    }
+}
+//! [4]
+
+
+//! [5]
+void updateAllWidgets()
+{
+    foreach (QWidget *widget, QApplication::allWidgets())
+        widget->update();
+}
+//! [5]
+
+
+//! [6]
+int main(int argc, char *argv[])
+{
+    QApplication::setDesktopSettingsAware(false);
+    QApplication app(argc, argv);
+    ...
+    return app.exec();
+}
+//! [6]
+
+
+//! [7]
+if ((startPos - currentPos).manhattanLength() >=
+        QApplication::startDragDistance())
+    startTheDrag();
+//! [7]
+
+
+//! [8]
+void MyApplication::commitData(QSessionManager& manager)
+{
+    if (manager.allowsInteraction()) {
+        int ret = QMessageBox::warning(
+                    mainWindow,
+                    tr("My Application"),
+                    tr("Save changes to document?"),
+                    QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
+
+        switch (ret) {
+        case QMessageBox::Save:
+            manager.release();
+            if (!saveDocument())
+                manager.cancel();
+            break;
+        case QMessageBox::Discard:
+            break;
+        case QMessageBox::Cancel:
+        default:
+            manager.cancel();
+        }
+    } else {
+        // we did not get permission to interact, then
+        // do something reasonable instead
+    }
+}
+//! [8]
+
+
+//! [9]
+appname -session id
+//! [9]
+
+
+//! [10]
+foreach (const QString &command, mySession.restartCommand())
+    do_something(command);
+//! [10]
+
+
+//! [11]
+foreach (const QString &command, mySession.discardCommand())
+    do_something(command);
+//! [11]
+
+
+//! [12]
+QWidget *widget = qApp->widgetAt(x, y);
+if (widget)
+    widget = widget->window();
+//! [12]
+
+
+//! [13]
+QWidget *widget = qApp->widgetAt(point);
+if (widget)
+    widget = widget->window();
+//! [13]
diff --git a/doc/src/snippets/code/src_gui_kernel_qformlayout.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
index 1f7517b613..1f7517b613 100644
--- a/doc/src/snippets/code/src_gui_kernel_qformlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qformlayout.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qlayout.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qlayout.cpp
index cabd753b5d..cabd753b5d 100644
--- a/doc/src/snippets/code/src_gui_kernel_qlayout.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qlayout.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qlayoutitem.cpp
index 378253c605..378253c605 100644
--- a/doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qlayoutitem.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qshortcut.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qshortcut.cpp
index 31e3e3291e..31e3e3291e 100644
--- a/doc/src/snippets/code/src_gui_kernel_qshortcut.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qshortcut.cpp
diff --git a/doc/src/snippets/code/src_gui_kernel_qwidget.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp
index 3e94519073..3e94519073 100644
--- a/doc/src/snippets/code/src_gui_kernel_qwidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qwidget.cpp
diff --git a/doc/src/snippets/code/src_gui_painting_qdrawutil.cpp b/src/widgets/doc/snippets/code/src_gui_painting_qdrawutil.cpp
index 0f70fce8ef..0f70fce8ef 100644
--- a/doc/src/snippets/code/src_gui_painting_qdrawutil.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_painting_qdrawutil.cpp
diff --git a/doc/src/snippets/code/src_gui_qproxystyle.cpp b/src/widgets/doc/snippets/code/src_gui_qproxystyle.cpp
index ae9ff131aa..ae9ff131aa 100644
--- a/doc/src/snippets/code/src_gui_qproxystyle.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_qproxystyle.cpp
diff --git a/doc/src/snippets/code/src_gui_styles_qstyle.cpp b/src/widgets/doc/snippets/code/src_gui_styles_qstyle.cpp
index ed4ebb60a4..ed4ebb60a4 100644
--- a/doc/src/snippets/code/src_gui_styles_qstyle.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_styles_qstyle.cpp
diff --git a/doc/src/snippets/code/src_gui_styles_qstyleoption.cpp b/src/widgets/doc/snippets/code/src_gui_styles_qstyleoption.cpp
index 962212388f..962212388f 100644
--- a/doc/src/snippets/code/src_gui_styles_qstyleoption.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_styles_qstyleoption.cpp
diff --git a/doc/src/snippets/code/src_gui_util_qcompleter.cpp b/src/widgets/doc/snippets/code/src_gui_util_qcompleter.cpp
index 2e8eac17ad..2e8eac17ad 100644
--- a/doc/src/snippets/code/src_gui_util_qcompleter.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_util_qcompleter.cpp
diff --git a/doc/src/snippets/code/src_gui_util_qundostack.cpp b/src/widgets/doc/snippets/code/src_gui_util_qundostack.cpp
index 7e06a8ef6f..7e06a8ef6f 100644
--- a/doc/src/snippets/code/src_gui_util_qundostack.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_util_qundostack.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qabstractbutton.cpp
index 948ed0e958..948ed0e958 100644
--- a/doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qabstractbutton.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qabstractspinbox.cpp
index 66f3449760..66f3449760 100644
--- a/doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qabstractspinbox.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qcalendarwidget.cpp
index 6f99bdf0ce..6f99bdf0ce 100644
--- a/doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qcalendarwidget.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qcheckbox.cpp
index 71ee59bc85..71ee59bc85 100644
--- a/doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qcheckbox.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qdatetimeedit.cpp
index 5eb9e739ea..5eb9e739ea 100644
--- a/doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qdatetimeedit.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qdockwidget.cpp
index 690e3d5f33..690e3d5f33 100644
--- a/doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qdockwidget.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qframe.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qframe.cpp
index 6e3afcd8cf..6e3afcd8cf 100644
--- a/doc/src/snippets/code/src_gui_widgets_qframe.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qframe.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qgroupbox.cpp
index fc0339f690..fc0339f690 100644
--- a/doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qgroupbox.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qlabel.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qlabel.cpp
index 83b02a2f22..83b02a2f22 100644
--- a/doc/src/snippets/code/src_gui_widgets_qlabel.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qlabel.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qlineedit.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qlineedit.cpp
index 12ed38ad65..12ed38ad65 100644
--- a/doc/src/snippets/code/src_gui_widgets_qlineedit.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qlineedit.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmainwindow.cpp
index 3558922ec9..3558922ec9 100644
--- a/doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmainwindow.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qmenu.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
index 5799248bf4..5799248bf4 100644
--- a/doc/src/snippets/code/src_gui_widgets_qmenu.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmenu.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qmenubar.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qmenubar.cpp
index 412bc2d5eb..412bc2d5eb 100644
--- a/doc/src/snippets/code/src_gui_widgets_qmenubar.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qmenubar.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qplaintextedit.cpp
index 931c6c69a6..931c6c69a6 100644
--- a/doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qplaintextedit.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qpushbutton.cpp
index e0ae945620..e0ae945620 100644
--- a/doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qpushbutton.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qradiobutton.cpp
index a93809fa5d..a93809fa5d 100644
--- a/doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qradiobutton.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qrubberband.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qrubberband.cpp
index b8d6a14d1c..b8d6a14d1c 100644
--- a/doc/src/snippets/code/src_gui_widgets_qrubberband.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qrubberband.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qscrollarea.cpp
index 9c90a0c53d..9c90a0c53d 100644
--- a/doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qscrollarea.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qspinbox.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qspinbox.cpp
index fc1f5b7e47..fc1f5b7e47 100644
--- a/doc/src/snippets/code/src_gui_widgets_qspinbox.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qspinbox.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qsplashscreen.cpp
index 48f1051e2c..48f1051e2c 100644
--- a/doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qsplashscreen.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qsplitter.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qsplitter.cpp
index 18007a4cdf..18007a4cdf 100644
--- a/doc/src/snippets/code/src_gui_widgets_qsplitter.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qsplitter.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qstatusbar.cpp
index 6ea752b237..6ea752b237 100644
--- a/doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qstatusbar.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qtextbrowser.cpp
index ed30c2d80a..ed30c2d80a 100644
--- a/doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qtextbrowser.cpp
diff --git a/doc/src/snippets/code/src_gui_widgets_qtextedit.cpp b/src/widgets/doc/snippets/code/src_gui_widgets_qtextedit.cpp
index cd1ae62c84..cd1ae62c84 100644
--- a/doc/src/snippets/code/src_gui_widgets_qtextedit.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_widgets_qtextedit.cpp
diff --git a/doc/src/snippets/customstyle/customstyle.cpp b/src/widgets/doc/snippets/customstyle/customstyle.cpp
index 2e0843c49c..2e0843c49c 100644
--- a/doc/src/snippets/customstyle/customstyle.cpp
+++ b/src/widgets/doc/snippets/customstyle/customstyle.cpp
diff --git a/doc/src/snippets/customstyle/customstyle.h b/src/widgets/doc/snippets/customstyle/customstyle.h
index 437994d2e2..437994d2e2 100644
--- a/doc/src/snippets/customstyle/customstyle.h
+++ b/src/widgets/doc/snippets/customstyle/customstyle.h
diff --git a/src/widgets/doc/snippets/customstyle/customstyle.pro b/src/widgets/doc/snippets/customstyle/customstyle.pro
new file mode 100644
index 0000000000..af0ee4e141
--- /dev/null
+++ b/src/widgets/doc/snippets/customstyle/customstyle.pro
@@ -0,0 +1,2 @@
+HEADERS += customstyle.h
+SOURCES += customstyle.cpp main.cpp
diff --git a/src/widgets/doc/snippets/customstyle/main.cpp b/src/widgets/doc/snippets/customstyle/main.cpp
new file mode 100644
index 0000000000..b3bea3bd7b
--- /dev/null
+++ b/src/widgets/doc/snippets/customstyle/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [using a custom style]
+#include <QtGui>
+
+#include "customstyle.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication::setStyle(new CustomStyle);
+    QApplication app(argc, argv);
+    QSpinBox spinBox;
+    spinBox.show();
+    return app.exec();
+}
+//! [using a custom style]
diff --git a/doc/src/snippets/customviewstyle.cpp b/src/widgets/doc/snippets/customviewstyle.cpp
index 55a766d17d..55a766d17d 100644
--- a/doc/src/snippets/customviewstyle.cpp
+++ b/src/widgets/doc/snippets/customviewstyle.cpp
diff --git a/doc/src/snippets/dialogs/dialogs.cpp b/src/widgets/doc/snippets/dialogs/dialogs.cpp
index 78916f862c..78916f862c 100644
--- a/doc/src/snippets/dialogs/dialogs.cpp
+++ b/src/widgets/doc/snippets/dialogs/dialogs.cpp
diff --git a/doc/src/snippets/filedialogurls.cpp b/src/widgets/doc/snippets/filedialogurls.cpp
index b1e41cbcad..b1e41cbcad 100644
--- a/doc/src/snippets/filedialogurls.cpp
+++ b/src/widgets/doc/snippets/filedialogurls.cpp
diff --git a/doc/src/snippets/graphicssceneadditemsnippet.cpp b/src/widgets/doc/snippets/graphicssceneadditemsnippet.cpp
index 1130a59217..1130a59217 100644
--- a/doc/src/snippets/graphicssceneadditemsnippet.cpp
+++ b/src/widgets/doc/snippets/graphicssceneadditemsnippet.cpp
diff --git a/doc/src/snippets/javastyle.cpp b/src/widgets/doc/snippets/javastyle.cpp
index a00df57e82..a00df57e82 100644
--- a/doc/src/snippets/javastyle.cpp
+++ b/src/widgets/doc/snippets/javastyle.cpp
diff --git a/doc/src/snippets/layouts/layouts.cpp b/src/widgets/doc/snippets/layouts/layouts.cpp
index 49c341c048..49c341c048 100644
--- a/doc/src/snippets/layouts/layouts.cpp
+++ b/src/widgets/doc/snippets/layouts/layouts.cpp
diff --git a/doc/src/snippets/mainwindowsnippet.cpp b/src/widgets/doc/snippets/mainwindowsnippet.cpp
index 76305e9ce2..76305e9ce2 100644
--- a/doc/src/snippets/mainwindowsnippet.cpp
+++ b/src/widgets/doc/snippets/mainwindowsnippet.cpp
diff --git a/doc/src/snippets/mdiareasnippets.cpp b/src/widgets/doc/snippets/mdiareasnippets.cpp
index 711f25bd83..711f25bd83 100644
--- a/doc/src/snippets/mdiareasnippets.cpp
+++ b/src/widgets/doc/snippets/mdiareasnippets.cpp
diff --git a/doc/src/snippets/myscrollarea.cpp b/src/widgets/doc/snippets/myscrollarea.cpp
index a6a575f922..a6a575f922 100644
--- a/doc/src/snippets/myscrollarea.cpp
+++ b/src/widgets/doc/snippets/myscrollarea.cpp
diff --git a/doc/src/snippets/qlistwidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp
index 8e30f7979b..8e30f7979b 100644
--- a/doc/src/snippets/qlistwidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qlistwidget-using/mainwindow.cpp
diff --git a/doc/src/snippets/qmacnativewidget/main.mm b/src/widgets/doc/snippets/qmacnativewidget/main.mm
index 2c5c49769a..2c5c49769a 100644
--- a/doc/src/snippets/qmacnativewidget/main.mm
+++ b/src/widgets/doc/snippets/qmacnativewidget/main.mm
diff --git a/doc/src/snippets/qsplashscreen/main.cpp b/src/widgets/doc/snippets/qsplashscreen/main.cpp
index 49bc084412..49bc084412 100644
--- a/doc/src/snippets/qsplashscreen/main.cpp
+++ b/src/widgets/doc/snippets/qsplashscreen/main.cpp
diff --git a/doc/src/snippets/qstackedlayout/main.cpp b/src/widgets/doc/snippets/qstackedlayout/main.cpp
index 771c36c721..771c36c721 100644
--- a/doc/src/snippets/qstackedlayout/main.cpp
+++ b/src/widgets/doc/snippets/qstackedlayout/main.cpp
diff --git a/doc/src/snippets/qstackedwidget/main.cpp b/src/widgets/doc/snippets/qstackedwidget/main.cpp
index 9a29d773e6..9a29d773e6 100644
--- a/doc/src/snippets/qstackedwidget/main.cpp
+++ b/src/widgets/doc/snippets/qstackedwidget/main.cpp
diff --git a/doc/src/snippets/qstyleoption/main.cpp b/src/widgets/doc/snippets/qstyleoption/main.cpp
index 78f663012c..78f663012c 100644
--- a/doc/src/snippets/qstyleoption/main.cpp
+++ b/src/widgets/doc/snippets/qstyleoption/main.cpp
diff --git a/doc/src/snippets/qstyleplugin/main.cpp b/src/widgets/doc/snippets/qstyleplugin/main.cpp
index 10a122016f..10a122016f 100644
--- a/doc/src/snippets/qstyleplugin/main.cpp
+++ b/src/widgets/doc/snippets/qstyleplugin/main.cpp
diff --git a/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp
index f3ab01784e..f3ab01784e 100644
--- a/doc/src/snippets/qtablewidget-resizing/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtablewidget-resizing/mainwindow.cpp
diff --git a/doc/src/snippets/qtablewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
index b03a5e4999..b03a5e4999 100644
--- a/doc/src/snippets/qtablewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtablewidget-using/mainwindow.cpp
diff --git a/doc/src/snippets/qtreewidget-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
index 2a62c3e5f8..2a62c3e5f8 100644
--- a/doc/src/snippets/qtreewidget-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtreewidget-using/mainwindow.cpp
diff --git a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp b/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
index a0648b18c5..a0648b18c5 100644
--- a/doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
+++ b/src/widgets/doc/snippets/qtreewidgetitemiterator-using/mainwindow.cpp
diff --git a/doc/src/snippets/shareddirmodel/main.cpp b/src/widgets/doc/snippets/shareddirmodel/main.cpp
index 78d439b752..78d439b752 100644
--- a/doc/src/snippets/shareddirmodel/main.cpp
+++ b/src/widgets/doc/snippets/shareddirmodel/main.cpp
diff --git a/doc/src/snippets/splitter/splitter.cpp b/src/widgets/doc/snippets/splitter/splitter.cpp
index 3908f1b0e3..3908f1b0e3 100644
--- a/doc/src/snippets/splitter/splitter.cpp
+++ b/src/widgets/doc/snippets/splitter/splitter.cpp
diff --git a/doc/src/snippets/splitterhandle/splitter.cpp b/src/widgets/doc/snippets/splitterhandle/splitter.cpp
index b8b729bb91..b8b729bb91 100644
--- a/doc/src/snippets/splitterhandle/splitter.cpp
+++ b/src/widgets/doc/snippets/splitterhandle/splitter.cpp
diff --git a/doc/src/snippets/splitterhandle/splitter.h b/src/widgets/doc/snippets/splitterhandle/splitter.h
index ba310b9e8d..ba310b9e8d 100644
--- a/doc/src/snippets/splitterhandle/splitter.h
+++ b/src/widgets/doc/snippets/splitterhandle/splitter.h
diff --git a/doc/src/snippets/styles/styles.cpp b/src/widgets/doc/snippets/styles/styles.cpp
index 1109669bcb..1109669bcb 100644
--- a/doc/src/snippets/styles/styles.cpp
+++ b/src/widgets/doc/snippets/styles/styles.cpp
diff --git a/doc/src/snippets/stylesheet/common-mistakes.cpp b/src/widgets/doc/snippets/stylesheet/common-mistakes.cpp
index d4552fcf1d..d4552fcf1d 100644
--- a/doc/src/snippets/stylesheet/common-mistakes.cpp
+++ b/src/widgets/doc/snippets/stylesheet/common-mistakes.cpp
diff --git a/doc/src/snippets/textdocument-imagedrop/textedit.cpp b/src/widgets/doc/snippets/textdocument-imagedrop/textedit.cpp
index fbb6f73ddc..fbb6f73ddc 100644
--- a/doc/src/snippets/textdocument-imagedrop/textedit.cpp
+++ b/src/widgets/doc/snippets/textdocument-imagedrop/textedit.cpp
diff --git a/doc/src/snippets/timeline/main.cpp b/src/widgets/doc/snippets/timeline/main.cpp
index f4be7f3c5b..f4be7f3c5b 100644
--- a/doc/src/snippets/timeline/main.cpp
+++ b/src/widgets/doc/snippets/timeline/main.cpp
diff --git a/doc/src/snippets/whatsthis/whatsthis.cpp b/src/widgets/doc/snippets/whatsthis/whatsthis.cpp
index 3d3f65d317..3d3f65d317 100644
--- a/doc/src/snippets/whatsthis/whatsthis.cpp
+++ b/src/widgets/doc/snippets/whatsthis/whatsthis.cpp
diff --git a/doc/src/snippets/widget-mask/main.cpp b/src/widgets/doc/snippets/widget-mask/main.cpp
index 18653deb4c..18653deb4c 100644
--- a/doc/src/snippets/widget-mask/main.cpp
+++ b/src/widgets/doc/snippets/widget-mask/main.cpp
diff --git a/doc/src/snippets/widgetdelegate.cpp b/src/widgets/doc/snippets/widgetdelegate.cpp
index 4d2a6559a5..4d2a6559a5 100644
--- a/doc/src/snippets/widgetdelegate.cpp
+++ b/src/widgets/doc/snippets/widgetdelegate.cpp
diff --git a/doc/src/widgets/qtwidgets.qdoc b/src/widgets/doc/src/qtwidgets.qdoc
index 4be460a2ab..9267b0fb44 100644
--- a/doc/src/widgets/qtwidgets.qdoc
+++ b/src/widgets/doc/src/qtwidgets.qdoc
@@ -35,11 +35,11 @@
     To include the definitions of the module's classes, use the
     following directive:
 
-    \snippet doc/src/snippets/code/doc_src_qtwidgets.cpp 1
+    \snippet code/doc_src_qtwidgets.cpp 1
 
     To link against the module, add this line to your \l qmake \c
     .pro file:
 
-    \snippet doc/src/snippets/code/doc_src_qtwidgets.pro 0
+    \snippet code/doc_src_qtwidgets.pro 0
 */
 
diff --git a/doc/src/widgets/widgets-and-layouts/focus.qdoc b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
index 60f05948b4..60f05948b4 100644
--- a/doc/src/widgets/widgets-and-layouts/focus.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/focus.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-cde.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-cde.qdoc
index a74cab0509..a74cab0509 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-cde.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-cde.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-cleanlooks.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-cleanlooks.qdoc
index bed6d0ca40..bed6d0ca40 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-cleanlooks.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-cleanlooks.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-gtk.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc
index 820f0b4140..820f0b4140 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-gtk.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-gtk.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-macintosh.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc
index 488a3f7665..488a3f7665 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-macintosh.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-macintosh.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-motif.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-motif.qdoc
index 5cbffc5516..5cbffc5516 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-motif.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-motif.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-plastique.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-plastique.qdoc
index 359fac8018..359fac8018 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-plastique.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-plastique.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-windows.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc
index b118c845c6..b118c845c6 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-windows.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-windows.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-windowsvista.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc
index db1a7cee90..db1a7cee90 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-windowsvista.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsvista.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery-windowsxp.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc
index 2ade5681e2..2ade5681e2 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery-windowsxp.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery-windowsxp.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/gallery.qdoc b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
index a2f4db5a7b..a2f4db5a7b 100644
--- a/doc/src/widgets/widgets-and-layouts/gallery.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/gallery.qdoc
diff --git a/doc/src/widgets/widgets-and-layouts/layout.qdoc b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
index 6e1a5f70e1..807f9ae8f9 100644
--- a/doc/src/widgets/widgets-and-layouts/layout.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/layout.qdoc
@@ -118,25 +118,25 @@
     The following code creates a QHBoxLayout that manages the geometry of five
     \l{QPushButton}{QPushButtons}, as shown on the first screenshot above:
 
-    \snippet doc/src/snippets/layouts/layouts.cpp 0
-    \snippet doc/src/snippets/layouts/layouts.cpp 1
-    \snippet doc/src/snippets/layouts/layouts.cpp 2
+    \snippet layouts/layouts.cpp 0
+    \snippet layouts/layouts.cpp 1
+    \snippet layouts/layouts.cpp 2
     \codeline
-    \snippet doc/src/snippets/layouts/layouts.cpp 3
-    \snippet doc/src/snippets/layouts/layouts.cpp 4
-    \snippet doc/src/snippets/layouts/layouts.cpp 5
+    \snippet layouts/layouts.cpp 3
+    \snippet layouts/layouts.cpp 4
+    \snippet layouts/layouts.cpp 5
 
     The code for QVBoxLayout is identical, except the line where the layout is
     created. The code for QGridLayout is a bit different, because we need to
     specify the row and column position of the child widget:
 
-    \snippet doc/src/snippets/layouts/layouts.cpp 12
-    \snippet doc/src/snippets/layouts/layouts.cpp 13
-    \snippet doc/src/snippets/layouts/layouts.cpp 14
+    \snippet layouts/layouts.cpp 12
+    \snippet layouts/layouts.cpp 13
+    \snippet layouts/layouts.cpp 14
     \codeline
-    \snippet doc/src/snippets/layouts/layouts.cpp 15
-    \snippet doc/src/snippets/layouts/layouts.cpp 16
-    \snippet doc/src/snippets/layouts/layouts.cpp 17
+    \snippet layouts/layouts.cpp 15
+    \snippet layouts/layouts.cpp 16
+    \snippet layouts/layouts.cpp 17
 
     The third QPushButton spans 2 columns. This is possible by specifying 2 as
     the fifth argument to QGridLayout::addWidget().
@@ -147,13 +147,13 @@
     QFormLayout to place three \l{QPushButton}{QPushButtons} and a corresponding
     QLineEdit on a row. 
     
-    \snippet doc/src/snippets/layouts/layouts.cpp 18
-    \snippet doc/src/snippets/layouts/layouts.cpp 19
-    \snippet doc/src/snippets/layouts/layouts.cpp 20
+    \snippet layouts/layouts.cpp 18
+    \snippet layouts/layouts.cpp 19
+    \snippet layouts/layouts.cpp 20
     \codeline
-    \snippet doc/src/snippets/layouts/layouts.cpp 21
-    \snippet doc/src/snippets/layouts/layouts.cpp 22
-    \snippet doc/src/snippets/layouts/layouts.cpp 23
+    \snippet layouts/layouts.cpp 21
+    \snippet layouts/layouts.cpp 22
+    \snippet layouts/layouts.cpp 23
 
 
     \section2 Tips for Using Layouts
@@ -319,16 +319,16 @@
 
     \section2 The Header File (\c card.h)
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 0
+    \snippet code/doc_src_layout.cpp 0
 
 
     \section2 The Implementation File (\c card.cpp)
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 1
+    \snippet code/doc_src_layout.cpp 1
 
     First we define \c{count()} to fetch the number of items in the list.
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 2
+    \snippet code/doc_src_layout.cpp 2
 
     Then we define two functions that iterate over the layout: \c{itemAt()}
     and \c{takeAt()}. These functions are used internally by the layout system
@@ -341,7 +341,7 @@
     structure, we may have to spend more effort defining a linear order for the
     items.
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 3
+    \snippet code/doc_src_layout.cpp 3
 
     \c{addItem()} implements the default placement strategy for layout items.
     This function must be implemented. It is used by QLayout::add(), by the
@@ -351,26 +351,26 @@
     QGridLayout::addItem(), QGridLayout::addWidget(), and
     QGridLayout::addLayout().
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 4
+    \snippet code/doc_src_layout.cpp 4
 
     The layout takes over responsibility of the items added. Since QLayoutItem
     does not inherit QObject, we must delete the items manually. In the 
     destructor, we remove each item from the list using \c{takeAt()}, and
     then delete it.
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 5
+    \snippet code/doc_src_layout.cpp 5
 
     The \c{setGeometry()} function actually performs the layout. The rectangle
     supplied as an argument does not include \c{margin()}. If relevant, use
     \c{spacing()} as the distance between items.
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 6
+    \snippet code/doc_src_layout.cpp 6
 
     \c{sizeHint()} and \c{minimumSize()} are normally very similar in
     implementation. The sizes returned by both functions should include
     \c{spacing()}, but not \c{margin()}.
 
-    \snippet doc/src/snippets/code/doc_src_layout.cpp 7
+    \snippet code/doc_src_layout.cpp 7
 
 
     \section2 Further Notes
diff --git a/doc/src/widgets/widgets-and-layouts/styles.qdoc b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
index b9e3a30333..d6706d7994 100644
--- a/doc/src/widgets/widgets-and-layouts/styles.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/styles.qdoc
@@ -283,21 +283,21 @@
     pointer type is correct. If the object isn't of the right type,
     qstyleoption_cast() returns 0. For example:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-styles.cpp 0
+    \snippet code/doc_src_qt4-styles.cpp 0
 
     The following code snippet illustrates how to use QStyle to
     draw the focus rectangle from a custom widget's paintEvent():
 
-    \snippet doc/src/snippets/code/doc_src_qt4-styles.cpp 1
+    \snippet code/doc_src_qt4-styles.cpp 1
 
     The next example shows how to derive from an existing style to
     customize the look of a graphical element:
 
-    \snippet doc/src/snippets/customstyle/customstyle.h 0
+    \snippet customstyle/customstyle.h 0
     \codeline
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 2
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 3
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 4
+    \snippet customstyle/customstyle.cpp 2
+    \snippet customstyle/customstyle.cpp 3
+    \snippet customstyle/customstyle.cpp 4
 
     \section2 QStyle Functions
 
@@ -542,7 +542,7 @@
     We start with a look at how QCheckBox builds it style option,
     which is QStyleOptionButton for checkboxes:
 
-    \snippet doc/src/snippets/code/doc_src_styles.cpp 0
+    \snippet code/doc_src_styles.cpp 0
 
     First we let QStyleOption set up the option with the information
     that is common for all widgets with \c initFrom().  We will look at
@@ -561,7 +561,7 @@
     attributes that are common for all widgets. We print its
     implementation here:
 
-    \snippet doc/src/snippets/code/doc_src_styles.cpp 1
+    \snippet code/doc_src_styles.cpp 1
 
     The State_Enabled is set when the widget is enabled. When the
     widget has focus the State_HasFocus flag is set. Equally, the
@@ -625,7 +625,7 @@
     notably, it wraps the methods in QStyle used for painting. The
     QCheckBox draws itself as follows:
 
-    \snippet doc/src/snippets/code/doc_src_styles.cpp 2
+    \snippet code/doc_src_styles.cpp 2
 
     QCommonStyle handles the CE_CheckBox element. The QCheckBox
     has two sub elements: SE_CheckBoxIndicator (the checked indicator)
@@ -633,7 +633,7 @@
     checkbox label). QCommonStyle also implements these sub element
     bounding rectangles. We have a look at the QCommonStyle code:
 
-    \snippet doc/src/snippets/code/doc_src_styles.cpp 3
+    \snippet code/doc_src_styles.cpp 3
 
     As can be seen from the code extract, the common style gets
     the bounding rectangles of the two sub elements of
@@ -644,7 +644,7 @@
     handles CE_CheckboxLabel. We will examine each implementation and
     start with CE_CheckBoxLabel:
 
-    \snippet doc/src/snippets/code/doc_src_styles.cpp 4
+    \snippet code/doc_src_styles.cpp 4
 
     \l{QStyle::}{visualAlignment()} adjusts the alignment of text
     according to the layout direction. We then draw an icon if it
@@ -663,7 +663,7 @@
     We take a look at the java implementation
     of CE_CheckBoxIndicator in \c drawControl():
 
-    \snippet doc/src/snippets/javastyle.cpp 0
+    \snippet javastyle.cpp 0
 
     We first save the state of the painter. This is not always
     necessary but in this case the QWindowsStyle needs the painter in
@@ -682,7 +682,7 @@
     here if the widget is disabled. We would then have to use
     another image with the indicator in the disabled color.
 
-    \snippet doc/src/snippets/javastyle.cpp 1
+    \snippet javastyle.cpp 1
 
     We have seen how check boxes are styled in the java style from the
     widget gets a paint request to the style is finished painting. To
diff --git a/doc/src/widgets/widgets-and-layouts/stylesheet.qdoc b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
index eaedb847c8..3b31efbdfc 100644
--- a/doc/src/widgets/widgets-and-layouts/stylesheet.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -73,7 +73,7 @@
     \l{QLineEdit}s should use yellow as their background color, and
     all \l{QCheckBox}es should use red as the text color:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 0
+    \snippet code/doc_src_stylesheet.qdoc 0
 
     For this kind of customization, style sheets are much more
     powerful than QPalette. For example, it might be tempting to set
@@ -157,7 +157,7 @@
     the \e{declaration} specifies which properties should be set on
     the widget. For example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 1
+    \snippet code/doc_src_stylesheet.qdoc 1
 
     In the above style rule, \c QPushButton is the selector and \c{{
     color: red }} is the declaration. The rule specifies that
@@ -174,17 +174,17 @@
     using commas (\c{,}) to separate the selectors. For example,
     the rule
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 2
+    \snippet code/doc_src_stylesheet.qdoc 2
 
     is equivalent to this sequence of three rules:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 3
+    \snippet code/doc_src_stylesheet.qdoc 3
 
     The declaration part of a style rule is a list of
     \tt{\e{property}: \e{value}} pairs, enclosed in braces (\c{{}})
     and separated with semicolons. For example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 4
+    \snippet code/doc_src_stylesheet.qdoc 4
 
     See the \l{List of Properties} section below for the list of
     properties provided by Qt widgets.
@@ -271,7 +271,7 @@
     possible to restrict the application of a rule to specific widget
     subcontrols. For example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 5
+    \snippet code/doc_src_stylesheet.qdoc 5
 
     The above rule styles the drop-down button of all \l{QComboBox}es.
     Although the double-colon (\c{::}) syntax is reminiscent of CSS3
@@ -295,7 +295,7 @@
     rectangle of the QComboBox instead of the default Padding rectangle, we
     can specify:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 6
+    \snippet code/doc_src_stylesheet.qdoc 6
 
     The alignment of the drop-down within the Margin rectangle is changed
     using \l{Qt Style Sheets Reference#subcontrol-position-prop}
@@ -314,7 +314,7 @@
     pressed, we might like the arrow inside to be offset to give a
     "pressed" effect. To achieve this, we can specify:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 7
+    \snippet code/doc_src_stylesheet.qdoc 7
 
     The absolute positioning scheme
     (\l{Qt Style Sheets Reference#position-prop}{position} : absolute),
@@ -340,34 +340,34 @@
     (\c{:}) in between. For example, the following rule applies when
     the mouse hovers over a QPushButton:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 8
+    \snippet code/doc_src_stylesheet.qdoc 8
 
     Pseudo-states can be negated using the exclamation operator. For
     example, the following rule applies when the mouse does not hover
     over a QRadioButton:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 9
+    \snippet code/doc_src_stylesheet.qdoc 9
 
     Pseudo-states can be chained, in which case a logical AND is
     implied. For example, the following rule applies to when the
     mouse hovers over a checked QCheckBox:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 10
+    \snippet code/doc_src_stylesheet.qdoc 10
 
     Negated Pseudo-states may appear in Pseudo-state chains. For example,
     the following rule applies when the mouse hovers over a QPushButton
     that is not pressed:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 11
+    \snippet code/doc_src_stylesheet.qdoc 11
 
     If needed, logical OR can be expressed using the comma operator:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 12
+    \snippet code/doc_src_stylesheet.qdoc 12
 
     Pseudo-states can appear in combination with subcontrols. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 13
+    \snippet code/doc_src_stylesheet.qdoc 13
 
     See the \l{List of Pseudo-States} section below for the list of
     pseudo-states provided by Qt widgets.
@@ -378,7 +378,7 @@
     properties with different values. Consider the following style
     sheet:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 14
+    \snippet code/doc_src_stylesheet.qdoc 14
 
     Both rules match QPushButton instances called \c okButton and
     there is a conflict for the \c color property. To resolve this
@@ -393,27 +393,27 @@
     sheet specifies that a \l{QPushButton} should have white text
     when the mouse is hovering over it, otherwise red text:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 15
+    \snippet code/doc_src_stylesheet.qdoc 15
 
     Here's a tricky one:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 16
+    \snippet code/doc_src_stylesheet.qdoc 16
 
     Here, both selectors have the same specificity, so if the mouse
     hovers over the button while it is enabled, the second rule takes
     precedence. If we want the text to be white in that case, we can
     reorder the rules like this:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 17
+    \snippet code/doc_src_stylesheet.qdoc 17
 
     Alternatively, we can make the first rule more specific:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 18
+    \snippet code/doc_src_stylesheet.qdoc 18
 
     A similar issue arises in conjunction with Type Selectors.
     Consider the following example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 19
+    \snippet code/doc_src_stylesheet.qdoc 19
 
     Both rules apply to QPushButton instances (since QPushButton
     inherits QAbstractButton) and there is a conflict for the
@@ -447,7 +447,7 @@
 
     \e{Some examples:}
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 20
+    \snippet code/doc_src_stylesheet.qdoc 20
     \endquotation
 
     \section1 Cascading
@@ -469,11 +469,11 @@
     sheet. Consider the following example. First, we set a style
     sheet on the QApplication:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 21
+    \snippet code/doc_src_stylesheet.cpp 21
 
     Then we set a style sheet on a QPushButton object:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 22
+    \snippet code/doc_src_stylesheet.cpp 22
 
     The style sheet on the QPushButton forces the QPushButton (and
     any child widget) to have blue text, in spite of the more
@@ -481,7 +481,7 @@
 
     The result would have been the same if we had written
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 23
+    \snippet code/doc_src_stylesheet.cpp 23
 
     except that if the QPushButton had children (which is unlikely),
     the style sheet would have no impact on them.
@@ -500,14 +500,14 @@
 
     For example, consider a QPushButton inside a QGroupBox:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 24
+    \snippet code/doc_src_stylesheet.cpp 24
 
     The QPushButton does not have an explicit color set. Hence, instead
     of inheriting color of its parent QGroupBox, it has the system color.
     If we want to set the color on a QGroupBox and its children,
     we can write:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 25
+    \snippet code/doc_src_stylesheet.cpp 25
 
     In contrast, setting a font and propagate using QWidget::setFont() and
     QWidget::setPalette() propagates to child widgets.
@@ -517,7 +517,7 @@
     The Type Selector can be used to style widgets of a particular type. For
     example,
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 26
+    \snippet code/doc_src_stylesheet.cpp 26
 
     Qt Style Sheet uses QObject::className() of the widget to determine
     when to apply the Type Selector. When custom widgets are inside namespaces,
@@ -526,7 +526,7 @@
     when using the Type Selector for widgets inside namespaces, we must
     replace the "::" with "--". For example,
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 27
+    \snippet code/doc_src_stylesheet.cpp 27
 
     \section1 Setting QObject properties
 
@@ -534,7 +534,7 @@
     can be set using the qproperty-<property name> syntax.
 
     For example,
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 28
+    \snippet code/doc_src_stylesheet.qdoc 28
 
     If the property references an enum declared with Q_ENUMS, you should
     reference its constants by name, i.e., not their numeric value.
@@ -982,7 +982,7 @@
            because, by default, the QPushButton draws a native border which completely
            overlaps the background-color. For example,
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 30
+           \snippet code/doc_src_stylesheet.qdoc 30
 
            See \l{Qt Style Sheets Examples#Customizing QPushButton}{Customizing QPushButton}
            for an example.
@@ -1260,7 +1260,7 @@
            because, by default, the QToolButton draws a native border which completely
            overlaps the background-color. For example,
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 31
+           \snippet code/doc_src_stylesheet.qdoc 31
 
            See \l{Qt Style Sheets Examples#Customizing QToolButton}{Customizing QToolButton}
            for an example.
@@ -1328,7 +1328,7 @@
 
            If you subclass from QWidget, you need to provide a paintEvent for your
            custom QWidget as below:
-           \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 32
+           \snippet code/doc_src_stylesheet.cpp 32
 
            The above code is a no-operation if there is no stylesheet set.
 
@@ -1364,7 +1364,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 33
+           \snippet code/doc_src_stylesheet.qdoc 33
 
            See also \l{Qt Style Sheets Reference#background-prop}{background} and
            \l{#selection-background-color-prop}{selection-background-color}.
@@ -1384,7 +1384,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 34
+           \snippet code/doc_src_stylesheet.qdoc 34
 
 
            Often, it is required to set a fill pattern similar to the styles
@@ -1395,7 +1395,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 35
+           \snippet code/doc_src_stylesheet.qdoc 35
 
            See also \l{#background-origin-prop}{background-origin},
            \l{#selection-background-color-prop}{selection-background-color},
@@ -1410,7 +1410,7 @@
 
            Examples:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 36
+           \snippet code/doc_src_stylesheet.qdoc 36
 
     \row
         \li \c background-image \target background-image-prop
@@ -1421,7 +1421,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 37
+           \snippet code/doc_src_stylesheet.qdoc 37
 
     \row
         \li \c background-repeat \target background-repeat-prop
@@ -1434,7 +1434,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 38
+           \snippet code/doc_src_stylesheet.qdoc 38
 
     \row
         \li \c background-position
@@ -1447,7 +1447,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 39
+           \snippet code/doc_src_stylesheet.qdoc 39
 
     \row
         \li \b{\c background-attachment} \target background-attachment-prop
@@ -1458,7 +1458,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 40
+           \snippet code/doc_src_stylesheet.qdoc 40
 
         See also \l{Qt Style Sheets Reference#background-prop}{background}
 
@@ -1481,7 +1481,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 41
+           \snippet code/doc_src_stylesheet.qdoc 41
 
            See also \l{Qt Style Sheets Reference#background-prop}{background},
            \l{#background-origin-prop}{background-origin} and \l{The Box Model}.
@@ -1503,7 +1503,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 42
+           \snippet code/doc_src_stylesheet.qdoc 42
 
            See also \l{Qt Style Sheets Reference#background-prop}{background} and
            \l{The Box Model}.
@@ -1523,7 +1523,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 43
+           \snippet code/doc_src_stylesheet.qdoc 43
 
     \row
         \li \c border-top
@@ -1573,7 +1573,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 44
+           \snippet code/doc_src_stylesheet.qdoc 44
 
            See also \l{Qt Style Sheets Reference#border-style-prop}{border-style},
            \l{Qt Style Sheets Reference#border-width-prop}{border-width},
@@ -1638,7 +1638,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 45
+           \snippet code/doc_src_stylesheet.qdoc 45
 
            See also \l{Qt Style Sheets Reference#border-width-prop}{border-width} and
            \l{The Box Model}.
@@ -1681,7 +1681,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 46
+           \snippet code/doc_src_stylesheet.qdoc 46
 
            See also \l{#border-color-prop}{border-color},
            \l{Qt Style Sheets Reference#border-style-prop}{border-style},
@@ -1722,7 +1722,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 47
+           \snippet code/doc_src_stylesheet.qdoc 47
 
            See also \l{#border-color-prop}{border-color},
            \l{#border-radius-prop}{border-radius},
@@ -1766,7 +1766,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 48
+           \snippet code/doc_src_stylesheet.qdoc 48
 
            See also \l{Qt Style Sheets Reference#left-prop}{left}, \l{#right-prop}{right}, and
            \l{Qt Style Sheets Reference#top-prop}{top}.
@@ -1787,7 +1787,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 49
+           \snippet code/doc_src_stylesheet.qdoc 49
 
     \row
         \li \b{\c color} \target color-prop
@@ -1803,7 +1803,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 50
+           \snippet code/doc_src_stylesheet.qdoc 50
 
            See also \l{Qt Style Sheets Reference#background-prop}{background} and
            \l{#selection-color-prop}{selection-color}.
@@ -1819,7 +1819,7 @@
         See the \l{Qt Style Sheets Reference#list of icons}{List of Icons}
         section for information on how to set icons.
 
-        \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 51
+        \snippet code/doc_src_stylesheet.qdoc 51
 
         \note Styles defining this property must be applied before the
         QDialogButtonBox is created; this means that you must apply the
@@ -1837,7 +1837,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 52
+           \snippet code/doc_src_stylesheet.qdoc 52
     \endomit
 
     \row
@@ -1855,7 +1855,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 53
+           \snippet code/doc_src_stylesheet.qdoc 53
 
     \row
         \li \c font-family
@@ -1864,7 +1864,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 54
+           \snippet code/doc_src_stylesheet.qdoc 54
 
     \row
         \li \c font-size
@@ -1874,7 +1874,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 55
+           \snippet code/doc_src_stylesheet.qdoc 55
 
     \row
         \li \c font-style
@@ -1883,7 +1883,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 56
+           \snippet code/doc_src_stylesheet.qdoc 56
 
     \row
         \li \c font-weight
@@ -1901,7 +1901,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 57
+           \snippet code/doc_src_stylesheet.qdoc 57
 
     \row
         \li \b{\c height} \target height-prop
@@ -1918,7 +1918,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 58
+           \snippet code/doc_src_stylesheet.qdoc 58
 
            See also \l{#width-prop}{width}.
 
@@ -1966,7 +1966,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 59
+           \snippet code/doc_src_stylesheet.qdoc 59
 
     \row
         \li \b{\c image-position} \target image-position-prop
@@ -1990,7 +1990,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 60
+           \snippet code/doc_src_stylesheet.qdoc 60
 
            See also \l{#right-prop}{right}, \l{Qt Style Sheets Reference#top-prop}{top}, and
            \l{#bottom-prop}{bottom}.
@@ -2006,7 +2006,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 61
+           \snippet code/doc_src_stylesheet.qdoc 61
 
     \row
         \li \b{\c margin} \target margin-prop
@@ -2025,7 +2025,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 62
+           \snippet code/doc_src_stylesheet.qdoc 62
 
            See also \l{Qt Style Sheets Reference#padding-prop}{padding},
            \l{#spacing-prop}{spacing}, and \l{The Box Model}.
@@ -2066,7 +2066,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 63
+           \snippet code/doc_src_stylesheet.qdoc 63
 
            See also \l{#max-width-prop}{max-width}.
 
@@ -2086,7 +2086,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 64
+           \snippet code/doc_src_stylesheet.qdoc 64
 
            See also \l{#max-height-prop}{max-height}.
 
@@ -2104,7 +2104,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 65
+           \snippet code/doc_src_stylesheet.qdoc 65
 
     \row
         \li \b{\c min-height} \target min-height-prop
@@ -2125,7 +2125,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 66
+           \snippet code/doc_src_stylesheet.qdoc 66
 
            See also \l{#min-width-prop}{min-width}.
 
@@ -2148,7 +2148,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 67
+           \snippet code/doc_src_stylesheet.qdoc 67
 
            See also \l{#min-height-prop}{min-height}.
 
@@ -2165,7 +2165,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 68
+           \snippet code/doc_src_stylesheet.qdoc 68
 
     \row
         \li \b{\c padding} \target padding-prop
@@ -2184,7 +2184,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 69
+           \snippet code/doc_src_stylesheet.qdoc 69
 
            See also \l{#margin-prop}{margin},
            \l{#spacing-prop}{spacing}, and \l{The Box Model}.
@@ -2243,7 +2243,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 70
+           \snippet code/doc_src_stylesheet.qdoc 70
 
            See also \l{Qt Style Sheets Reference#left-prop}{left}, \l{Qt Style Sheets Reference#top-prop}{top}, and
            \l{#bottom-prop}{bottom}.
@@ -2262,7 +2262,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 71
+           \snippet code/doc_src_stylesheet.qdoc 71
 
            See also \l{#selection-color-prop}{selection-color} and
            \l{Qt Style Sheets Reference#background-prop}{background}.
@@ -2281,7 +2281,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 72
+           \snippet code/doc_src_stylesheet.qdoc 72
 
            See also
            \l{#selection-background-color-prop}{selection-background-color}
@@ -2300,7 +2300,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 73
+           \snippet code/doc_src_stylesheet.qdoc 73
 
     \row
         \li \b{\c spacing*} \target spacing-prop
@@ -2315,7 +2315,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 74
+           \snippet code/doc_src_stylesheet.qdoc 74
 
            See also \l{Qt Style Sheets Reference#padding-prop}{padding} and
            \l{#margin-prop}{margin}.
@@ -2331,7 +2331,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 75
+           \snippet code/doc_src_stylesheet.qdoc 75
 
            See also
            \l{Qt Style Sheets Reference#subcontrol-position-prop}{subcontrol-position}.
@@ -2348,7 +2348,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 76
+           \snippet code/doc_src_stylesheet.qdoc 76
 
            See also
            \l{Qt Style Sheets Reference#subcontrol-origin-prop}{subcontrol-origin}.
@@ -2363,7 +2363,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 77
+           \snippet code/doc_src_stylesheet.qdoc 77
 
             This property is currently supported only by QPushButton
             and QProgressBar.
@@ -2392,7 +2392,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 78
+           \snippet code/doc_src_stylesheet.qdoc 78
 
            See also \l{Qt Style Sheets Reference#left-prop}{left}, \l{#right-prop}{right}, and
            \l{#bottom-prop}{bottom}.
@@ -2412,7 +2412,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 79
+           \snippet code/doc_src_stylesheet.qdoc 79
 
            See also \l{#height-prop}{height}.
 
@@ -2671,7 +2671,7 @@
 
            Example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 80
+    \snippet code/doc_src_stylesheet.qdoc 80
 
     \row
         \li \b Attachment \target Attachment
@@ -2695,7 +2695,7 @@
 
            Example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 81
+    \snippet code/doc_src_stylesheet.qdoc 81
 
     \row
         \li \b Border \target Border
@@ -2750,7 +2750,7 @@
 
            Example:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 82
+           \snippet code/doc_src_stylesheet.qdoc 82
 
     \row
         \li \b{Box Lengths} \target Box Lengths
@@ -2765,7 +2765,7 @@
 
            Examples:
 
-           \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 83
+           \snippet code/doc_src_stylesheet.qdoc 83
 
     \row
         \li \b{Brush} \target Brush
@@ -2791,7 +2791,7 @@
 
            Examples:
 
-            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 84
+            \snippet code/doc_src_stylesheet.qdoc 84
 
             \note The RGB colors allowed are the same as those allowed with
             CSS 2.1, as listed
@@ -2852,7 +2852,7 @@
 
         Examples:
 
-        \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 85
+        \snippet code/doc_src_stylesheet.qdoc 85
 
     \row
         \li \b{Icon} \target Icon
@@ -2861,7 +2861,7 @@
         \li A list of url, QIcon::Mode and QIcon::State.
 
             Example:
-            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 86
+            \snippet code/doc_src_stylesheet.qdoc 86
 
     \row
         \li \b{Length} \target Length
@@ -2930,7 +2930,7 @@
            in the widget's QPalette.
 
             For example,
-            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 87
+            \snippet code/doc_src_stylesheet.qdoc 87
 
     \row
         \li \b{Radius} \target Radius
@@ -3373,35 +3373,35 @@
     \l{QLineEdit}s in an application. This could be achieved like
     this:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 88
+    \snippet code/doc_src_stylesheet.cpp 88
 
     If we want the property to apply only to the \l{QLineEdit}s that are
     children (or grandchildren or grand-grandchildren) of a specific dialog,
     we would rather do this:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 89
+    \snippet code/doc_src_stylesheet.cpp 89
 
     If we want the property to apply only to one specific QLineEdit,
     we can give it a name using QObject::setObjectName() and use an
     ID Selector to refer to it:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 90
+    \snippet code/doc_src_stylesheet.cpp 90
 
     Alternatively, we can set the
     \l{Qt Style Sheets Reference#background-prop}{background-color} property directly on the
     QLineEdit, omitting the selector:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 91
+    \snippet code/doc_src_stylesheet.cpp 91
 
     To ensure a good contrast, we should also specify a suitable
     color for the text:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 92
+    \snippet code/doc_src_stylesheet.cpp 92
 
     It might be a good idea to change the colors used for selected
     text as well:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 93
+    \snippet code/doc_src_stylesheet.cpp 93
 
 
     \section2 Customizing Using Dynamic Properties
@@ -3413,7 +3413,7 @@
     turns out this is very easy to implement using Qt Style Sheets.
     First, we would use the following application-wide style sheet:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 94
+    \snippet code/doc_src_stylesheet.qdoc 94
 
     This means that every widget whose \c mandatoryField Qt property
     is set to true would have a yellow background.
@@ -3422,7 +3422,7 @@
     \c mandatoryField property on the fly and set it to true. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.cpp 95
+    \snippet code/doc_src_stylesheet.cpp 95
 
     \section2 Customizing a QPushButton Using the Box Model
 
@@ -3432,7 +3432,7 @@
 
     First, we are tempted to use this style sheet:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 96
+    \snippet code/doc_src_stylesheet.qdoc 96
 
     However, the result is a boring, flat button with no borders:
 
@@ -3453,7 +3453,7 @@
 
     Let's improve the situation by specifying a border:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 97
+    \snippet code/doc_src_stylesheet.qdoc 97
 
     \image stylesheet-redbutton2.png A red button with a beige border
 
@@ -3463,7 +3463,7 @@
     enforce a minimum width, round the corners, and specify a larger
     font to make the button look nicer:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 98
+    \snippet code/doc_src_stylesheet.qdoc 98
 
     \image stylesheet-redbutton3.png A red button with a round beige border and big, bold text
 
@@ -3471,7 +3471,7 @@
     press it. We can fix this by specifying a slightly different
     background color and use a different border style.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 99
+    \snippet code/doc_src_stylesheet.qdoc 99
 
     \section2 Customizing the QPushButton's Menu Indicator Sub-Control
 
@@ -3480,7 +3480,7 @@
     QPushButton::setMenu()) has a menu indicator. Let's customize
     the menu indicator for the red push button:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 100
+    \snippet code/doc_src_stylesheet.qdoc 100
 
     By default, the menu indicator is located at the bottom-right
     corner of the padding rectangle. We can change this by specifying
@@ -3490,7 +3490,7 @@
     \l{Qt Style Sheets Reference#left-prop}{left} to move the indicator by a few pixels. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 101
+    \snippet code/doc_src_stylesheet.qdoc 101
 
     This positions the \c myindicator.png to the center right of the
     QPushButton's \l{Qt Style Sheets Reference#padding-prop}{padding} rectangle (see
@@ -3503,24 +3503,24 @@
     QLineEdit red by setting the following application-wide
     stylesheet:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 102
+    \snippet code/doc_src_stylesheet.qdoc 102
 
     However, we would like to give a visual indication that a
     QLineEdit is read-only by making it appear gray:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 103
+    \snippet code/doc_src_stylesheet.qdoc 103
 
     At some point, our design team comes with the requirement that
     all \l{QLineEdit}s in the registration form (with the
     \l{QObject::objectName}{object name} \c registrationDialog) to be
     brown:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 104
+    \snippet code/doc_src_stylesheet.qdoc 104
 
     A few UI design meetings later, we decide that all our
     \l{QDialog}s should have brown colored \l{QLineEdit}s:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 105
+    \snippet code/doc_src_stylesheet.qdoc 105
 
     Quiz: What happens if we have a read-only QLineEdit in a QDialog?
     [Hint: The \l{The Style Sheet Syntax#Conflict Resolution}{Conflict Resolution} section above explains
@@ -3535,40 +3535,40 @@
     The background of any QAbstractScrollArea (Item views, QTextEdit
     and QTextBrowser) can be set using the background properties. For example,
     to set a background-image that scrolls with the scroll bar:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 106
+    \snippet code/doc_src_stylesheet.qdoc 106
 
     If the background-image is to be fixed with the viewport:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 107
+    \snippet code/doc_src_stylesheet.qdoc 107
 
     \section2 Customizing QCheckBox
 
     Styling of a QCheckBox is almost identical to styling a QRadioButton. The
     main difference is that a tristate QCheckBox has an indeterminate state.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 108
+    \snippet code/doc_src_stylesheet.qdoc 108
 
     \section2 Customizing QComboBox
 
     We will look at an example where the drop down button of a QComboBox
     appears "merged" with the combo box frame.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 109
+    \snippet code/doc_src_stylesheet.qdoc 109
 
     The pop-up of the QComboBox is a QAbstractItemView and is styled using
     the descendant selector:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 110
+    \snippet code/doc_src_stylesheet.qdoc 110
 
     \section2 Customizing QDockWidget
 
     The title bar and the buttons of a QDockWidget can be customized as
     follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 111
+    \snippet code/doc_src_stylesheet.qdoc 111
 
     If one desires to move the dock widget buttons to the left, the following
     style sheet can be used:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 112
+    \snippet code/doc_src_stylesheet.qdoc 112
 
     \note To customize the separator (resize handle) of a QDockWidget,
     use QMainWindow::separator.
@@ -3577,73 +3577,73 @@
 
     A QFrame is styled using the \l{The Box Model}.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 113
+    \snippet code/doc_src_stylesheet.qdoc 113
 
     \section2 Customizing QGroupBox
 
     Let us look at an example that moves the QGroupBox's title to
     the center.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 114
+    \snippet code/doc_src_stylesheet.qdoc 114
 
     For a checkable QGroupBox, use the \{#indicator-sub}{::indicator} subcontrol
     and style it exactly like a QCheckBox (i.e)
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 115
+    \snippet code/doc_src_stylesheet.qdoc 115
 
     \section2 Customizing QHeaderView
 
     QHeaderView is customized as follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 116
+    \snippet code/doc_src_stylesheet.qdoc 116
 
     \section2 Customizing QLineEdit
 
     The frame of a QLineEdit is styled using the \l{The Box Model}. To
     create a line edit with rounded corners, we can set:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 117
+    \snippet code/doc_src_stylesheet.qdoc 117
 
     The password character of line edits that have QLineEdit::Password
     echo mode can be set using:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 118
+    \snippet code/doc_src_stylesheet.qdoc 118
 
     The background of a read only QLineEdit can be modified as below:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 119
+    \snippet code/doc_src_stylesheet.qdoc 119
 
     \section2 Customizing QListView
 
     The background color of alternating rows can be customized using the following
     style sheet:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 120
+    \snippet code/doc_src_stylesheet.qdoc 120
 
     To provide a special background when you hover over items, we can use the
     \l{item-sub}{::item} subcontrol. For example,
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 121
+    \snippet code/doc_src_stylesheet.qdoc 121
 
     \section2 Customizing QMainWindow
 
     The separator of a QMainWindow can be styled as follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 122
+    \snippet code/doc_src_stylesheet.qdoc 122
 
     \section2 Customizing QMenu
 
     Individual items of a QMenu are styled using the 'item' subcontrol as
     follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 123
+    \snippet code/doc_src_stylesheet.qdoc 123
 
     For a more advanced customization, use a style sheet as follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 124
+    \snippet code/doc_src_stylesheet.qdoc 124
 
     \section2 Customizing QMenuBar
 
     QMenuBar is styled as follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 125
+    \snippet code/doc_src_stylesheet.qdoc 125
 
     \section2 Customizing QProgressBar
 
@@ -3659,13 +3659,13 @@
     {border} to grey and the \l{stylesheet-reference.html#chunk-sub}{chunk}
     to cerulean.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 126
+    \snippet code/doc_src_stylesheet.qdoc 126
 
     This leaves the \l{stylesheet-reference.html#text-align-prop}
     {text-align}, which we customize by positioning the text in the center of
     the progress bar.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 127
+    \snippet code/doc_src_stylesheet.qdoc 127
 
     A \l{stylesheet-reference.html#margin-prop}{margin} can be included to
     obtain more visible chunks.
@@ -3675,18 +3675,18 @@
     In the screenshot above, we use a
     \l{stylesheet-reference.html#margin-prop}{margin} of 0.5 pixels.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 128
+    \snippet code/doc_src_stylesheet.qdoc 128
 
     \section2 Customizing QPushButton
 
     A QPushButton is styled as follows:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 129
+    \snippet code/doc_src_stylesheet.qdoc 129
 
     For a QPushButton with a menu, use the
     \l{Qt Style Sheets Reference#menu-indicator-sub}{::menu-indicator}
     subcontrol.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 130
+    \snippet code/doc_src_stylesheet.qdoc 130
 
     Checkable QPushButton have the \l{Qt Style Sheets Reference#checked-ps}
     {:checked} pseudo state set.
@@ -3694,7 +3694,7 @@
     \section2 Customizing QRadioButton
 
     The indicator of a QRadioButton can be changed using:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 131
+    \snippet code/doc_src_stylesheet.qdoc 131
 
     \section2 Customizing QScrollBar
 
@@ -3710,52 +3710,52 @@
     The scroll bar above has been styled in aquamarine with a solid grey
     border.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 132
+    \snippet code/doc_src_stylesheet.qdoc 132
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 133
+    \snippet code/doc_src_stylesheet.qdoc 133
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 134
+    \snippet code/doc_src_stylesheet.qdoc 134
 
     The \l{stylesheet-reference.html#left-arrow-sub}{left-arrow} and
     \l{stylesheet-reference.html#right-arrow-sub}{right-arrow} have a solid grey
     border with a white background. As an alternative, you could also embed the
     image of an arrow.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 135
+    \snippet code/doc_src_stylesheet.qdoc 135
 
     If you want the scroll buttons of the scroll bar to be placed together
     (instead of the edges) like on Mac OS X, you can use the following
     stylesheet:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 136
+    \snippet code/doc_src_stylesheet.qdoc 136
 
     The scroll bar using the above stylesheet looks like this:
         \image stylesheet-scrollbar2.png
 
 
     To customize a vertical scroll bar use a style sheet similar to the following:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 137
+    \snippet code/doc_src_stylesheet.qdoc 137
 
     \section2 Customizing QSizeGrip
 
     QSizeGrip is usually styled by just setting an image.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 138
+    \snippet code/doc_src_stylesheet.qdoc 138
 
     \section2 Customizing QSlider
 
     You can style horizontal slider as below:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 139
+    \snippet code/doc_src_stylesheet.qdoc 139
 
     If you want to change the color of the slider parts before and after the handle, you can use the add-page
     and sub-page subcontrols. For example, for a vertical slider:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 140
+    \snippet code/doc_src_stylesheet.qdoc 140
 
     \section2 Customizing QSpinBox
 
     QSpinBox can be completely customized as below (the style sheet has commentary inline):
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 141
+    \snippet code/doc_src_stylesheet.qdoc 141
 
 
     \section2 Customizing QSplitter
@@ -3764,17 +3764,17 @@
     The grip or the handle is customized using the
     \l{Qt Style Sheets Reference#handle-sub}{::handle} subcontrol.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 142
+    \snippet code/doc_src_stylesheet.qdoc 142
 
     \section2 Customizing QStatusBar
 
     We can provide a background for the status bar and a border for items
     inside the status bar as follows:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 143
+    \snippet code/doc_src_stylesheet.qdoc 143
 
     Note that widgets that have been added to the QStatusBar can be styled
     using the descendant declaration (i.e)
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 144
+    \snippet code/doc_src_stylesheet.qdoc 144
 
     \section2 Customizing QTabWidget and QTabBar
 
@@ -3782,7 +3782,7 @@
 
     For the screenshot above, we need a stylesheet as follows:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 145
+    \snippet code/doc_src_stylesheet.qdoc 145
 
     Often we require the tabs to overlap to look like below:
     \image tabWidget-stylesheet2.png
@@ -3791,18 +3791,18 @@
     \l{http://www.communitymx.com/content/article.cfm?cid=B0029}
     {negative margins}. The resulting stylesheet looks like this:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 146
+    \snippet code/doc_src_stylesheet.qdoc 146
 
     To move the tab bar to the center (as below), we require the following stylesheet:
     \image tabWidget-stylesheet3.png
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 147
+    \snippet code/doc_src_stylesheet.qdoc 147
 
     The tear indicator and the scroll buttons can be further customized as follows:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 148
+    \snippet code/doc_src_stylesheet.qdoc 148
 
     Since Qt 4.6 the close button can be customized as follow:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 159
+    \snippet code/doc_src_stylesheet.qdoc 159
 
     \section2 Customizing QTableView
 
@@ -3815,22 +3815,22 @@
     \l{stylesheet-reference.html#selection-background-color-prop}
     {selection-background-color} property and the syntax required is:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 149
+    \snippet code/doc_src_stylesheet.qdoc 149
 
     The corner widget can be customized using the following style sheet
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 150
+    \snippet code/doc_src_stylesheet.qdoc 150
 
     \section2 Customizing QToolBar
 
     The background and the handle of a QToolBar is customized as below:
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 151
+    \snippet code/doc_src_stylesheet.qdoc 151
 
     \section2 Customizing QToolBox
 
     The tabs of the QToolBox are customized using the 'tab' subcontrol.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 152
+    \snippet code/doc_src_stylesheet.qdoc 152
 
     \section2 Customizing QToolButton
 
@@ -3851,7 +3851,7 @@
            QToolButton::MenuButtonPopup. In this case, we style it as follows:
     \endlist
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 153
+    \snippet code/doc_src_stylesheet.qdoc 153
 
 
     \section2 Customizing QToolTip
@@ -3860,25 +3860,25 @@
     that support it, the opacity property may be set to adjust the opacity.
 
     For example,
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 154
+    \snippet code/doc_src_stylesheet.qdoc 154
 
     \section2 Customizing QTreeView
 
     The background color of alternating rows can be customized using the following
     style sheet:
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 155
+    \snippet code/doc_src_stylesheet.qdoc 155
 
     To provide a special background when you hover over items, we can use the
     \l{item-sub}{::item} subcontrol. For example,
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 156
+    \snippet code/doc_src_stylesheet.qdoc 156
 
     The branches of a QTreeView are styled using the
     \l{Qt Style Sheets Reference#branch-sub}{::branch} subcontrol. The
     following stylesheet color codes the various states when drawing
     a branch.
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 157
+    \snippet code/doc_src_stylesheet.qdoc 157
 
     Colorful, though it is, a more useful example can be made using the
     following images:
@@ -3898,7 +3898,7 @@
     \li branch-open.png
     \endtable
 
-    \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 158
+    \snippet code/doc_src_stylesheet.qdoc 158
 
     The resulting tree view looks like this:
 
@@ -3932,7 +3932,7 @@
 
     Consider the following snippet:
 
-    \snippet doc/src/snippets/stylesheet/common-mistakes.cpp 1
+    \snippet stylesheet/common-mistakes.cpp 1
 
     This will produce a button looking like this:
 
diff --git a/doc/src/widgets/widgets-and-layouts/widgets.qdoc b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
index e80b0fbec0..e80b0fbec0 100644
--- a/doc/src/widgets/widgets-and-layouts/widgets.qdoc
+++ b/src/widgets/doc/src/widgets-and-layouts/widgets.qdoc
diff --git a/src/widgets/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp
index 80c0aff492..5bfa8cc5e5 100644
--- a/src/widgets/effects/qgraphicseffect.cpp
+++ b/src/widgets/effects/qgraphicseffect.cpp
@@ -243,7 +243,7 @@ void QGraphicsEffectSource::draw(QPainter *painter)
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp 0
+    \snippet code/src_gui_effects_qgraphicseffect.cpp 0
 
     \sa QGraphicsEffect::draw()
 */
@@ -545,7 +545,7 @@ void QGraphicsEffect::updateBoundingRect()
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp 1
+    \snippet code/src_gui_effects_qgraphicseffect.cpp 1
 
     This function should not be called explicitly by the user, since it is
     meant for reimplementation purposes only.
@@ -1154,7 +1154,7 @@ void QGraphicsOpacityEffect::setOpacity(qreal opacity)
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp 2
+    \snippet code/src_gui_effects_qgraphicseffect.cpp 2
 
     There is no opacity mask by default.
 
diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp
index a141fa9e55..7e42eefef2 100644
--- a/src/widgets/effects/qpixmapfilter.cpp
+++ b/src/widgets/effects/qpixmapfilter.cpp
@@ -198,7 +198,7 @@ QRectF QPixmapFilter::boundingRectFor(const QRectF &rect) const
     \endomit
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp 1
+    \snippet code/src_gui_image_qpixmapfilter.cpp 1
 
     \sa {Pixmap Filters Example}, QPixmapColorizeFilter, QPixmapDropShadowFilter
 
@@ -1011,7 +1011,7 @@ static void grayscale(const QImage &image, QImage &dest, const QRect& rect = QRe
     chosen color. The alpha-channel is not changed.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp 0
+    \snippet code/src_gui_image_qpixmapfilter.cpp 0
 
     \sa QPainter::CompositionMode
 
@@ -1194,7 +1194,7 @@ public:
     radius of 1 at an offset of 8 pixels towards the lower right.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_image_qpixmapfilter.cpp 2
+    \snippet code/src_gui_image_qpixmapfilter.cpp 2
 
     \sa QPixmapColorizeFilter, QPixmapConvolutionFilter
 
diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
index 348d8f2d09..06db3826ea 100644
--- a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp
@@ -64,7 +64,7 @@
     Anchors are always set up between edges of an item, where the "center" is also considered to
     be an edge. Consider the following example:
 
-    \snippet examples/graphicsview/simpleanchorlayout/main.cpp adding anchors
+    \snippet graphicsview/simpleanchorlayout/main.cpp adding anchors
 
     Here, the right edge of item \c a is anchored to the left edge of item \c b and the bottom
     edge of item \c a is anchored to the top edge of item \c b, with the result that
@@ -75,7 +75,7 @@
     above. Here, we see how a widget can be anchored to the top-left corner of the enclosing
     layout:
 
-    \snippet examples/graphicsview/simpleanchorlayout/main.cpp adding a corner anchor
+    \snippet graphicsview/simpleanchorlayout/main.cpp adding a corner anchor
 
     In cases where anchors are used to match the widths or heights of widgets, it is
     convenient to use the addAnchors() function. As with the other functions for specifying
@@ -299,11 +299,11 @@ QGraphicsAnchorLayout::anchor(QGraphicsLayoutItem *firstItem, Qt::AnchorPoint fi
     This is a convenience function, since anchoring corners can be expressed as anchoring
     two edges. For instance:
 
-    \snippet examples/graphicsview/simpleanchorlayout/main.cpp adding a corner anchor in two steps
+    \snippet graphicsview/simpleanchorlayout/main.cpp adding a corner anchor in two steps
 
     This can also be achieved with the following line of code:
 
-    \snippet examples/graphicsview/simpleanchorlayout/main.cpp adding a corner anchor
+    \snippet graphicsview/simpleanchorlayout/main.cpp adding a corner anchor
 
     If there is already an anchor between the edge pairs, it will be replaced by the anchors that
     this function specifies.
@@ -341,11 +341,11 @@ void QGraphicsAnchorLayout::addCornerAnchors(QGraphicsLayoutItem *firstItem,
     For example, the following example anchors the left and right edges of two items
     to match their widths:
 
-    \snippet examples/graphicsview/simpleanchorlayout/main.cpp adding anchors to match sizes in two steps
+    \snippet graphicsview/simpleanchorlayout/main.cpp adding anchors to match sizes in two steps
 
     This can also be achieved using the following line of code:
 
-    \snippet examples/graphicsview/simpleanchorlayout/main.cpp adding anchors to match sizes
+    \snippet graphicsview/simpleanchorlayout/main.cpp adding anchors to match sizes
 
     \sa addAnchor(), addCornerAnchors()
 */
diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
index c5e7e83cf4..53d7cbd4be 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
@@ -54,7 +54,7 @@
     QGraphicsWidget::setLayout(). QGraphicsGridLayout automatically computes
     the dimensions of the grid as you add items.
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsgridlayout.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicsgridlayout.cpp 0
 
     The layout takes ownership of the items. In some cases when the layout
     item also inherits from QGraphicsItem (such as QGraphicsWidget) there will be a
diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index dab1965da5..1ce914b219 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -90,7 +90,7 @@
     by the item, and paint(), which implements the actual painting. For
     example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 0
 
     The boundingRect() function has many different purposes.
     QGraphicsScene bases its item index on boundingRect(), and
@@ -277,7 +277,7 @@
     classes in Qt are associated with a unique value for Type,
     e.g. the value returned by QGraphicsPathItem::type() is 2.
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 18
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 18
 */
 
 /*!
@@ -288,7 +288,7 @@
     used in conjunction with a reimplementation of QGraphicsItem::type()
     and declaring a Type enum value. Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 1
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 1
 
     \note UserType = 65536
 */
@@ -2133,7 +2133,7 @@ void QGraphicsItem::setToolTip(const QString &toolTip)
 
     An editor item might want to use an I-beam cursor:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 2
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 2
 
     If no cursor has been set, the cursor of the item beneath is used.
 
@@ -2153,7 +2153,7 @@ QCursor QGraphicsItem::cursor() const
 
     An editor item might want to use an I-beam cursor:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 3
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 3
 
     If no cursor has been set, the cursor of the item beneath is used.
 
@@ -4146,7 +4146,7 @@ QMatrix QGraphicsItem::sceneMatrix() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 4
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 4
 
     Unlike transform(), which returns only an item's local transformation, this
     function includes the item's (and any parents') position, and all the transfomation properties.
@@ -4171,7 +4171,7 @@ QTransform QGraphicsItem::sceneTransform() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 5
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 5
 
     This function is the same as combining this item's scene transform with
     the view's viewport transform, but it also understands the
@@ -4474,7 +4474,7 @@ void QGraphicsItem::resetTransform()
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 6
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 6
 
     \sa setTransform(), transform(), scale(), shear(), translate()
 */
@@ -4500,7 +4500,7 @@ void QGraphicsItem::rotate(qreal angle)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 7
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 7
 
     \sa setTransform(), transform()
 */
@@ -4787,7 +4787,7 @@ QRectF QGraphicsItem::childrenBoundingRect() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 8
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 8
 
     \sa boundingRegion(), shape(), contains(), {The Graphics View Coordinate
     System}, prepareGeometryChange()
@@ -4835,7 +4835,7 @@ QRectF QGraphicsItem::sceneBoundingRect() const
     may choose to return an elliptic shape for better collision detection. For
     example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 9
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 9
 
     The outline of a shape can vary depending on the width and style of the
     pen used when drawing. If you want to include this outline in the item's
@@ -5327,7 +5327,7 @@ void QGraphicsItem::setBoundingRegionGranularity(qreal granularity)
     provided, it points to the widget that is being painted on; otherwise, it
     is 0. For cached painting, \a widget is always 0.
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 10
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 10
 
     The painter's pen is 0-width by default, and its pen is initialized to the
     QPalette::Text brush from the paint device's palette. The brush is
@@ -5736,7 +5736,7 @@ void QGraphicsItem::update(const QRectF &rect)
     by other items, you can map the \a rect to viewport coordinates and scroll the
     viewport.
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 19
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 19
 
     \sa boundingRect()
 */
@@ -6515,7 +6515,7 @@ bool QGraphicsItem::isUnderMouse() const
     Custom item data is useful for storing arbitrary properties in any
     item. Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 11
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 11
 
     Qt does not use this feature for storing data; it is provided solely
     for the convenience of the user.
@@ -6572,7 +6572,7 @@ void QGraphicsItem::setData(int key, const QVariant &value)
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp QGraphicsItem type
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp QGraphicsItem type
 
     \sa UserType
 */
@@ -6589,7 +6589,7 @@ int QGraphicsItem::type() const
     To filter another item's events, install this item as an event filter
     for the other item. Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 12
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 12
 
     An item can only filter events for other items in the same
     scene. Also, an item cannot filter its own events; instead, you
@@ -6805,7 +6805,7 @@ bool QGraphicsItem::sceneEvent(QEvent *event)
     It's common to open a QMenu in response to receiving a context menu
     event. Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 13
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 13
 
     The default implementation ignores the event.
 
@@ -6830,7 +6830,7 @@ void QGraphicsItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     A common implementation of dragEnterEvent accepts or ignores \a event
     depending on the associated mime data in \a event. Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 14
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 14
 
     Items do not receive drag and drop events by default; to enable this
     feature, call \c setAcceptDrops(true).
@@ -7424,7 +7424,7 @@ void QGraphicsItem::updateMicroFocus()
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 15
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 15
 
     The default implementation does nothing, and returns \a value.
 
@@ -7519,7 +7519,7 @@ void QGraphicsItem::removeFromIndex()
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 16
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 16
 
     \sa boundingRect()
 */
@@ -10613,11 +10613,11 @@ Qt::TextInteractionFlags QGraphicsTextItem::textInteractionFlags() const
 /*!
     \since 4.5
 
-    If \a b is true, the \gui Tab key will cause the widget to change focus;
+    If \a b is true, the \uicontrol Tab key will cause the widget to change focus;
     otherwise, the tab key will insert a tab into the document.
 
     In some occasions text edits should not allow the user to input tabulators
-    or change indentation using the \gui Tab key, as this breaks the focus
+    or change indentation using the \uicontrol Tab key, as this breaks the focus
     chain. The default is false.
 
     \sa tabChangesFocus(), ItemIsFocusable, textInteractionFlags()
@@ -10630,7 +10630,7 @@ void QGraphicsTextItem::setTabChangesFocus(bool b)
 /*!
     \since 4.5
 
-    Returns true if the \gui Tab key will cause the widget to change focus;
+    Returns true if the \uicontrol Tab key will cause the widget to change focus;
     otherwise, false is returned.
 
     By default, this behavior is disabled, and this function will return false.
@@ -11010,7 +11010,7 @@ QVariant QGraphicsSimpleTextItem::extension(const QVariant &variant) const
     QGraphicsScene::destroyItemGroup(), or you can manually remove all
     items from the group by calling removeFromGroup().
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsitem.cpp 17
+    \snippet code/src_gui_graphicsview_qgraphicsitem.cpp 17
 
     The operation of adding and removing items preserves the items'
     scene-relative position and transformation, as opposed to calling
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
index f21220b3b1..bb90337c5e 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
@@ -70,7 +70,7 @@
 
     An example animation with a timeline follows:
 
-    \snippet doc/src/snippets/timeline/main.cpp 0
+    \snippet timeline/main.cpp 0
 
     Note that steps lie between 0.0 and 1.0. It may be necessary to use
     \l{QTimeLine::}{setUpdateInterval()}. The default update interval
diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.cpp b/src/widgets/graphicsview/qgraphicslinearlayout.cpp
index 535e2ddf59..f312e2e7ba 100644
--- a/src/widgets/graphicsview/qgraphicslinearlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicslinearlayout.cpp
@@ -56,7 +56,7 @@
     and finally assign the layout to a widget by calling
     QGraphicsWidget::setLayout().
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicslinearlayout.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicslinearlayout.cpp 0
 
     You can add widgets, layouts, stretches (addStretch(), insertStretch() or
     setStretchFactor()), and spacings (setItemSpacing()) to a linear
diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
index 4cda3e51fb..b09ddbab41 100644
--- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp
@@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicsproxywidget.cpp 0
 
     QGraphicsProxyWidget takes care of automatically embedding popup children
     of embedded widgets through creating a child proxy for each popup. This
@@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE
 
     For example, in the code snippet below, we embed a group box into the proxy:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp 1
+    \snippet code/src_gui_graphicsview_qgraphicsproxywidget.cpp 1
 
     The image below is the output obtained with its contents margin and
     contents rect labeled.
@@ -131,7 +131,7 @@ QT_BEGIN_NAMESPACE
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsproxywidget.cpp 2
+    \snippet code/src_gui_graphicsview_qgraphicsproxywidget.cpp 2
 
     QGraphicsProxyWidget maintains symmetry for the following states:
 
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index 583e6da90a..282c6a2a2a 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -60,7 +60,7 @@
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicsscene.cpp 0
 
     Note that QGraphicsScene has no visual appearance of its own; it only
     manages the items. You need to create a QGraphicsView widget to visualize
@@ -1715,7 +1715,7 @@ void QGraphicsScene::setSceneRect(const QRectF &rect)
     device, such as a QImage (e.g., to take a screenshot), or for printing
     with QPrinter. For example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp 1
+    \snippet code/src_gui_graphicsview_qgraphicsscene.cpp 1
 
     If \a source is a null rect, this function will use sceneRect() to
     determine what to render. If \a target is a null rect, the dimensions of \a
@@ -1866,7 +1866,7 @@ void QGraphicsScene::setItemIndexMethod(ItemIndexMethod method)
     granularity of the scene's partitioning. The size of each scene segment is
     determined by the following algorithm:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp 2
+    \snippet code/src_gui_graphicsview_qgraphicsscene.cpp 2
 
     The BSP tree has an optimal size when each segment contains between 0 and
     10 items.
@@ -3146,7 +3146,7 @@ QGraphicsItem *QGraphicsScene::mouseGrabberItem() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp 3
+    \snippet code/src_gui_graphicsview_qgraphicsscene.cpp 3
 
     QGraphicsScene::render() calls drawBackground() to draw the scene
     background. For more detailed control over how the background is drawn,
@@ -3181,7 +3181,7 @@ void QGraphicsScene::setBackgroundBrush(const QBrush &brush)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp 4
+    \snippet code/src_gui_graphicsview_qgraphicsscene.cpp 4
 
     QGraphicsScene::render() calls drawForeground() to draw the scene
     foreground. For more detailed control over how the foreground is
@@ -3295,7 +3295,7 @@ void QGraphicsScene::update(const QRectF &rect)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsscene.cpp 5
+    \snippet code/src_gui_graphicsview_qgraphicsscene.cpp 5
 
     Note that QGraphicsView currently supports background caching only (see
     QGraphicsView::CacheBackground). This function is equivalent to calling
@@ -5340,7 +5340,7 @@ void QGraphicsScenePrivate::processDirtyItemsRecursive(QGraphicsItem *item, bool
 
     Example:
 
-    \snippet doc/src/snippets/graphicssceneadditemsnippet.cpp 0
+    \snippet graphicssceneadditemsnippet.cpp 0
 
     Since Qt 4.6, this function is not called anymore unless
     the QGraphicsView::IndirectPainting flag is given as an Optimization
diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp
index 91b6fb08da..580380e19a 100644
--- a/src/widgets/graphicsview/qgraphicssceneevent.cpp
+++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp
@@ -1461,7 +1461,7 @@ void QGraphicsSceneDragDropEvent::setProposedAction(Qt::DropAction action)
     Sets the proposed action as accepted, i.e, the drop action
     is set to the proposed action. This is equal to:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicssceneevent.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicssceneevent.cpp 0
 
     When using this function, one should not call \c accept().
 
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index cabf2eb5a5..3629341d9e 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -62,7 +62,7 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
     center of the scene and display any items that are visible at this
     point. For example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 0
 
     You can explicitly scroll to any position on the scene by using the
     scroll bars, or by calling centerOn(). By passing a point to centerOn(),
@@ -1189,7 +1189,7 @@ QSize QGraphicsView::sizeHint() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 1
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 1
 */
 QPainter::RenderHints QGraphicsView::renderHints() const
 {
@@ -1472,7 +1472,7 @@ void QGraphicsView::setRubberBandSelectionMode(Qt::ItemSelectionMode mode)
     especially with a transformed view. The CacheBackground flag enables
     caching of the view's background. For example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 2
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 2
 
     The cache is invalidated every time the view is transformed. However, when
     scrolling, only partial invalidation is required.
@@ -1727,7 +1727,7 @@ QMatrix QGraphicsView::matrix() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 3
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 3
 
     To simplify interation with items using a transformed view, QGraphicsView
     provides mapTo... and mapFrom... functions that can translate between
@@ -2030,7 +2030,7 @@ void QGraphicsView::fitInView(const QGraphicsItem *item, Qt::AspectRatioMode asp
     onto a paint device, such as a QImage (e.g., to take a screenshot), or for
     printing to QPrinter. For example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 4
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 4
 
     If \a source is a null rect, this function will use viewport()->rect() to
     determine what to draw. If \a target is a null rect, the full dimensions
@@ -2155,7 +2155,7 @@ QList<QGraphicsItem *> QGraphicsView::items() const
     a subclass in QGraphicsView. \a pos is in untransformed viewport
     coordinates, just like QMouseEvent::pos().
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 5
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 5
 
     \sa QGraphicsScene::items(), {QGraphicsItem#Sorting}{Sorting}
 */
@@ -2270,7 +2270,7 @@ QList<QGraphicsItem *> QGraphicsView::items(const QPainterPath &path, Qt::ItemSe
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 6
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 6
 
     \sa items(), {QGraphicsItem#Sorting}{Sorting}
 */
@@ -3792,7 +3792,7 @@ bool QGraphicsView::isTransformed() const
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicsview.cpp 7
+    \snippet code/src_gui_graphicsview_qgraphicsview.cpp 7
 
     To simplify interation with items using a transformed view, QGraphicsView
     provides mapTo... and mapFrom... functions that can translate between
diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp
index 1f45582442..267d70104d 100644
--- a/src/widgets/graphicsview/qgraphicswidget.cpp
+++ b/src/widgets/graphicsview/qgraphicswidget.cpp
@@ -677,7 +677,7 @@ QRectF QGraphicsWidget::windowFrameRect() const
 
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp 0
+    \snippet code/src_gui_graphicsview_qgraphicswidget.cpp 0
 
     \sa QStyleOption::initFrom()
 */
@@ -2098,11 +2098,11 @@ QList<QAction *> QGraphicsWidget::actions() const
     Note that since the tab order of the \a second widget is changed, you
     should order a chain like this:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp 1
+    \snippet code/src_gui_graphicsview_qgraphicswidget.cpp 1
 
     \e not like this:
 
-    \snippet doc/src/snippets/code/src_gui_graphicsview_qgraphicswidget.cpp 2
+    \snippet code/src_gui_graphicsview_qgraphicswidget.cpp 2
 
     If \a first is 0, this indicates that \a second should be the first widget
     to receive input focus should the scene gain Tab focus (i.e., the user
diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index 125beab91b..890eba3407 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
     We create the \c WidgetDelegate class, which inherits from
     QStyledItemDelegate. We do the drawing in the paint() function:
 
-    \snippet doc/src/snippets/widgetdelegate.cpp 0
+    \snippet widgetdelegate.cpp 0
 
     Notice that we use a QStyleOptionProgressBar and initialize its
     members. We can then use the current QStyle to draw it.
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index 2ff039595a..777767ee70 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -308,7 +308,7 @@ void QAbstractItemViewPrivate::_q_scrollerStateChanged()
     setVerticalScrollMode(). To set the range of the scroll bars, you
     can, for example, reimplement the view's resizeEvent() function:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp 0
+    \snippet code/src_gui_itemviews_qabstractitemview.cpp 0
 
     Note that the range is not updated until the widget is shown.
 
@@ -654,7 +654,7 @@ QAbstractItemView::~QAbstractItemView()
     views. We recommend that you delete the old selection model if it is no
     longer required. This is done with the following code:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp 2
+    \snippet code/src_gui_itemviews_qabstractitemview.cpp 2
 
     If both the old model and the old selection model do not have parents, or
     if their parents are long-lived objects, it may be preferable to call their
@@ -3124,7 +3124,7 @@ void QAbstractItemView::closePersistentEditor(const QModelIndex &index)
     deleted. For example, in the code snippet below, the QLineEdit object will
     be deleted.
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qabstractitemview.cpp 1
+    \snippet code/src_gui_itemviews_qabstractitemview.cpp 1
 
     This function should only be used to display static content within the
     visible area corresponding to an item of data. If you want to display
diff --git a/src/widgets/itemviews/qdatawidgetmapper.cpp b/src/widgets/itemviews/qdatawidgetmapper.cpp
index 2f7b1f7ecb..4396519810 100644
--- a/src/widgets/itemviews/qdatawidgetmapper.cpp
+++ b/src/widgets/itemviews/qdatawidgetmapper.cpp
@@ -289,7 +289,7 @@ void QDataWidgetMapperPrivate::_q_modelDestroyed()
     The following code will map the columns of the model to widgets called \c mySpinBox,
     \c myLineEdit and \c{myCountryChooser}:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp 0
+    \snippet code/src_gui_itemviews_qdatawidgetmapper.cpp 0
 
     After the call to toFirst(), \c mySpinBox displays the value \c{1}, \c myLineEdit
     displays \c{Qt Norway} and \c myCountryChooser displays \c{Oslo}. The
@@ -476,7 +476,7 @@ QModelIndex QDataWidgetMapper::rootIndex() const
     is mapped to the QLineEdit \c nameLineEdit, and the second is
     mapped to the QSpinBox \c{ageSpinBox}:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp 1
+    \snippet code/src_gui_itemviews_qdatawidgetmapper.cpp 1
 
     \b{Notes:}
     \list
@@ -737,7 +737,7 @@ int QDataWidgetMapper::currentIndex() const
     with new data whenever the selection of a QTableView named
     \c myTableView changes:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qdatawidgetmapper.cpp 2
+    \snippet code/src_gui_itemviews_qdatawidgetmapper.cpp 2
 
     \sa currentIndex()
 */
diff --git a/src/widgets/itemviews/qitemdelegate.cpp b/src/widgets/itemviews/qitemdelegate.cpp
index bd9f4510f7..68d31c7dd2 100644
--- a/src/widgets/itemviews/qitemdelegate.cpp
+++ b/src/widgets/itemviews/qitemdelegate.cpp
@@ -400,7 +400,7 @@ QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOpt
     For example, a selected item may need to be displayed differently to
     unselected items, as shown in the following code:
 
-    \snippet examples/itemviews/pixelator/pixeldelegate.cpp 2
+    \snippet itemviews/pixelator/pixeldelegate.cpp 2
     \dots
 
     After painting, you should ensure that the painter is returned to its
@@ -1136,21 +1136,21 @@ QRect QItemDelegate::textRectangle(QPainter * /*painter*/, const QRect &rect,
     key press events are handled by default:
 
     \list
-        \li \gui Tab
-        \li \gui Backtab
-        \li \gui Enter
-        \li \gui Return
-        \li \gui Esc
+        \li \uicontrol Tab
+        \li \uicontrol Backtab
+        \li \uicontrol Enter
+        \li \uicontrol Return
+        \li \uicontrol Esc
     \endlist
 
-    In the case of \gui Tab, \gui Backtab, \gui Enter and \gui Return
+    In the case of \uicontrol Tab, \uicontrol Backtab, \uicontrol Enter and \uicontrol Return
     key press events, the \a editor's data is comitted to the model
-    and the editor is closed. If the \a event is a \gui Tab key press
+    and the editor is closed. If the \a event is a \uicontrol Tab key press
     the view will open an editor on the next item in the
-    view. Likewise, if the \a event is a \gui Backtab key press the
+    view. Likewise, if the \a event is a \uicontrol Backtab key press the
     view will open an editor on the \e previous item in the view.
 
-    If the event is a \gui Esc key press event, the \a editor is
+    If the event is a \uicontrol Esc key press event, the \a editor is
     closed \e without committing its data.
 
     \sa commitData(), closeEditor()
diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp
index b4180c18dd..f970a77ab4 100644
--- a/src/widgets/itemviews/qitemeditorfactory.cpp
+++ b/src/widgets/itemviews/qitemeditorfactory.cpp
@@ -339,7 +339,7 @@ void QItemEditorFactory::setDefaultFactory(QItemEditorFactory *factory)
     editing data. A property is set as the user property with the USER
     keyword:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp 0
+    \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 0
 
     If the editor does not provide a user property, it must return the
     name of the property from valuePropertyName(); delegates will then
@@ -405,7 +405,7 @@ void QItemEditorFactory::setDefaultFactory(QItemEditorFactory *factory)
     This way, it is not necessary to subclass
     QItemEditorCreatorBase.
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp 1
+    \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 1
 
     The constructor takes the name of the property that contains the
     editing data. QItemDelegate can then access the property by name
@@ -456,7 +456,7 @@ void QItemEditorFactory::setDefaultFactory(QItemEditorFactory *factory)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp 2
+    \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 2
 
     Setting the \c editorFactory created above in an item delegate via
     QItemDelegate::setItemEditorFactory() makes sure that all values of type
@@ -468,7 +468,7 @@ void QItemEditorFactory::setDefaultFactory(QItemEditorFactory *factory)
     System}{meta-object system}). You set the user property with
     the USER keyword:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qitemeditorfactory.cpp 3
+    \snippet code/src_gui_itemviews_qitemeditorfactory.cpp 3
 
     \sa QItemEditorCreatorBase, QItemEditorCreator,
 	QItemEditorFactory, QItemDelegate, {Color Editor Factory Example}
diff --git a/src/widgets/itemviews/qlistwidget.cpp b/src/widgets/itemviews/qlistwidget.cpp
index 01cb7b4235..4a17b65328 100644
--- a/src/widgets/itemviews/qlistwidget.cpp
+++ b/src/widgets/itemviews/qlistwidget.cpp
@@ -474,7 +474,7 @@ Qt::DropActions QListModel::supportedDropActions() const
     List items can be inserted automatically into a list, when they are
     constructed, by specifying the list widget:
 
-    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 2
+    \snippet qlistwidget-using/mainwindow.cpp 2
 
     Alternatively, list items can also be created without a parent widget, and
     later inserted into a list using QListWidget::insertItem().
@@ -1154,7 +1154,7 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
 
     List widgets are constructed in the same way as other widgets:
 
-    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 0
+    \snippet qlistwidget-using/mainwindow.cpp 0
 
     The selectionMode() of a list widget determines how many of the items in
     the list can be selected at the same time, and whether complex selections
@@ -1166,15 +1166,15 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     parent widget and added to the list later. If a list widget already exists
     when the items are constructed, the first method is easier to use:
 
-    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 1
+    \snippet qlistwidget-using/mainwindow.cpp 1
 
     If you need to insert a new item into the list at a particular position,
     then it should be constructed without a parent widget. The insertItem()
     function should then be used to place it within the list. The list widget
     will take ownership of the item.
 
-    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 6
-    \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 7
+    \snippet qlistwidget-using/mainwindow.cpp 6
+    \snippet qlistwidget-using/mainwindow.cpp 7
 
     For multiple items, insertItems() can be used instead. The number of items
     in the list is found with the count() function. To remove items from the
@@ -1258,7 +1258,7 @@ void QListWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
     This signal is emitted when the \a item is activated. The \a item is
     activated when the user clicks or double clicks on it, depending on the
     system configuration. It is also activated when the user presses the
-    activation key (on Windows and X11 this is the \gui Return key, on Mac OS
+    activation key (on Windows and X11 this is the \uicontrol Return key, on Mac OS
     X it is \key{Ctrl+0}).
 */
 
diff --git a/src/widgets/itemviews/qstandarditemmodel.cpp b/src/widgets/itemviews/qstandarditemmodel.cpp
index 5616d76c4a..4f488993f8 100644
--- a/src/widgets/itemviews/qstandarditemmodel.cpp
+++ b/src/widgets/itemviews/qstandarditemmodel.cpp
@@ -1989,11 +1989,11 @@ QDataStream &operator<<(QDataStream &out, const QStandardItem &item)
 
     An example usage of QStandardItemModel to create a table:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp 0
+    \snippet code/src_gui_itemviews_qstandarditemmodel.cpp 0
 
     An example usage of QStandardItemModel to create a tree:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp 1
+    \snippet code/src_gui_itemviews_qstandarditemmodel.cpp 1
 
     After setting the model on a view, you typically want to react to user
     actions, such as an item being clicked. Since a QAbstractItemView provides
@@ -2005,19 +2005,19 @@ QDataStream &operator<<(QDataStream &out, const QStandardItem &item)
     a QAbstractItemView signal, such as QAbstractItemView::clicked(). First
     you connect the view's signal to a slot in your class:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp 2
+    \snippet code/src_gui_itemviews_qstandarditemmodel.cpp 2
 
     When you receive the signal, you call itemFromIndex() on the given model
     index to get a pointer to the item:
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp 3
+    \snippet code/src_gui_itemviews_qstandarditemmodel.cpp 3
 
     Conversely, you must obtain the QModelIndex of an item when you want to
     invoke a model/view function that takes an index as argument. You can
     obtain the index either by using the model's indexFromItem() function, or,
     equivalently, by calling QStandardItem::index():
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp 4
+    \snippet code/src_gui_itemviews_qstandarditemmodel.cpp 4
 
     You are, of course, not required to use the item-based approach; you could
     instead rely entirely on the QAbstractItemModel interface when working with
diff --git a/src/widgets/itemviews/qstyleditemdelegate.cpp b/src/widgets/itemviews/qstyleditemdelegate.cpp
index 119692531f..fc2d18a459 100644
--- a/src/widgets/itemviews/qstyleditemdelegate.cpp
+++ b/src/widgets/itemviews/qstyleditemdelegate.cpp
@@ -602,21 +602,21 @@ void QStyledItemDelegate::setItemEditorFactory(QItemEditorFactory *factory)
     key press events are handled by default:
 
     \list
-        \li \gui Tab
-        \li \gui Backtab
-        \li \gui Enter
-        \li \gui Return
-        \li \gui Esc
+        \li \uicontrol Tab
+        \li \uicontrol Backtab
+        \li \uicontrol Enter
+        \li \uicontrol Return
+        \li \uicontrol Esc
     \endlist
 
-    In the case of \gui Tab, \gui Backtab, \gui Enter and \gui Return
+    In the case of \uicontrol Tab, \uicontrol Backtab, \uicontrol Enter and \uicontrol Return
     key press events, the \a editor's data is comitted to the model
-    and the editor is closed. If the \a event is a \gui Tab key press
+    and the editor is closed. If the \a event is a \uicontrol Tab key press
     the view will open an editor on the next item in the
-    view. Likewise, if the \a event is a \gui Backtab key press the
+    view. Likewise, if the \a event is a \uicontrol Backtab key press the
     view will open an editor on the \e previous item in the view.
 
-    If the event is a \gui Esc key press event, the \a editor is
+    If the event is a \uicontrol Esc key press event, the \a editor is
     closed \e without committing its data.
 
     \sa commitData(), closeEditor()
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 7ae74640d6..a50b6f3111 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -979,7 +979,7 @@ QTableWidgetSelectionRange::~QTableWidgetSelectionRange()
     Top-level items are constructed without a parent then inserted at the
     position specified by a pair of row and column numbers:
 
-    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 3
+    \snippet qtablewidget-using/mainwindow.cpp 3
 
     Each item can have its own background brush which is set with
     the setBackground() function. The current background brush can be
@@ -1504,18 +1504,18 @@ QTableWidgetItem &QTableWidgetItem::operator=(const QTableWidgetItem &other)
     Table widgets can be constructed with the required numbers of rows and
     columns:
 
-    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 0
+    \snippet qtablewidget-using/mainwindow.cpp 0
 
     Alternatively, tables can be constructed without a given size and resized
     later:
 
-    \snippet doc/src/snippets/qtablewidget-resizing/mainwindow.cpp 0
-    \snippet doc/src/snippets/qtablewidget-resizing/mainwindow.cpp 1
+    \snippet qtablewidget-resizing/mainwindow.cpp 0
+    \snippet qtablewidget-resizing/mainwindow.cpp 1
 
     Items are created ouside the table (with no parent widget) and inserted
     into the table with setItem():
 
-    \snippet doc/src/snippets/qtablewidget-resizing/mainwindow.cpp 2
+    \snippet qtablewidget-resizing/mainwindow.cpp 2
 
     If you want to enable sorting in your table widget, do so after you
     have populated it with items, otherwise sorting may interfere with
@@ -1530,7 +1530,7 @@ QTableWidgetItem &QTableWidgetItem::operator=(const QTableWidgetItem &other)
     construct a table item with an icon and aligned text, and use it as the
     header for a particular column:
 
-    \snippet doc/src/snippets/qtablewidget-using/mainwindow.cpp 2
+    \snippet qtablewidget-using/mainwindow.cpp 2
 
     The number of rows in the table can be found with rowCount(), and the
     number of columns with columnCount(). The table can be cleared with the
@@ -2267,7 +2267,7 @@ QWidget *QTableWidget::cellWidget(int row, int column) const
     deleted. For example, in the code snippet below, the QLineEdit object will
     be deleted.
 
-    \snippet doc/src/snippets/code/src_gui_itemviews_qtablewidget.cpp 0
+    \snippet code/src_gui_itemviews_qtablewidget.cpp 0
 
     \sa cellWidget()
 */
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 04835b63b4..44dd4b0761 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -85,8 +85,8 @@ QT_BEGIN_NAMESPACE
     model. In the following example, the contents of a directory are
     supplied by a QFileSystemModel and displayed as a tree:
 
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 3
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 6
+    \snippet shareddirmodel/main.cpp 3
+    \snippet shareddirmodel/main.cpp 6
 
     The model/view architecture ensures that the contents of the tree view
     are updated as the model changes.
diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index e2d84825f0..d9d6c1434c 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -901,12 +901,12 @@ void QTreeModel::timerEvent(QTimerEvent *ev)
   to represent cities of the world, and adds a entry for Oslo as a child
   item:
 
-  \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 3
+  \snippet qtreewidget-using/mainwindow.cpp 3
 
   Items can be added in a particular order by specifying the item they
   follow when they are constructed:
 
-  \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 5
+  \snippet qtreewidget-using/mainwindow.cpp 5
 
   Each column in an item can have its own background brush which is set with
   the setBackground() function. The current background brush can be
@@ -2355,7 +2355,7 @@ void QTreeWidgetPrivate::_q_dataChanged(const QModelIndex &topLeft,
 
   In its simplest form, a tree widget can be constructed in the following way:
 
-  \snippet doc/src/snippets/code/src_gui_itemviews_qtreewidget.cpp 0
+  \snippet code/src_gui_itemviews_qtreewidget.cpp 0
 
   Before items can be added to the tree widget, the number of columns must
   be set with setColumnCount(). This allows each item to have one or more
diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.cpp b/src/widgets/itemviews/qtreewidgetitemiterator.cpp
index 116860ce89..45fddc7333 100644
--- a/src/widgets/itemviews/qtreewidgetitemiterator.cpp
+++ b/src/widgets/itemviews/qtreewidgetitemiterator.cpp
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
   For example, the following code examples each item in a tree, checking the
   text in the first column against a user-specified search string:
 
-  \snippet doc/src/snippets/qtreewidgetitemiterator-using/mainwindow.cpp 0
+  \snippet qtreewidgetitemiterator-using/mainwindow.cpp 0
 
   It is also possible to filter out certain types of node by passing certain
   \l{IteratorFlag}{flags} to the constructor of QTreeWidgetItemIterator.
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
index c4f7995087..f3455d34ad 100644
--- a/src/widgets/kernel/qaction.cpp
+++ b/src/widgets/kernel/qaction.cpp
@@ -235,10 +235,10 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
     menu and toolbar, then connected to the slot which will perform
     the action. For example:
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 19
+    \snippet mainwindows/application/mainwindow.cpp 19
     \codeline
-    \snippet examples/mainwindows/application/mainwindow.cpp 28
-    \snippet examples/mainwindows/application/mainwindow.cpp 31
+    \snippet mainwindows/application/mainwindow.cpp 28
+    \snippet mainwindows/application/mainwindow.cpp 31
 
     We recommend that actions are created as children of the window
     they are used in. In most cases actions will be children of
@@ -1037,7 +1037,7 @@ bool QAction::isChecked() const
     which indicates that they are unavailable. For example, they might
     be displayed using only shades of gray.
 
-    \gui{What's This?} help on disabled actions is still available, provided
+    \uicontrol{What's This?} help on disabled actions is still available, provided
     that the QAction::whatsThis property is set.
 
     An action will be disabled when all widgets to which it is added
@@ -1328,7 +1328,7 @@ QAction::SoftKeyRole QAction::softKeyRole() const
     the presence (or abscence) of the attribute.
 
     For example:
-    \snippet doc/src/snippets/code/src_gui_kernel_qaction.cpp 0
+    \snippet code/src_gui_kernel_qaction.cpp 0
 
     \sa QAction::icon QApplication::setAttribute()
 */
diff --git a/src/widgets/kernel/qactiongroup.cpp b/src/widgets/kernel/qactiongroup.cpp
index 46ca378bbe..2cf8932859 100644
--- a/src/widgets/kernel/qactiongroup.cpp
+++ b/src/widgets/kernel/qactiongroup.cpp
@@ -109,15 +109,15 @@ void QActionGroupPrivate::_q_actionHovered()
     \inmodule QtWidgets
 
     In some situations it is useful to group QAction objects together.
-    For example, if you have a \gui{Left Align} action, a \gui{Right
-    Align} action, a \gui{Justify} action, and a \gui{Center} action,
+    For example, if you have a \uicontrol{Left Align} action, a \uicontrol{Right
+    Align} action, a \uicontrol{Justify} action, and a \uicontrol{Center} action,
     only one of these actions should be active at any one time. One
     simple way of achieving this is to group the actions together in
     an action group.
 
     Here's a example (from the \l{mainwindows/menus}{Menus} example):
 
-    \snippet examples/mainwindows/menus/mainwindow.cpp 6
+    \snippet mainwindows/menus/mainwindow.cpp 6
 
     Here we create a new action group. Since the action group is
     exclusive by default, only one of the actions in the group is
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 734c737e84..381aa29eba 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -575,7 +575,7 @@ QApplication::QApplication(int &argc, char **argv, int _internal)
 
     \obsolete
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 0
+    \snippet code/src_gui_kernel_qapplication.cpp 0
 */
 
 QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal)
@@ -1106,7 +1106,7 @@ QStyle *QApplication::style()
     still the parent of the application object.
 
     Example usage:
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 1
+    \snippet code/src_gui_kernel_qapplication.cpp 1
 
     When switching application styles, the color palette is set back to the
     initial colors or the system defaults. This is necessary since certain
@@ -1298,7 +1298,7 @@ int QApplication::colorSpec()
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 2
+    \snippet code/src_gui_kernel_qapplication.cpp 2
 
     \sa colorSpec()
 */
@@ -1322,7 +1322,7 @@ void QApplication::setColorSpec(int spec)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 3
+    \snippet code/src_gui_kernel_qapplication.cpp 3
 
     By default, this property contains a QSize object with zero width and height.
 */
@@ -1675,7 +1675,7 @@ void QApplication::setWindowIcon(const QIcon &icon)
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 4
+    \snippet code/src_gui_kernel_qapplication.cpp 4
 
     \sa allWidgets(), QWidget::isWindow(), QWidget::isHidden()
 */
@@ -1700,7 +1700,7 @@ QWidgetList QApplication::topLevelWidgets()
     \note Some of the widgets may be hidden.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 5
+    \snippet code/src_gui_kernel_qapplication.cpp 5
 
     \sa topLevelWidgets(), QWidget::isVisible()
 */
@@ -1810,10 +1810,10 @@ QFontMetrics QApplication::fontMetrics()
     Closes all top-level windows.
 
     This function is particularly useful for applications with many top-level
-    windows. It could, for example, be connected to a \gui{Exit} entry in the
-    \gui{File} menu:
+    windows. It could, for example, be connected to a \uicontrol{Exit} entry in the
+    \uicontrol{File} menu:
 
-    \snippet examples/mainwindows/mdi/mainwindow.cpp 0
+    \snippet mainwindows/mdi/mainwindow.cpp 0
 
     The windows are closed in random order, until one window does not accept
     the close event. The application quits when the last window was
@@ -1850,7 +1850,7 @@ void QApplication::closeAllWindows()
     Displays a simple message box about Qt. The message includes the version
     number of Qt being used by the application.
 
-    This is useful for inclusion in the \gui Help menu of an application, as
+    This is useful for inclusion in the \uicontrol Help menu of an application, as
     shown in the \l{mainwindows/menus}{Menus} example.
 
     This function is a convenience slot for QMessageBox::aboutQt().
@@ -2873,7 +2873,7 @@ void QApplication::setStartDragDistance(int l)
     and the current position (e.g. in the mouse move event) is \c currentPos,
     you can find out if a drag should be started with code like this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 7
+    \snippet code/src_gui_kernel_qapplication.cpp 7
 
     Qt uses this value internally, e.g. in QFileDialog.
 
@@ -3722,7 +3722,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     Here's an example of how an application's QApplication::commitData() might
     be implemented:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 8
+    \snippet code/src_gui_kernel_qapplication.cpp 8
 
     If an error occurred within the application while saving its data, you may
     want to try allowsErrorInteraction() instead.
@@ -3794,7 +3794,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     If the session manager is capable of restoring sessions it will execute
     \a command in order to restore the application. The command defaults to
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 9
+    \snippet code/src_gui_kernel_qapplication.cpp 9
 
     The \c -session option is mandatory; otherwise QApplication cannot tell
     whether it has been restored or what the current session identifier is.
@@ -3818,7 +3818,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
 
     To iterate over the list, you can use the \l foreach pseudo-keyword:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 10
+    \snippet code/src_gui_kernel_qapplication.cpp 10
 
     \sa setRestartCommand(), restartHint()
 */
@@ -3839,7 +3839,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
 
     To iterate over the list, you can use the \l foreach pseudo-keyword:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 11
+    \snippet code/src_gui_kernel_qapplication.cpp 11
 
     \sa setDiscardCommand(), restartCommand(), setRestartCommand()
 */
@@ -3967,7 +3967,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     Use the two-argument widgetAt() overload to get the child widget. To get
     the top-level widget do this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 12
+    \snippet code/src_gui_kernel_qapplication.cpp 12
 */
 
 /*!
@@ -3976,7 +3976,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     Use the single-argument widgetAt() overload to get the child widget. To get
     the top-level widget do this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 13
+    \snippet code/src_gui_kernel_qapplication.cpp 13
 */
 
 bool QApplicationPrivate::inPopupMode() const
@@ -4098,7 +4098,7 @@ bool QApplication::keypadNavigationEnabled()
     flash time, then hidden for the same amount of time, but this may vary.
 
     The default value on X11 is 1000 milliseconds. On Windows, the
-    \gui{Control Panel} value is used and setting this property sets the cursor
+    \uicontrol{Control Panel} value is used and setting this property sets the cursor
     flash time for all applications.
 
     We recommend that widgets do not cache this value as it may change at any
diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp
index 7ea77d211c..46c51d1d37 100644
--- a/src/widgets/kernel/qboxlayout.cpp
+++ b/src/widgets/kernel/qboxlayout.cpp
@@ -1239,13 +1239,13 @@ QBoxLayout::Direction QBoxLayout::direction() const
 
     The simplest use of the class is like this:
 
-    \snippet doc/src/snippets/layouts/layouts.cpp 0
-    \snippet doc/src/snippets/layouts/layouts.cpp 1
-    \snippet doc/src/snippets/layouts/layouts.cpp 2
+    \snippet layouts/layouts.cpp 0
+    \snippet layouts/layouts.cpp 1
+    \snippet layouts/layouts.cpp 2
     \codeline
-    \snippet doc/src/snippets/layouts/layouts.cpp 3
-    \snippet doc/src/snippets/layouts/layouts.cpp 4
-    \snippet doc/src/snippets/layouts/layouts.cpp 5
+    \snippet layouts/layouts.cpp 3
+    \snippet layouts/layouts.cpp 4
+    \snippet layouts/layouts.cpp 5
 
     First, we create the widgets we want in the layout. Then, we
     create the QHBoxLayout object and add the widgets into the
@@ -1302,13 +1302,13 @@ QHBoxLayout::~QHBoxLayout()
 
     The simplest use of the class is like this:
 
-    \snippet doc/src/snippets/layouts/layouts.cpp 6
-    \snippet doc/src/snippets/layouts/layouts.cpp 7
-    \snippet doc/src/snippets/layouts/layouts.cpp 8
+    \snippet layouts/layouts.cpp 6
+    \snippet layouts/layouts.cpp 7
+    \snippet layouts/layouts.cpp 8
     \codeline
-    \snippet doc/src/snippets/layouts/layouts.cpp 9
-    \snippet doc/src/snippets/layouts/layouts.cpp 10
-    \snippet doc/src/snippets/layouts/layouts.cpp 11
+    \snippet layouts/layouts.cpp 9
+    \snippet layouts/layouts.cpp 10
+    \snippet layouts/layouts.cpp 11
 
     First, we create the widgets we want in the layout. Then, we
     create the QVBoxLayout object and add the widgets into the
diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp
index 440f3f1dc2..bc4527a1e0 100644
--- a/src/widgets/kernel/qformlayout.cpp
+++ b/src/widgets/kernel/qformlayout.cpp
@@ -1038,11 +1038,11 @@ QStyle* QFormLayoutPrivate::getStyle() const
        creates a QLabel behind the scenes and automatically set up
        its buddy. We can then write code like this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qformlayout.cpp 0
+    \snippet code/src_gui_kernel_qformlayout.cpp 0
 
        Compare this with the following code, written using QGridLayout:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qformlayout.cpp 1
+    \snippet code/src_gui_kernel_qformlayout.cpp 1
     \endlist
 
     The table below shows the default appearance in different styles.
@@ -1083,7 +1083,7 @@ QStyle* QFormLayoutPrivate::getStyle() const
     appearance of QMacStyle on all platforms, but with left-aligned
     labels, you could write:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qformlayout.cpp 2
+    \snippet code/src_gui_kernel_qformlayout.cpp 2
 
     \sa QGridLayout, QBoxLayout, QStackedLayout
 */
diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp
index 62c99a64c8..dc506b780c 100644
--- a/src/widgets/kernel/qicon.cpp
+++ b/src/widgets/kernel/qicon.cpp
@@ -467,11 +467,11 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
   resource, and then use it, allowing Qt to work out all the required
   icon styles and sizes. For example:
 
-  \snippet doc/src/snippets/code/src_gui_image_qicon.cpp 0
+  \snippet code/src_gui_image_qicon.cpp 0
 
   To undo a QIcon, simply set a null icon in its place:
 
-  \snippet doc/src/snippets/code/src_gui_image_qicon.cpp 1
+  \snippet code/src_gui_image_qicon.cpp 1
 
   Use the QImageReader::supportedImageFormats() and
   QImageWriter::supportedImageFormats() functions to retrieve a
@@ -500,7 +500,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
   Provide a method to set a QIcon, and when you draw the icon, choose
   whichever pixmap is appropriate for the current state of your widget.
   For example:
-  \snippet doc/src/snippets/code/src_gui_image_qicon.cpp 2
+  \snippet code/src_gui_image_qicon.cpp 2
 
   You might also make use of the \c Active mode, perhaps making your
   widget \c Active when the mouse is over the widget (see \l
@@ -947,12 +947,12 @@ QString QIcon::themeName()
 
     To fetch an icon from the current icon theme:
 
-    \snippet doc/src/snippets/code/src_gui_image_qicon.cpp 3
+    \snippet code/src_gui_image_qicon.cpp 3
 
     Or if you want to provide a guaranteed fallback for platforms that
     do not support theme icons, you can use the second argument:
 
-    \snippet doc/src/snippets/code/src_gui_image_qicon.cpp 4
+    \snippet code/src_gui_image_qicon.cpp 4
 
     \note By default, only X11 will support themed icons. In order to
     use themed icons on Mac and Windows, you will have to bundle a
diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 8c4e988411..a7760711b6 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -1117,7 +1117,7 @@ bool QLayout::activate()
     This function can be used to iterate over a layout. The following
     code will draw a rectangle for each layout item in the layout structure of the widget.
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qlayout.cpp 0
+    \snippet code/src_gui_kernel_qlayout.cpp 0
 
     \sa count(), takeAt()
 */
@@ -1134,7 +1134,7 @@ bool QLayout::activate()
     The following code fragment shows a safe way to remove all items
     from a layout:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qlayout.cpp 1
+    \snippet code/src_gui_kernel_qlayout.cpp 1
 
     \sa itemAt(), count()
 */
diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 6cf3e1fe42..cf220796c5 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -392,7 +392,7 @@ int QLayoutItem::minimumHeightForWidth(int w) const
 
     Reimplement this function in layout managers that support height
     for width. A typical implementation will look like this:
-    \snippet doc/src/snippets/code/src_gui_kernel_qlayoutitem.cpp 0
+    \snippet code/src_gui_kernel_qlayoutitem.cpp 0
 
     Caching is strongly recommended; without it layout will take
     exponential time.
diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp
index 92f6fbafba..23487073f8 100644
--- a/src/widgets/kernel/qshortcut.cpp
+++ b/src/widgets/kernel/qshortcut.cpp
@@ -284,17 +284,17 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
     objects can be informed when a shortcut is executed. The shortcut
     can be set up to contain all the key presses necessary to
     describe a keyboard shortcut, including the states of modifier
-    keys such as \gui Shift, \gui Ctrl, and \gui Alt.
+    keys such as \uicontrol Shift, \uicontrol Ctrl, and \uicontrol Alt.
 
     \target mnemonic
 
     On certain widgets, using '&' in front of a character will
     automatically create a mnemonic (a shortcut) for that character,
-    e.g. "E&xit" will create the shortcut \gui Alt+X (use '&&' to
+    e.g. "E&xit" will create the shortcut \uicontrol Alt+X (use '&&' to
     display an actual ampersand). The widget might consume and perform
     an action on a given shortcut. On X11 the ampersand will not be
     shown and the character will be underlined. On Windows, shortcuts
-    are normally not displayed until the user presses the \gui Alt
+    are normally not displayed until the user presses the \uicontrol Alt
     key, but this is a setting the user can change. On Mac, shortcuts
     are disabled by default. Call qt_set_sequence_auto_mnemonic() to
     enable them. However, because mnemonic shortcuts do not fit in
@@ -310,7 +310,7 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge
     The simplest way to create a shortcut for a particular widget is
     to construct the shortcut with a key sequence. For example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qshortcut.cpp 0
+    \snippet code/src_gui_kernel_qshortcut.cpp 0
 
     When the user types the \l{QKeySequence}{key sequence}
     for a given shortcut, the shortcut's activated() signal is
@@ -449,7 +449,7 @@ QShortcut::~QShortcut()
     This is a key sequence with an optional combination of Shift, Ctrl,
     and Alt. The key sequence may be supplied in a number of ways:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qshortcut.cpp 1
+    \snippet code/src_gui_kernel_qshortcut.cpp 1
 
     By default, this property contains an empty key sequence.
 */
diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp
index 0d2e7716e5..7db317e2bb 100644
--- a/src/widgets/kernel/qstackedlayout.cpp
+++ b/src/widgets/kernel/qstackedlayout.cpp
@@ -74,17 +74,17 @@ public:
     A QStackedLayout can be populated with a number of child widgets
     ("pages"). For example:
 
-    \snippet doc/src/snippets/qstackedlayout/main.cpp 0
+    \snippet qstackedlayout/main.cpp 0
     \codeline
-    \snippet doc/src/snippets/qstackedlayout/main.cpp 2
-    \snippet doc/src/snippets/qstackedlayout/main.cpp 3
+    \snippet qstackedlayout/main.cpp 2
+    \snippet qstackedlayout/main.cpp 3
 
     QStackedLayout provides no intrinsic means for the user to switch
     page. This is typically done through a QComboBox or a QListWidget
     that stores the titles of the QStackedLayout's pages. For
     example:
 
-    \snippet doc/src/snippets/qstackedlayout/main.cpp 1
+    \snippet qstackedlayout/main.cpp 1
 
     When populating a layout, the widgets are added to an internal
     list. The indexOf() function returns the index of a widget in that
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 5df69be020..9f4d8571b3 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -102,7 +102,7 @@ QT_BEGIN_NAMESPACE
     simple method to determine whether the text can be rendered as
     plain text. See Qt::mightBeRichText() for details.
 
-    \snippet doc/src/snippets/whatsthis/whatsthis.cpp 0
+    \snippet whatsthis/whatsthis.cpp 0
 
     An alternative way to enter "What's This?" mode is to call
     createAction(), and add the returned QAction to either a menu or
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 9abba54390..6d5bdf92cd 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2737,12 +2737,12 @@ void QWidget::overrideWindowState(Qt::WindowStates newstate)
     windows, the change is immediate. For example, to toggle between
     full-screen and normal mode, use the following code:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 0
+    \snippet code/src_gui_kernel_qwidget.cpp 0
 
     In order to restore and activate a minimized window (while
     preserving its maximized and/or full-screen state), use the following:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 1
+    \snippet code/src_gui_kernel_qwidget.cpp 1
 
     Calling this function will hide the widget. You must call show() to make
     the widget visible again.
@@ -3535,7 +3535,7 @@ QSize QWidget::maximumSize() const
     sizeIncrement.height() pixels vertically, with baseSize() as the
     basis. Preferred widget sizes are for non-negative integers \e i
     and \e j:
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 2
+    \snippet code/src_gui_kernel_qwidget.cpp 2
 
     Note that while you can set the size increment for all widgets, it
     only affects windows.
@@ -3946,7 +3946,7 @@ QPoint QWidget::mapFromParent(const QPoint &pos) const
 
     Typical usage is changing the window title:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 3
+    \snippet code/src_gui_kernel_qwidget.cpp 3
 
     \sa isWindow()
 */
@@ -4546,7 +4546,7 @@ void QWidget::unsetLayoutDirection()
     objects\endlink for a range of useful shapes.
 
     An editor widget might use an I-beam cursor:
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 6
+    \snippet code/src_gui_kernel_qwidget.cpp 6
 
     If no cursor has been set, or after a call to unsetCursor(), the
     parent's cursor is used.
@@ -4638,7 +4638,7 @@ void QWidget::unsetCursor()
     using \a renderFlags to determine how to render. Rendering
     starts at \a targetOffset in the \a target. For example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 7
+    \snippet code/src_gui_kernel_qwidget.cpp 7
 
     If \a sourceRegion is a null region, this function will use QWidget::rect() as
     the region, i.e. the entire widget.
@@ -4646,7 +4646,7 @@ void QWidget::unsetCursor()
     Ensure that you call QPainter::end() for the \a target device's
     active painter (if any) before rendering. For example:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 8
+    \snippet code/src_gui_kernel_qwidget.cpp 8
 
     \note To obtain the contents of an OpenGL widget, use QGLWidget::grabFrameBuffer()
     or QGLWidget::renderPixmap() instead.
@@ -6267,11 +6267,11 @@ bool QWidget::isActiveWindow() const
     Note that since the tab order of the \a second widget is changed, you
     should order a chain like this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 9
+    \snippet code/src_gui_kernel_qwidget.cpp 9
 
     \e not like this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 10
+    \snippet code/src_gui_kernel_qwidget.cpp 10
 
     If \a first or \a second has a focus proxy, setTabOrder()
     correctly substitutes the proxy.
@@ -6532,7 +6532,7 @@ void QWidget::setGeometry(const QRect &r)
     To save the geometry when the window closes, you can
     implement a close event like this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 11
+    \snippet code/src_gui_kernel_qwidget.cpp 11
 
     See the \l{Window Geometry} documentation for an overview of geometry
     issues with windows.
@@ -6591,7 +6591,7 @@ QByteArray QWidget::saveGeometry() const
     To restore geometry saved using QSettings, you can use code like
     this:
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 12
+    \snippet code/src_gui_kernel_qwidget.cpp 12
 
     See the \l{Window Geometry} documentation for an overview of geometry
     issues with windows.
@@ -6917,7 +6917,7 @@ void QWidget::setFocusPolicy(Qt::FocusPolicy policy)
     widgets. Disabling updates solves this.
 
     Example:
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 13
+    \snippet code/src_gui_kernel_qwidget.cpp 13
 
     Disabling a widget implicitly disables all its children. Enabling a widget
     enables all child widgets \e except top-level widgets or those that
@@ -8663,7 +8663,7 @@ void QWidget::leaveEvent(QEvent *)
     \b{Note for the X11 platform}: It is possible to toggle global double
     buffering by calling \c qt_x11_set_global_double_buffer(). For example,
 
-    \snippet doc/src/snippets/code/src_gui_kernel_qwidget.cpp 14
+    \snippet code/src_gui_kernel_qwidget.cpp 14
 
     \note Generally, you should refrain from calling update() or repaint()
     \b{inside} a paintEvent(). For example, calling update() or repaint() on
@@ -9124,7 +9124,7 @@ QLayout *QWidget::layout() const
 
     Example:
 
-    \snippet examples/uitools/textfinder/textfinder.cpp 3b
+    \snippet uitools/textfinder/textfinder.cpp 3b
 
     An alternative to calling this function is to pass this widget to
     the layout's constructor.
@@ -11363,7 +11363,7 @@ void QWidget::setMask(const QRegion &newMask)
     The following code shows how an image with an alpha channel can be
     used to generate a mask for a widget:
 
-    \snippet doc/src/snippets/widget-mask/main.cpp 0
+    \snippet widget-mask/main.cpp 0
 
     The label shown by this code is masked using the image it contains,
     giving the appearance that an irregularly-shaped image is being drawn
diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp
index 15788e34f5..5c1d0ce098 100644
--- a/src/widgets/styles/qdrawutil.cpp
+++ b/src/widgets/styles/qdrawutil.cpp
@@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded line:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 0
+    \snippet code/src_gui_painting_qdrawutil.cpp 0
 
     \sa qDrawShadeRect(), qDrawShadePanel(), QStyle
 */
@@ -199,7 +199,7 @@ void qDrawShadeLine(QPainter *p, int x1, int y1, int x2, int y2,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded rectangle:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 1
+    \snippet code/src_gui_painting_qdrawutil.cpp 1
 
     \sa qDrawShadeLine(), qDrawShadePanel(), qDrawPlainRect(), QStyle
 */
@@ -300,7 +300,7 @@ void qDrawShadeRect(QPainter *p, int x, int y, int w, int h,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded panel:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 2
+    \snippet code/src_gui_painting_qdrawutil.cpp 2
 
     \sa qDrawWinPanel(), qDrawShadeLine(), qDrawShadeRect(), QStyle
 */
@@ -471,7 +471,7 @@ void qDrawWinButton(QPainter *p, int x, int y, int w, int h,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded panel:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 3
+    \snippet code/src_gui_painting_qdrawutil.cpp 3
 
     \sa qDrawShadePanel(), qDrawWinButton(), QStyle
 */
@@ -507,7 +507,7 @@ void qDrawWinPanel(QPainter *p, int x, int y, int w, int h,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a plain rectangle:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 4
+    \snippet code/src_gui_painting_qdrawutil.cpp 4
 
     \sa qDrawShadeRect(), QStyle
 */
@@ -566,7 +566,7 @@ void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &c,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded line:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 5
+    \snippet code/src_gui_painting_qdrawutil.cpp 5
 
     \sa qDrawShadeRect(), qDrawShadePanel(), QStyle
 */
@@ -605,7 +605,7 @@ void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded rectangle:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 6
+    \snippet code/src_gui_painting_qdrawutil.cpp 6
 
     \sa qDrawShadeLine(), qDrawShadePanel(), qDrawPlainRect(), QStyle
 */
@@ -642,7 +642,7 @@ void qDrawShadeRect(QPainter *p, const QRect &r,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded panel:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 7
+    \snippet code/src_gui_painting_qdrawutil.cpp 7
 
     \sa qDrawWinPanel(), qDrawShadeLine(), qDrawShadeRect(), QStyle
 */
@@ -703,7 +703,7 @@ void qDrawWinButton(QPainter *p, const QRect &r,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a shaded panel:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 8
+    \snippet code/src_gui_painting_qdrawutil.cpp 8
 
     \sa qDrawShadePanel(), qDrawWinButton(), QStyle
 */
@@ -730,7 +730,7 @@ void qDrawWinPanel(QPainter *p, const QRect &r,
     Alternatively you can use a QFrame widget and apply the
     QFrame::setFrameStyle() function to display a plain rectangle:
 
-    \snippet doc/src/snippets/code/src_gui_painting_qdrawutil.cpp 9
+    \snippet code/src_gui_painting_qdrawutil.cpp 9
 
     \sa qDrawShadeRect(), QStyle
 */
diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp
index 5bcd83a6ea..80124872a6 100644
--- a/src/widgets/styles/qproxystyle.cpp
+++ b/src/widgets/styles/qproxystyle.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
     The following example shows how to override the shortcut underline
     behavior on any platform:
 
-    \snippet doc/src/snippets/code/src_gui_qproxystyle.cpp 1
+    \snippet code/src_gui_qproxystyle.cpp 1
 
     Warning: The \l {QCommonStyle} {common styles} provided by Qt will
     respect this hint, because they call QStyle::proxy(), but there is
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index d78a2ee2fb..b4f24acf84 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -107,7 +107,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     QApplication::setStyle() function. It can also be specified by the
     user of the application, using the \c -style command-line option:
 
-    \snippet doc/src/snippets/code/src_gui_styles_qstyle.cpp 0
+    \snippet code/src_gui_styles_qstyle.cpp 0
 
     If no style is specified, Qt will choose the most appropriate
     style for the user's platform or desktop environment.
@@ -133,7 +133,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     For example, if you want to draw a focus rectangle on your
     widget, you can write:
 
-    \snippet doc/src/snippets/styles/styles.cpp 1
+    \snippet styles/styles.cpp 1
 
     QStyle gets all the information it needs to render the graphical
     element from QStyleOption. The widget is passed as the last
@@ -154,15 +154,15 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     combines a QStyle, a QPainter, and a QWidget. This makes it
     possible to write
 
-    \snippet doc/src/snippets/styles/styles.cpp 5
+    \snippet styles/styles.cpp 5
     \dots
-    \snippet doc/src/snippets/styles/styles.cpp 7
+    \snippet styles/styles.cpp 7
 
     instead of
 
-    \snippet doc/src/snippets/styles/styles.cpp 2
+    \snippet styles/styles.cpp 2
     \dots
-    \snippet doc/src/snippets/styles/styles.cpp 3
+    \snippet styles/styles.cpp 3
 
     \section1 Creating a Custom Style
 
@@ -190,16 +190,16 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     function, so we need to reimplement that function. We need the
     following class declaration:
 
-    \snippet doc/src/snippets/customstyle/customstyle.h 0
+    \snippet customstyle/customstyle.h 0
 
     To draw its up and down arrows, QSpinBox uses the
     PE_IndicatorSpinUp and PE_IndicatorSpinDown primitive elements.
     Here's how to reimplement the drawPrimitive() function to draw
     them differently:
 
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 2
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 3
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 4
+    \snippet customstyle/customstyle.cpp 2
+    \snippet customstyle/customstyle.cpp 3
+    \snippet customstyle/customstyle.cpp 4
 
     Notice that we don't use the \c widget argument, except to pass it
     on to the QWindowStyle::drawPrimitive() function. As mentioned
@@ -211,9 +211,9 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     information, be careful to ensure that it isn't 0 and that it is
     of the correct type before using it. For example:
 
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 0
+    \snippet customstyle/customstyle.cpp 0
     \dots
-    \snippet doc/src/snippets/customstyle/customstyle.cpp 1
+    \snippet customstyle/customstyle.cpp 1
 
     When implementing a custom style, you cannot assume that the
     widget is a QSpinBox just because the enum value is called
@@ -233,7 +233,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     QApplication::setStyle() static function before creating the
     QApplication object:
 
-    \snippet snippets/customstyle/main.cpp using a custom style
+    \snippet customstyle/main.cpp using a custom style
 
     You can call QApplication::setStyle() at any time, but by calling
     it before the constructor, you ensure that the user's preference,
@@ -252,7 +252,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     automatically. To use your new style with existing applications,
     simply start the application with the following argument:
 
-    \snippet doc/src/snippets/code/src_gui_styles_qstyle.cpp 1
+    \snippet code/src_gui_styles_qstyle.cpp 1
 
     The application will use the look and feel from the custom style you
     implemented.
@@ -306,7 +306,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     We include a small example where we customize the drawing of item
     backgrounds.
 
-    \snippet doc/src/snippets/customviewstyle.cpp 0
+    \snippet customviewstyle.cpp 0
 
     The primitive element PE_PanelItemViewItem is responsible for
     painting the background of items, and is called from
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 0b0c6e2393..1da5d786c7 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE
     The following code snippet shows how to use a specific
     QStyleOption subclass to paint a push button:
 
-    \snippet doc/src/snippets/qstyleoption/main.cpp 0
+    \snippet qstyleoption/main.cpp 0
 
     In our example, the control is a QStyle::CE_PushButton, and
     according to the QStyle::drawControl() documentation the
@@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE
     For safety, you can use qstyleoption_cast() to ensure that the
     pointer type is correct. For example:
 
-    \snippet doc/src/snippets/qstyleoption/main.cpp 4
+    \snippet qstyleoption/main.cpp 4
 
     The qstyleoption_cast() function will return 0 if the object to
     which \c option points is not of the correct type.
@@ -3240,7 +3240,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
 
     Example:
 
-    \snippet doc/src/snippets/qstyleoption/main.cpp 4
+    \snippet qstyleoption/main.cpp 4
 
     \sa QStyleOption::type, QStyleOption::version
 */
@@ -3958,7 +3958,7 @@ QStyleHintReturnVariant::QStyleHintReturnVariant() : QStyleHintReturn(Version, T
 
     Example:
 
-    \snippet doc/src/snippets/code/src_gui_styles_qstyleoption.cpp 0
+    \snippet code/src_gui_styles_qstyleoption.cpp 0
 
     \sa QStyleHintReturn::type, QStyleHintReturn::version
 */
diff --git a/src/widgets/styles/qstylepainter.cpp b/src/widgets/styles/qstylepainter.cpp
index b15b9d1a38..ff7db79009 100644
--- a/src/widgets/styles/qstylepainter.cpp
+++ b/src/widgets/styles/qstylepainter.cpp
@@ -65,13 +65,13 @@ QT_BEGIN_NAMESPACE
 
     Example using QStyle directly:
 
-    \snippet doc/src/snippets/styles/styles.cpp 1
+    \snippet styles/styles.cpp 1
 
     Example using QStylePainter:
 
-    \snippet doc/src/snippets/styles/styles.cpp 0
-    \snippet doc/src/snippets/styles/styles.cpp 4
-    \snippet doc/src/snippets/styles/styles.cpp 6
+    \snippet styles/styles.cpp 0
+    \snippet styles/styles.cpp 4
+    \snippet styles/styles.cpp 6
 
     \sa QStyle, QStyleOption
 */
diff --git a/src/widgets/styles/qstyleplugin.cpp b/src/widgets/styles/qstyleplugin.cpp
index 74c29f39c8..b36ffcf181 100644
--- a/src/widgets/styles/qstyleplugin.cpp
+++ b/src/widgets/styles/qstyleplugin.cpp
@@ -83,10 +83,10 @@ QT_BEGIN_NAMESPACE
     The style key is usually the class name of the required
     style. Note that the keys are case insensitive. For example:
 
-    \snippet doc/src/snippets/qstyleplugin/main.cpp 0
+    \snippet qstyleplugin/main.cpp 0
     \codeline
-    \snippet doc/src/snippets/qstyleplugin/main.cpp 1
-    \snippet doc/src/snippets/qstyleplugin/main.cpp 2
+    \snippet qstyleplugin/main.cpp 1
+    \snippet qstyleplugin/main.cpp 2
 
     \sa keys()
 */
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index 91e4a9c3c1..245857b3c3 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -62,12 +62,12 @@
     For example, here's how to provide auto completions from a simple
     word list in a QLineEdit:
 
-    \snippet doc/src/snippets/code/src_gui_util_qcompleter.cpp 0
+    \snippet code/src_gui_util_qcompleter.cpp 0
 
     A QFileSystemModel can be used to provide auto completion of file names.
     For example:
 
-    \snippet doc/src/snippets/code/src_gui_util_qcompleter.cpp 1
+    \snippet code/src_gui_util_qcompleter.cpp 1
 
     To set the model on which QCompleter should operate, call
     setModel(). By default, QCompleter will attempt to match the \l
@@ -100,7 +100,7 @@
     currentCompletion(). You can iterate through the list of
     completions as below:
 
-    \snippet doc/src/snippets/code/src_gui_util_qcompleter.cpp 2
+    \snippet code/src_gui_util_qcompleter.cpp 2
 
     completionCount() returns the total number of completions for the
     current prefix. completionCount() should be avoided when possible,
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index 5392dd2f8e..3951017f89 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
     a change to the document with redo() and undo the change with undo(). The
     implementations for these functions must be provided in a derived class.
 
-    \snippet doc/src/snippets/code/src_gui_util_qundostack.cpp 0
+    \snippet code/src_gui_util_qundostack.cpp 0
 
     A QUndoCommand has an associated text(). This is a short string
     describing what the command does. It is used to update the text
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
     QUndoCommand objects are owned by the stack they were pushed on.
     QUndoStack deletes a command if it has been undone and a new command is pushed. For example:
 
-\snippet doc/src/snippets/code/src_gui_util_qundostack.cpp 1
+\snippet code/src_gui_util_qundostack.cpp 1
 
     In effect, when a command is pushed, it becomes the top-most command
     on the stack.
@@ -93,7 +93,7 @@ QT_BEGIN_NAMESPACE
     redo() on all its children. The parent should, however, have a meaningful
     text().
 
-    \snippet doc/src/snippets/code/src_gui_util_qundostack.cpp 2
+    \snippet code/src_gui_util_qundostack.cpp 2
 
     Another way to create macros is to use the convenience functions
     QUndoStack::beginMacro() and QUndoStack::endMacro().
@@ -182,7 +182,7 @@ int QUndoCommand::id() const
 
     The default implementation returns false.
 
-    \snippet doc/src/snippets/code/src_gui_util_qundostack.cpp 3
+    \snippet code/src_gui_util_qundostack.cpp 3
 
     \sa id() QUndoStack::push()
 */
@@ -943,11 +943,11 @@ QAction *QUndoStack::createRedoAction(QObject *parent, const QString &prefix) co
     The stack becomes enabled and appropriate signals are emitted when endMacro()
     is called for the outermost macro.
 
-    \snippet doc/src/snippets/code/src_gui_util_qundostack.cpp 4
+    \snippet code/src_gui_util_qundostack.cpp 4
 
     This code is equivalent to:
 
-    \snippet doc/src/snippets/code/src_gui_util_qundostack.cpp 5
+    \snippet code/src_gui_util_qundostack.cpp 5
 
     \sa endMacro()
 */
diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp
index 4e85eae3ff..0c22576f7f 100644
--- a/src/widgets/widgets/qabstractbutton.cpp
+++ b/src/widgets/widgets/qabstractbutton.cpp
@@ -86,7 +86,7 @@ Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets;
     ampersand ('&'), QAbstractButton automatically creates a shortcut
     key. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp 0
+    \snippet code/src_gui_widgets_qabstractbutton.cpp 0
 
     The \key Alt+C shortcut is assigned to the button, i.e., when the
     user presses \key Alt+C the button will call animateClick(). See
@@ -97,7 +97,7 @@ Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets;
     function. This is useful mostly for buttons that do not have any
     text, because they have no automatic shortcut.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp 1
+    \snippet code/src_gui_widgets_qabstractbutton.cpp 1
 
     All of the buttons provided by Qt (QPushButton, QToolButton,
     QCheckBox, and QRadioButton) can display both \l text and \l{icon}{icons}.
@@ -1361,7 +1361,7 @@ For example, a slot that reacts to signals emitted by newly checked
 buttons but which ignores signals from buttons that have been unchecked
 can be implemented using the following pattern:
 
-\snippet doc/src/snippets/code/src_gui_widgets_qabstractbutton.cpp 2
+\snippet code/src_gui_widgets_qabstractbutton.cpp 2
 
 Button groups can be created using the QButtonGroup class, and
 updates to the button states monitored with the
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
index dc96321599..d97b03128e 100644
--- a/src/widgets/widgets/qabstractscrollarea.cpp
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
@@ -130,13 +130,13 @@ QT_BEGIN_NAMESPACE
     QWidget::move(). When the area contents or the viewport size
     changes, we do the following:
 
-    \snippet doc/src/snippets/myscrollarea.cpp 1
+    \snippet myscrollarea.cpp 1
 
     When the scroll bars change value, we need to update the widget
     position, i.e., find the part of the widget that is to be drawn in
     the viewport:
 
-    \snippet doc/src/snippets/myscrollarea.cpp 0
+    \snippet myscrollarea.cpp 0
 
     In order to track scroll bar movements, reimplement the virtual
     function scrollContentsBy(). In order to fine-tune scrolling
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 6c556dc870..4d55c9f0af 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -230,7 +230,7 @@ QString QAbstractSpinBox::text() const
     to automatically choose one that will enable the image to fit completely
     within the display window, you can set up the spin box like this:
 
-    \snippet examples/widgets/spinboxes/window.cpp 3
+    \snippet widgets/spinboxes/window.cpp 3
 
     The user will then be able to choose a scale from 1% to 1000%
     or select "Auto" to leave it up to the application to choose. Your code
@@ -275,7 +275,7 @@ void QAbstractSpinBox::setSpecialValueText(const QString &specialValueText)
     to the minimum() value and vica versa. Wrapping only make sense if
     you have minimum() and maximum() values set.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qabstractspinbox.cpp 0
+    \snippet code/src_gui_widgets_qabstractspinbox.cpp 0
 
     \sa QSpinBox::minimum(), QSpinBox::maximum()
 */
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index 427af68b64..acd07d2a5b 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -2004,7 +2004,7 @@ void QCalendarWidgetPrivate::_q_editingFinished()
     \row \li
         \image qcalendarwidget-grid.png
     \row \li
-        \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 0
+        \snippet code/src_gui_widgets_qcalendarwidget.cpp 0
     \endtable
 
     Finally, the day in the first column can be altered using the
@@ -2421,7 +2421,7 @@ void QCalendarWidget::showToday()
     \li \image qcalendarwidget-minimum.png
     \row
     \li
-    \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 1
+    \snippet code/src_gui_widgets_qcalendarwidget.cpp 1
     \endtable
 
     By default, the minimum date is the earliest date that the QDate
@@ -2472,7 +2472,7 @@ void QCalendarWidget::setMinimumDate(const QDate &date)
     \li \image qcalendarwidget-maximum.png
     \row
     \li
-    \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 2
+    \snippet code/src_gui_widgets_qcalendarwidget.cpp 2
     \endtable
 
     By default, the maximum date is the last day the QDate class can
@@ -2518,11 +2518,11 @@ void QCalendarWidget::setMaximumDate(const QDate &date)
     The date range restricts the user selection, i.e. the user can
     only select dates within the specified date range. Note that
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 3
+    \snippet code/src_gui_widgets_qcalendarwidget.cpp 3
 
     is analogous to
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 4
+    \snippet code/src_gui_widgets_qcalendarwidget.cpp 4
 
     If either the \a min or \a max parameters are not valid QDate
     objects, this function does nothing.
@@ -2641,7 +2641,7 @@ void QCalendarWidget::setVerticalHeaderFormat(QCalendarWidget::VerticalHeaderFor
         \li \inlineimage qcalendarwidget-grid.png
     \row
         \li
-        \snippet doc/src/snippets/code/src_gui_widgets_qcalendarwidget.cpp 5
+        \snippet code/src_gui_widgets_qcalendarwidget.cpp 5
     \endtable
 
     The default value is false.
diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp
index 13440ac104..a0093800a5 100644
--- a/src/widgets/widgets/qcheckbox.cpp
+++ b/src/widgets/widgets/qcheckbox.cpp
@@ -107,7 +107,7 @@ public:
     constructor or with setText(). A shortcut key can be specified by preceding
     the preferred character with an ampersand. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qcheckbox.cpp 0
+    \snippet code/src_gui_widgets_qcheckbox.cpp 0
 
     In this example the shortcut is \e{Alt+A}. See the \l{QShortcut#mnemonic}
     {QShortcut} documentation for details (to display an actual ampersand,
diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp
index 0cdb2d1176..4c418bde9e 100644
--- a/src/widgets/widgets/qdatetimeedit.cpp
+++ b/src/widgets/widgets/qdatetimeedit.cpp
@@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
   QDateTimeEdit box. Dates and times appear in accordance with the
   format set; see setDisplayFormat().
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 0
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 0
 
   Here we've created a new QDateTimeEdit object initialized with
   today's date, and restricted the valid date range to today plus or
@@ -397,11 +397,11 @@ void QDateTimeEdit::setMaximumDateTime(const QDateTime &dt)
   function call.
   \since 4.4
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 1
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 1
 
   is analogous to:
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 2
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 2
 
   If either \a min or \a max are not valid, this function does
   nothing.
@@ -560,11 +560,11 @@ void QDateTimeEdit::clearMaximumTime()
   Convenience function to set minimum and maximum date with one
   function call.
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 3
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 3
 
   is analogous to:
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 4
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 4
 
   If either \a min or \a max are not valid, this function does
   nothing.
@@ -587,11 +587,11 @@ void QDateTimeEdit::setDateRange(const QDate &min, const QDate &max)
   Convenience function to set minimum and maximum time with one
   function call.
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 5
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 5
 
   is analogous to:
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qdatetimeedit.cpp 6
+  \snippet code/src_gui_widgets_qdatetimeedit.cpp 6
 
   If either \a min or \a max are not valid, this function does
   nothing.
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index b787522a50..bcf0753d33 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -86,19 +86,19 @@ QT_BEGIN_NAMESPACE
     destructive results.
 
     Most dialogs have buttons that can almost be considered standard (e.g.
-    \gui OK and \gui Cancel buttons). It is sometimes convenient to create these
+    \uicontrol OK and \uicontrol Cancel buttons). It is sometimes convenient to create these
     buttons in a standard way.
 
     There are a couple ways of using QDialogButtonBox. One ways is to create
     the buttons (or button texts) yourself and add them to the button box,
     specifying their role.
 
-    \snippet examples/dialogs/extension/finddialog.cpp 1
+    \snippet dialogs/extension/finddialog.cpp 1
 
     Alternatively, QDialogButtonBox provides several standard buttons (e.g. OK, Cancel, Save)
     that you can use. They exist as flags so you can OR them together in the constructor.
 
-    \snippet examples/dialogs/tabdialog/tabdialog.cpp 2
+    \snippet dialogs/tabdialog/tabdialog.cpp 2
 
     You can mix and match normal buttons and standard buttons.
 
@@ -133,6 +133,8 @@ QT_BEGIN_NAMESPACE
     \table
     \row \li modeless horizontal MacLayout
          \li \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
+    \row \li modeless vertical MacLayout
+         \li \inlineimage buttonbox-mac-modeless-vertical.png Screenshot of modeless vertical MacLayout
     \endtable
 
     When a button is clicked in the button box, the clicked() signal is emitted
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index e40b109455..db45bf4e46 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -1547,7 +1547,7 @@ QAction * QDockWidget::toggleViewAction() const
     \li When DockWidgetVerticalTitleBar is set on QDockWidget, the title
        bar widget is repositioned accordingly. In resizeEvent(), the title
        bar should check what orientation it should assume:
-       \snippet doc/src/snippets/code/src_gui_widgets_qdockwidget.cpp 0
+       \snippet code/src_gui_widgets_qdockwidget.cpp 0
 
     \li The title bar widget must have a valid QWidget::sizeHint() and
        QWidget::minimumSizeHint(). These functions should take into account
diff --git a/src/widgets/widgets/qframe.cpp b/src/widgets/widgets/qframe.cpp
index b69f65828b..d11ff09a30 100644
--- a/src/widgets/widgets/qframe.cpp
+++ b/src/widgets/widgets/qframe.cpp
@@ -79,7 +79,7 @@ inline void QFramePrivate::init()
     screen. QProgressBar has a "sunken" look. QLabel has a flat look.
     The frames of widgets like these can be changed.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qframe.cpp 0
+    \snippet code/src_gui_widgets_qframe.cpp 0
 
     The QFrame class can also be used directly for creating simple
     placeholder frames without any contents.
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp
index d8ad04cd84..343fc85bc9 100644
--- a/src/widgets/widgets/qgroupbox.cpp
+++ b/src/widgets/widgets/qgroupbox.cpp
@@ -169,7 +169,7 @@ void QGroupBoxPrivate::click()
     widgets). The following example shows how we can set up a
     QGroupBox with a layout:
 
-    \snippet examples/widgets/groupbox/window.cpp 2
+    \snippet widgets/groupbox/window.cpp 2
 
     \table 100%
     \row \li \inlineimage windowsxp-groupbox.png Screenshot of a Windows XP style group box
@@ -261,7 +261,7 @@ void QGroupBox::setTitle(const QString &title)
     The group box title text will have a keyboard shortcut if the title
     contains an ampersand ('&') followed by a letter.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qgroupbox.cpp 0
+    \snippet code/src_gui_widgets_qgroupbox.cpp 0
 
     In the example above, \key Alt+U moves the keyboard focus to the
     group box. See the \l {QShortcut#mnemonic}{QShortcut}
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp
index 4450066df4..99deca4709 100644
--- a/src/widgets/widgets/qlabel.cpp
+++ b/src/widgets/widgets/qlabel.cpp
@@ -115,7 +115,7 @@ QT_BEGIN_NAMESPACE
     the bottom right corner (both lines being flush with the right
     side of the label):
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qlabel.cpp 0
+    \snippet code/src_gui_widgets_qlabel.cpp 0
 
     The properties and functions QLabel inherits from QFrame can also
     be used to specify the widget frame to be used for any given label.
@@ -125,7 +125,7 @@ QT_BEGIN_NAMESPACE
     mnemonic (see QKeySequence) that will set the keyboard focus to
     the other widget (called the QLabel's "buddy"). For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qlabel.cpp 1
+    \snippet code/src_gui_widgets_qlabel.cpp 1
 
     In this example, keyboard focus is transferred to the label's
     buddy (the QLineEdit) when the user presses Alt+P. If the buddy
@@ -1150,7 +1150,7 @@ void QLabelPrivate::updateLabel()
     In a dialog, you might create two data entry widgets and a label
     for each, and set up the geometry layout so each label is just to
     the left of its data entry widget (its "buddy"), for example:
-    \snippet doc/src/snippets/code/src_gui_widgets_qlabel.cpp 2
+    \snippet code/src_gui_widgets_qlabel.cpp 2
 
     With the code above, the focus jumps to the Name field when the
     user presses Alt+N, and to the Phone field when the user presses
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index 1ea636ffb2..bbf34b9853 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -1980,7 +1980,7 @@ void QLineEdit::dropEvent(QDropEvent* e)
     to extend the standard context menu, reimplement this function, call
     createStandardContextMenu() and extend the menu returned.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qlineedit.cpp 0
+    \snippet code/src_gui_widgets_qlineedit.cpp 0
 
     The \a event parameter is used to obtain the position where
     the mouse cursor was when the event was generated.
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
index 1c8e6ba0e8..3aff6ee5d9 100644
--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@@ -85,7 +85,7 @@
     developer to provide the autorelease pool.
 
     The following is a snippet of subclassing QMacCocoaViewContainer to wrap a NSSearchField.
-    \snippet examples/mainwindows/macmainwindow/macmainwindow.mm 0
+    \snippet mainwindows/macmainwindow/macmainwindow.mm 0
 
 */
 
diff --git a/src/widgets/widgets/qmacnativewidget_mac.mm b/src/widgets/widgets/qmacnativewidget_mac.mm
index 7974e93d88..e608b4a756 100644
--- a/src/widgets/widgets/qmacnativewidget_mac.mm
+++ b/src/widgets/widgets/qmacnativewidget_mac.mm
@@ -70,11 +70,11 @@
 
     Here is an example of putting a QPushButton into a NSWindow:
 
-    \snippet doc/src/snippets/qmacnativewidget/main.mm 0
+    \snippet qmacnativewidget/main.mm 0
 
     On Carbon, this would do the equivalent:
 
-    \snippet doc/src/snippets/qmacnativewidget/main.mm 1
+    \snippet qmacnativewidget/main.mm 1
 
     Note that QMacNativeWidget requires knowledge of Carbon or Cocoa. All it
     does is get the Qt hierarchy into a window not owned by Qt. It is then up
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp
index 7607f2f238..efd5db07ab 100644
--- a/src/widgets/widgets/qmainwindow.cpp
+++ b/src/widgets/widgets/qmainwindow.cpp
@@ -261,7 +261,7 @@ void QMainWindowPrivate::init()
 
     An example of how to create menus follows:
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 26
+    \snippet mainwindows/application/mainwindow.cpp 26
 
     The \c createPopupMenu() function creates popup menus when the
     main window receives context menu events.  The default
@@ -288,7 +288,7 @@ void QMainWindowPrivate::init()
 
     An example of toolbar creation follows:
 
-    \snippet examples/mainwindows/application/mainwindow.cpp 29
+    \snippet mainwindows/application/mainwindow.cpp 29
 
     \section2 Creating Dock Widgets
 
@@ -312,7 +312,7 @@ void QMainWindowPrivate::init()
     We give an example of how to create and add dock widgets to a
     main window:
 
-    \snippet doc/src/snippets/mainwindowsnippet.cpp 0
+    \snippet mainwindowsnippet.cpp 0
 
     \section2 The Status Bar
 
@@ -485,7 +485,7 @@ void QMainWindow::setToolButtonStyle(Qt::ToolButtonStyle toolButtonStyle)
     can then share among all the Mac windows. Create a parent-less
     menu bar this way:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenubar.cpp 1
+    \snippet code/src_gui_widgets_qmenubar.cpp 1
 
     \sa setMenuBar()
 */
@@ -1213,7 +1213,7 @@ Qt::DockWidgetArea QMainWindow::dockWidgetArea(QDockWidget *dockwidget) const
     To save the geometry when the window closes, you can
     implement a close event like this:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp 0
+    \snippet code/src_gui_widgets_qmainwindow.cpp 0
 
     \sa restoreState(), QWidget::saveGeometry(), QWidget::restoreGeometry()
 */
@@ -1237,7 +1237,7 @@ QByteArray QMainWindow::saveState(int version) const
     To restore geometry saved using QSettings, you can use code like
     this:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qmainwindow.cpp 1
+    \snippet code/src_gui_widgets_qmainwindow.cpp 1
 
     \sa saveState(), QWidget::saveGeometry(),
     QWidget::restoreGeometry(), restoreDockWidget()
diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp
index eb483ac0fe..b859fc437e 100644
--- a/src/widgets/widgets/qmdiarea.cpp
+++ b/src/widgets/widgets/qmdiarea.cpp
@@ -53,7 +53,7 @@
     applications, but can also be placed in any layout. The following
     code adds an area to a main window:
 
-    \snippet doc/src/snippets/mdiareasnippets.cpp 0
+    \snippet mdiareasnippets.cpp 0
 
     Unlike the window managers for top-level windows, all window flags
     (Qt::WindowFlags) are supported by QMdiArea as long as the flags
@@ -1929,7 +1929,7 @@ void QMdiArea::activatePreviousSubWindow()
     \note Once the subwindow has been added, its parent will be the
     \e{viewport widget} of the QMdiArea.
 
-    \snippet doc/src/snippets/mdiareasnippets.cpp 1
+    \snippet mdiareasnippets.cpp 1
 
     When you create your own subwindow, you must set the
     Qt::WA_DeleteOnClose widget attribute if you want the window to be
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 2abd4ceef7..fccb062e07 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -1990,11 +1990,11 @@ void QMenu::popup(const QPoint &p, QAction *atAction)
 
     In most situations you'll want to specify the position yourself,
     for example, the current mouse position:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 0
+    \snippet code/src_gui_widgets_qmenu.cpp 0
     or aligned to a widget:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 1
+    \snippet code/src_gui_widgets_qmenu.cpp 1
     or in reaction to a QMouseEvent *e:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 2
+    \snippet code/src_gui_widgets_qmenu.cpp 2
 */
 QAction *QMenu::exec()
 {
@@ -2022,11 +2022,11 @@ QAction *QMenu::exec()
 
     Common usage is to position the menu at the current mouse
     position:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 3
+    \snippet code/src_gui_widgets_qmenu.cpp 3
     or aligned to a widget:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 4
+    \snippet code/src_gui_widgets_qmenu.cpp 4
     or in reaction to a QMouseEvent *e:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 5
+    \snippet code/src_gui_widgets_qmenu.cpp 5
 
     When positioning a menu with exec() or popup(), bear in mind that
     you cannot rely on the menu's current size(). For performance
@@ -2074,7 +2074,7 @@ QAction *QMenu::exec(const QPoint &p, QAction *action)
     (normally because the user pressed Esc).
 
     This is equivalent to:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenu.cpp 6
+    \snippet code/src_gui_widgets_qmenu.cpp 6
 
     \sa popup(), QWidget::mapToGlobal()
 */
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index c9818e056c..104424cabf 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -586,7 +586,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
     menu items with addMenu(). For example, asuming that \c menubar
     is a pointer to a QMenuBar and \c fileMenu is a pointer to a
     QMenu, the following statement inserts the menu into the menu bar:
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenubar.cpp 0
+    \snippet code/src_gui_widgets_qmenubar.cpp 0
 
     The ampersand in the menu item's text sets Alt+F as a shortcut for
     this menu. (You can use "\&\&" to get a real ampersand in the menu
@@ -605,7 +605,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
 
     Example (from the \l{mainwindows/menus}{Menus} example):
 
-    \snippet examples/mainwindows/menus/mainwindow.cpp 9
+    \snippet mainwindows/menus/mainwindow.cpp 9
 
     Menu items may be removed with removeAction().
 
@@ -619,7 +619,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
     of menu bars and their behavior when the user interacts with them.
     For example, Windows systems are often configured so that the
     underlined character mnemonics that indicate keyboard shortcuts
-    for items in the menu bar are only shown when the \gui{Alt} key is
+    for items in the menu bar are only shown when the \uicontrol{Alt} key is
     pressed.
 
     \table
@@ -628,13 +628,13 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
     Plastique widget style.
 
     \li The \l{QPlastiqueStyle}{Plastique widget style}, like most
-    other styles, handles the \gui{Help} menu in the same way as it
+    other styles, handles the \uicontrol{Help} menu in the same way as it
     handles any other menu.
 
     \row \li \inlineimage motif-menubar.png A menu bar shown in the
     Motif widget style.
 
-    \li The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus
+    \li The \l{QMotifStyle}{Motif widget style} treats \uicontrol{Help} menus
     in a special way, placing them at right-hand end of the menu bar.
 
     \endtable
@@ -677,7 +677,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
     bar, you must create a menu bar that does not have a parent.
     Create a parent-less menu bar this way:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qmenubar.cpp 1
+    \snippet code/src_gui_widgets_qmenubar.cpp 1
 
     \b{Note:} Do \e{not} call QMainWindow::menuBar() to create the
     shared menu bar, because that menu bar will have the QMainWindow
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index fad2d4e747..dad0a6b7b6 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -2039,7 +2039,7 @@ bool QPlainTextEdit::focusNextPrevChild(bool next)
 
   Information about the event is passed in the \a event object.
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp 0
+  \snippet code/src_gui_widgets_qplaintextedit.cpp 0
 */
 void QPlainTextEdit::contextMenuEvent(QContextMenuEvent *e)
 {
@@ -2479,7 +2479,7 @@ QTextCharFormat QPlainTextEdit::currentCharFormat() const
 
     It is equivalent to
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qplaintextedit.cpp 1
+    \snippet code/src_gui_widgets_qplaintextedit.cpp 1
  */
 void QPlainTextEdit::insertPlainText(const QString &text)
 {
@@ -2528,10 +2528,10 @@ void QPlainTextEdit::print(QPagedPaintDevice *printer) const
 #endif
 
 /*! \property QPlainTextEdit::tabChangesFocus
-  \brief whether \gui Tab changes focus or is accepted as input
+  \brief whether \uicontrol Tab changes focus or is accepted as input
 
   In some occasions text edits should not allow the user to input
-  tabulators or change indentation using the \gui Tab key, as this breaks
+  tabulators or change indentation using the \uicontrol Tab key, as this breaks
   the focus chain. The default is false.
 
 */
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index 291e3548a2..9853924182 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
     preceding the preferred character with an ampersand in the
     text. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qpushbutton.cpp 0
+    \snippet code/src_gui_widgets_qpushbutton.cpp 0
 
     In this example the shortcut is \e{Alt+D}. See the \l
     {QShortcut#mnemonic}{QShortcut} documentation for details (to
diff --git a/src/widgets/widgets/qradiobutton.cpp b/src/widgets/widgets/qradiobutton.cpp
index 11cd89bca2..15dbdd4284 100644
--- a/src/widgets/widgets/qradiobutton.cpp
+++ b/src/widgets/widgets/qradiobutton.cpp
@@ -105,7 +105,7 @@ void QRadioButtonPrivate::init()
     can be specified by preceding the preferred character with an
     ampersand in the text. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qradiobutton.cpp 0
+    \snippet code/src_gui_widgets_qradiobutton.cpp 0
 
     In this example the shortcut is \e{Alt+c}. See the \l
     {QShortcut#mnemonic}{QShortcut} documentation for details (to
diff --git a/src/widgets/widgets/qrubberband.cpp b/src/widgets/widgets/qrubberband.cpp
index 0f95f0188a..8173ffe657 100644
--- a/src/widgets/widgets/qrubberband.cpp
+++ b/src/widgets/widgets/qrubberband.cpp
@@ -112,7 +112,7 @@ void QRubberBand::initStyleOption(QStyleOptionRubberBand *option) const
     setGeometry(), move() or resize() to position and size it. A common
     pattern is to do this in conjunction with mouse events. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qrubberband.cpp 0
+    \snippet code/src_gui_widgets_qrubberband.cpp 0
 
     If you pass a parent to QRubberBand's constructor, the rubber band will
     display only inside its parent, but stays on top of other child widgets.
diff --git a/src/widgets/widgets/qscrollarea.cpp b/src/widgets/widgets/qscrollarea.cpp
index 84be2d569b..99b4151d8c 100644
--- a/src/widgets/widgets/qscrollarea.cpp
+++ b/src/widgets/widgets/qscrollarea.cpp
@@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
     widget can be viewed. The child widget must be specified with
     setWidget(). For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qscrollarea.cpp 0
+    \snippet code/src_gui_widgets_qscrollarea.cpp 0
 
     The code above creates a scroll area (shown in the images below)
     containing an image label. When scaling the image, the scroll area
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index 7dcaead2f4..cb88ca1b79 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -168,9 +168,9 @@ public:
     for a custom spin box that allows the user to enter icon sizes
     (e.g., "32 x 32"):
 
-    \snippet examples/widgets/icons/iconsizespinbox.cpp 1
+    \snippet widgets/icons/iconsizespinbox.cpp 1
     \codeline
-    \snippet examples/widgets/icons/iconsizespinbox.cpp 2
+    \snippet widgets/icons/iconsizespinbox.cpp 2
 
     See the \l{widgets/icons}{Icons} example for the full source
     code.
@@ -238,7 +238,7 @@ void QSpinBox::setValue(int value)
     Typical use is to display a unit of measurement or a currency
     symbol. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 0
+    \snippet code/src_gui_widgets_qspinbox.cpp 0
 
     To turn off the prefix display, set this property to an empty
     string. The default is no prefix. The prefix is not displayed when
@@ -274,7 +274,7 @@ void QSpinBox::setPrefix(const QString &prefix)
     use is to display a unit of measurement or a currency symbol. For
     example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 1
+    \snippet code/src_gui_widgets_qspinbox.cpp 1
 
     To turn off the suffix display, set this property to an empty
     string. The default is no suffix. The suffix is not displayed for
@@ -405,9 +405,9 @@ void QSpinBox::setMaximum(int maximum)
     Convenience function to set the \a minimum, and \a maximum values
     with a single function call.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 2
+    \snippet code/src_gui_widgets_qspinbox.cpp 2
     is equivalent to:
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 3
+    \snippet code/src_gui_widgets_qspinbox.cpp 3
 
     \sa minimum maximum
 */
@@ -610,7 +610,7 @@ void QDoubleSpinBox::setValue(double value)
     Typical use is to display a unit of measurement or a currency
     symbol. For example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 4
+    \snippet code/src_gui_widgets_qspinbox.cpp 4
 
     To turn off the prefix display, set this property to an empty
     string. The default is no prefix. The prefix is not displayed when
@@ -644,7 +644,7 @@ void QDoubleSpinBox::setPrefix(const QString &prefix)
     use is to display a unit of measurement or a currency symbol. For
     example:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 5
+    \snippet code/src_gui_widgets_qspinbox.cpp 5
 
     To turn off the suffix display, set this property to an empty
     string. The default is no suffix. The suffix is not displayed for
@@ -784,9 +784,9 @@ void QDoubleSpinBox::setMaximum(double maximum)
     Note: The maximum and minimum values will be rounded to match the
     decimals property.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 6
+    \snippet code/src_gui_widgets_qspinbox.cpp 6
     is equivalent to:
-    \snippet doc/src/snippets/code/src_gui_widgets_qspinbox.cpp 7
+    \snippet code/src_gui_widgets_qspinbox.cpp 7
 
     \sa minimum maximum
 */
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp
index 5a7d6376ca..f3a19c88ec 100644
--- a/src/widgets/widgets/qsplashscreen.cpp
+++ b/src/widgets/widgets/qsplashscreen.cpp
@@ -94,9 +94,9 @@ public:
    some initialization tasks are performed before the application's
    main window is shown:
 
-   \snippet doc/src/snippets/qsplashscreen/main.cpp 0
+   \snippet qsplashscreen/main.cpp 0
    \dots
-   \snippet doc/src/snippets/qsplashscreen/main.cpp 1
+   \snippet qsplashscreen/main.cpp 1
 
    The user can hide the splash screen by clicking on it with the
    mouse. Since the splash screen is typically displayed before the
@@ -107,7 +107,7 @@ public:
    for example, announcing connections established or modules loaded
    as the application starts up:
 
-   \snippet doc/src/snippets/code/src_gui_widgets_qsplashscreen.cpp 0
+   \snippet code/src_gui_widgets_qsplashscreen.cpp 0
 
    QSplashScreen supports this with the showMessage() function. If you
    wish to do your own drawing you can get a pointer to the pixmap
diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp
index 17e1c39cee..126f819541 100644
--- a/src/widgets/widgets/qsplitter.cpp
+++ b/src/widgets/widgets/qsplitter.cpp
@@ -84,12 +84,12 @@ QT_BEGIN_NAMESPACE
     reimplement QSplitter::createHandle() to instantiate the custom splitter
     handle. For example, a minimum QSplitter subclass might look like this:
 
-    \snippet doc/src/snippets/splitterhandle/splitter.h 0
+    \snippet splitterhandle/splitter.h 0
 
     The \l{QSplitter::}{createHandle()} implementation simply constructs a
     custom splitter handle, called \c Splitter in this example:
 
-    \snippet doc/src/snippets/splitterhandle/splitter.cpp 1
+    \snippet splitterhandle/splitter.cpp 1
 
     Information about a given handle can be obtained using functions like
     orientation() and opaqueResize(), and is retrieved from its parent splitter.
@@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE
     needs to perform. A simple subclass might only provide a paintEvent()
     implementation:
 
-    \snippet doc/src/snippets/splitterhandle/splitter.cpp 0
+    \snippet splitterhandle/splitter.cpp 0
 
     In this example, a predefined gradient is set up differently depending on
     the orientation of the handle. QSplitterHandle provides a reasonable
@@ -888,7 +888,7 @@ QSplitterLayoutStruct *QSplitterPrivate::insertWidget(int index, QWidget *w)
     The following example will show a QListView, QTreeView, and
     QTextEdit side by side, with two splitter handles:
 
-    \snippet doc/src/snippets/splitter/splitter.cpp 0
+    \snippet splitter/splitter.cpp 0
 
     If a widget is already inside a QSplitter when insertWidget() or
     addWidget() is called, it will move to the new position. This can be used
@@ -1569,7 +1569,7 @@ static const qint32 SplitterMagic = 0xff;
     for a future session. A version number is stored as part of the data.
     Here is an example:
 
-    \snippet doc/src/snippets/splitter/splitter.cpp 1
+    \snippet splitter/splitter.cpp 1
 
     \sa restoreState()
 */
@@ -1604,7 +1604,7 @@ QByteArray QSplitter::saveState() const
 
     Restore the splitters's state:
 
-    \snippet doc/src/snippets/splitter/splitter.cpp 2
+    \snippet splitter/splitter.cpp 2
 
     A failure to restore the splitter's layout may result from either
     invalid or out-of-date data in the supplied byte array.
@@ -1657,7 +1657,7 @@ bool QSplitter::restoreState(const QByteArray &state)
 
     This function is provided for convenience. It is equivalent to
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qsplitter.cpp 0
+    \snippet code/src_gui_widgets_qsplitter.cpp 0
 
     \sa setSizes(), widget()
 */
diff --git a/src/widgets/widgets/qstackedwidget.cpp b/src/widgets/widgets/qstackedwidget.cpp
index 5406f5dcf5..e239f86345 100644
--- a/src/widgets/widgets/qstackedwidget.cpp
+++ b/src/widgets/widgets/qstackedwidget.cpp
@@ -74,16 +74,16 @@ public:
     Like QStackedLayout, QStackedWidget can be constructed and
     populated with a number of child widgets ("pages"):
 
-    \snippet doc/src/snippets/qstackedwidget/main.cpp 0
-    \snippet doc/src/snippets/qstackedwidget/main.cpp 2
-    \snippet doc/src/snippets/qstackedwidget/main.cpp 3
+    \snippet qstackedwidget/main.cpp 0
+    \snippet qstackedwidget/main.cpp 2
+    \snippet qstackedwidget/main.cpp 3
 
     QStackedWidget provides no intrinsic means for the user to switch
     page. This is typically done through a QComboBox or a QListWidget
     that stores the titles of the QStackedWidget's pages. For
     example:
 
-    \snippet doc/src/snippets/qstackedwidget/main.cpp 1
+    \snippet qstackedwidget/main.cpp 1
 
     When populating a stacked widget, the widgets are added to an
     internal list. The indexOf() function returns the index of a
diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp
index 4b9242499c..2b17d7fb83 100644
--- a/src/widgets/widgets/qstatusbar.cpp
+++ b/src/widgets/widgets/qstatusbar.cpp
@@ -186,12 +186,12 @@ QRect QStatusBarPrivate::messageRect() const
 
     Use the showMessage() slot to display a \e temporary message:
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 8
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 8
 
     To remove a temporary message, use the clearMessage() slot, or set
     a time limit when calling showMessage(). For example:
 
-    \snippet examples/mainwindows/dockwidgets/mainwindow.cpp 3
+    \snippet mainwindows/dockwidgets/mainwindow.cpp 3
 
     Use the currentMessage() function to retrieve the temporary
     message currently shown. The QStatusBar class also provide the
@@ -205,7 +205,7 @@ QRect QStatusBarPrivate::messageRect() const
     addPermanentWidget() function. Use the removeWidget() function to
     remove such messages from the status bar.
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qstatusbar.cpp 0
+    \snippet code/src_gui_widgets_qstatusbar.cpp 0
 
     By default QStatusBar provides a QSizeGrip in the lower-right
     corner. You can disable it using the setSizeGripEnabled()
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 261b96f8af..b8ffced6bb 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -1170,7 +1170,7 @@ QUrl QTextBrowser::historyUrl(int i) const
     \row \li \a{i} > 0  \li \l forward() history
     \endtable
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qtextbrowser.cpp 0
+    \snippet code/src_gui_widgets_qtextbrowser.cpp 0
 
     \since 4.4
 */
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 217fda61dc..7a7b977b89 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -472,12 +472,12 @@ void QTextEditPrivate::_q_ensureVisible(const QRectF &_rect)
     For example, to allow the user to drag and drop an image onto a QTextEdit,
     you could the implement these functions in the following way:
 
-    \snippet doc/src/snippets/textdocument-imagedrop/textedit.cpp 0
+    \snippet textdocument-imagedrop/textedit.cpp 0
 
     We add support for image MIME types by returning true. For all other
     MIME types, we use the default implementation.
 
-    \snippet doc/src/snippets/textdocument-imagedrop/textedit.cpp 1
+    \snippet textdocument-imagedrop/textedit.cpp 1
 
     We unpack the image from the QVariant held by the MIME source and insert
     it into the document as a resource.
@@ -1583,7 +1583,7 @@ bool QTextEdit::focusNextPrevChild(bool next)
 
   Information about the event is passed in the \a event object.
 
-  \snippet doc/src/snippets/code/src_gui_widgets_qtextedit.cpp 0
+  \snippet code/src_gui_widgets_qtextedit.cpp 0
 */
 void QTextEdit::contextMenuEvent(QContextMenuEvent *e)
 {
@@ -2143,7 +2143,7 @@ void QTextEdit::setAutoFormatting(AutoFormatting features)
 
     It is equivalent to
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qtextedit.cpp 1
+    \snippet code/src_gui_widgets_qtextedit.cpp 1
  */
 void QTextEdit::insertPlainText(const QString &text)
 {
@@ -2157,7 +2157,7 @@ void QTextEdit::insertPlainText(const QString &text)
 
     It is equivalent to:
 
-    \snippet doc/src/snippets/code/src_gui_widgets_qtextedit.cpp 2
+    \snippet code/src_gui_widgets_qtextedit.cpp 2
 
     \note When using this function with a style sheet, the style sheet will
     only apply to the current block in the document. In order to apply a style
@@ -2273,10 +2273,10 @@ void QTextEdit::print(QPagedPaintDevice *printer) const
 #endif
 
 /*! \property QTextEdit::tabChangesFocus
-  \brief whether \gui Tab changes focus or is accepted as input
+  \brief whether \uicontrol Tab changes focus or is accepted as input
 
   In some occasions text edits should not allow the user to input
-  tabulators or change indentation using the \gui Tab key, as this breaks
+  tabulators or change indentation using the \uicontrol Tab key, as this breaks
   the focus chain. The default is false.
 
 */