9 files changed, 64 insertions, 84 deletions
diff --git a/examples/widgets/doc/images/addressbook-editdialog.png b/examples/widgets/doc/images/addressbook-editdialog.png
index fd41ee63f7..7434aa44ef 100644
--- a/examples/widgets/doc/images/addressbook-editdialog.png
+++ b/examples/widgets/doc/images/addressbook-editdialog.png
diff --git a/examples/widgets/doc/images/addressbook-example.png b/examples/widgets/doc/images/addressbook-example.png
index b743c166da..eebe97a718 100644
--- a/examples/widgets/doc/images/addressbook-example.png
+++ b/examples/widgets/doc/images/addressbook-example.png
diff --git a/examples/widgets/doc/images/addressbook-newaddresstab.png b/examples/widgets/doc/images/addressbook-newaddresstab.png
index ff215a4b20..6b60ee08e9 100644
--- a/examples/widgets/doc/images/addressbook-newaddresstab.png
+++ b/examples/widgets/doc/images/addressbook-newaddresstab.png
diff --git a/examples/widgets/doc/src/appchooser.qdoc b/examples/widgets/doc/src/appchooser.qdoc
deleted file mode 100644
index e74860214a..0000000000
--- a/examples/widgets/doc/src/appchooser.qdoc
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example animation/appchooser
-    \title Application Chooser Example
-
-    \brief The Application Chooser example shows how to use the Qt state
-    machine and the animation framework to select between
-    applications.
-
-    \image appchooser-example.png
-
-*/
diff --git a/examples/widgets/doc/src/customsortfiltermodel.qdoc b/examples/widgets/doc/src/customsortfiltermodel.qdoc
index 0eb6560e10..6eab846e89 100644
--- a/examples/widgets/doc/src/customsortfiltermodel.qdoc
+++ b/examples/widgets/doc/src/customsortfiltermodel.qdoc
@@ -75,7 +75,7 @@
     QSortFilterProxyModel's default implementations of functions are
     written so that they call the equivalent functions in the relevant
     source model. This simple proxying mechanism may need to be
-    overridden for source models with more complex behavior; in this
+    overridden for source models with more complex behavior. In this
     example we derive from the QSortFilterProxyModel class to ensure
     that our filter can recognize a valid range of dates, and to
     control the sorting behavior.
@@ -170,7 +170,7 @@
 
     We implement two private slots, \c textFilterChanged() and \c
     dateFilterChanged(), to respond to the user changing the filter
-    pattern, case sensitivity or any of the dates. In addition, we
+    pattern, case sensitivity, or any of the dates. In addition, we
     implement a public \c setSourceModel() convenience function to set
     up the model/ view relation.
 
@@ -197,7 +197,7 @@
     \snippet itemviews/customsortfiltermodel/window.cpp 1
 
     The QTreeView class provides a default model/view implementation
-    of a tree view; our view implements a tree representation of items
+    of a tree view. Our view implements a tree representation of items
     in the application's source model.
 
     \snippet itemviews/customsortfiltermodel/window.cpp 2
diff --git a/examples/widgets/doc/src/lighting.qdoc b/examples/widgets/doc/src/lighting.qdoc
deleted file mode 100644
index 994172cf5d..0000000000
--- a/examples/widgets/doc/src/lighting.qdoc
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file. Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: https://www.gnu.org/licenses/fdl-1.3.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \example effects/lighting
-    \title Lighting Effect Example
-    \ingroup examples-graphicsview-graphicseffects
-    \brief Demonstrates how to apply effects on items in the view
-
-    \image lightingeffect-example.png
-*/
diff --git a/examples/widgets/doc/src/stardelegate.qdoc b/examples/widgets/doc/src/stardelegate.qdoc
index dcc7080456..44d17662ca 100644
--- a/examples/widgets/doc/src/stardelegate.qdoc
+++ b/examples/widgets/doc/src/stardelegate.qdoc
@@ -37,7 +37,7 @@
     When displaying data in a QListView, QTableView, or QTreeView,
     the individual items are drawn by a
     \l{Delegate Classes}{delegate}. Also, when the user starts
-    editing an item (e.g., by double-clicking the item), the delegate
+    editing an item (for example, by double-clicking the item), the delegate
     provides an editor widget that is placed on top of the item while
     editing takes place.
 
@@ -96,9 +96,9 @@
     QItemDelegate paint it for us. This ensures that the \c
     StarDelegate can handle the most common data types.
 
-    In the case where the item is a \c StarRating, we draw the
-    background if the item is selected, and we draw the item using \c
-    StarRating::paint(), which we will review later.
+    If the item is a \c StarRating, we draw the background if the
+    item is selected, and we draw the item using \c StarRating::paint(),
+    which we will review later.
 
     \c{StartRating}s can be stored in a QVariant thanks to the
     Q_DECLARE_METATYPE() macro appearing in \c starrating.h. More on
@@ -133,8 +133,8 @@
     We simply call \c setStarRating() on the editor.
 
     The \l{QAbstractItemDelegate::}{setModelData()} function is
-    called when editing is finished, to commit data from the editor
-    to the model:
+    called to commit data from the editor to the model when editing
+    is finished:
 
     \snippet itemviews/stardelegate/stardelegate.cpp 4
 
@@ -210,7 +210,7 @@
     current rating, and \c myMaxStarCount stores the highest possible
     rating (typically 5).
 
-    The Q_DECLARE_METATYPE() macro makes the type \c StarRating known
+    The \c Q_DECLARE_METATYPE() macro makes the type \c StarRating known
     to QVariant, making it possible to store \c StarRating values in
     QVariant.
 
@@ -283,7 +283,7 @@
     \list
     \li It is possible to open editors programmatically by calling
        QAbstractItemView::edit(), instead of relying on edit
-       triggers. This could be use to support other edit triggers
+       triggers. This could be used to support other edit triggers
        than those offered by the QAbstractItemView::EditTrigger enum.
        For example, in the Star Delegate example, hovering over an
        item with the mouse might make sense as a way to pop up an
diff --git a/examples/widgets/doc/src/stylesheet.qdoc b/examples/widgets/doc/src/stylesheet.qdoc
index 0016836f0d..a86b697059 100644
--- a/examples/widgets/doc/src/stylesheet.qdoc
+++ b/examples/widgets/doc/src/stylesheet.qdoc
@@ -33,5 +33,56 @@
 
     \borderedimage stylesheet-pagefold.png
     \caption Screen Shot of the Pagefold style sheet
+
+    The Style Sheet example shows how widgets can be styled using Qt Style Sheets.
+    You can open the style editor by selecting \uicontrol File > \uicontrol Edit Style Sheet,
+    to select an existing style sheet or design your own style and load it.
+
+    The Style Sheet example consists of 2 classes:
+    \list
+    \li \c MainWindow
+    \li \c StyleSheetEditor
+    \endlist
+
+
+    \section1 MainWindow Class
+
+    \c MainWindow inherits QWidget, and is the application's main window defined in
+    \c mainwindow.ui. The style of \c MainWindow can be modified with \l StyleSheetEditor.
+
+
+    \section1 StyleSheetEditor Class
+
+    \c StyleSheetEditor enables you to open an editor where you can load an existing style sheet.
+    It is also possible to define a new stylesheet and load it. Its layout is defined in
+    \c stylesheeteditor.ui.
+
+    \quotefromfile widgets/stylesheet/stylesheeteditor.cpp
+    \skipto on_styleCombo_activated
+    \printline on_styleCombo_activated
+
+    Sets the specified \a styleName and grays the \c applyButton.
+
+    \skipto on_styleSheetCombo_activated
+    \printline on_styleSheetCombo_activated
+
+    Loads the stylesheet from \c styleSheetName.
+
+    \skipto on_styleTextEdit_textChanged()
+    \printline on_styleTextEdit_textChanged()
+
+    Enables the \c applyButton when the text in the buffer has changed.
+
+    \skipto on_applyButton_clicked()
+    \printline on_applyButton_clicked()
+
+    Sets the stylesheet properties in \l qApp and disables the \c applyButton.
+
+    \skipto loadStyleSheet(const QString &sheetName)
+    \printline loadStyleSheet(const QString &sheetName)
+
+    Loads the specified \a sheetName, and sets its properties in
+    \l qApp.
+
 */
 
diff --git a/examples/widgets/doc/src/validators.qdoc b/examples/widgets/doc/src/validators.qdoc
index f3f4dc5e63..bbb2e5f7b6 100644
--- a/examples/widgets/doc/src/validators.qdoc
+++ b/examples/widgets/doc/src/validators.qdoc
@@ -31,4 +31,6 @@
     \ingroup examples-widgets
     \brief The Validators example shows the signal emission behavior of input
     validators.
+
+    \borderedimage validators.png
 */