Doc: Add example categories to Qt Widget examples

Added example categories and fixed some minor typos as well.

Task-number: QTBUG-116359
Pick-to: 6.5 6.6
Change-Id: I2e270a1919003f4cea233666b64437e4c2b77121
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

69 files changed, 77 insertions, 8 deletions

diff --git a/examples/widgets/desktop/systray/doc/src/systray.qdoc b/examples/widgets/desktop/systray/doc/src/systray.qdoc
index 5c4350383d..b0dff58e31 100644
--- a/examples/widgets/desktop/systray/doc/src/systray.qdoc
+++ b/examples/widgets/desktop/systray/doc/src/systray.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example desktop/systray
     \title System Tray Icon Example
+    \examplecategory {Desktop}
     \ingroup examples-widgets
     \brief The System Tray Icon example shows how to add an icon with a menu
     and popup messages to a desktop environment's system tray.
diff --git a/examples/widgets/doc/dropsite.qdoc b/examples/widgets/doc/dropsite.qdoc
index 5ebf0ff3a4..4c38ffc50d 100644
--- a/examples/widgets/doc/dropsite.qdoc
+++ b/examples/widgets/doc/dropsite.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example draganddrop/dropsite
     \title Drop Site Example
+    \examplecategory {User Interface Components}
 
     \brief The example shows how to distinguish the various MIME formats available
     in a drag and drop operation.
diff --git a/examples/widgets/doc/src/addressbook.qdoc b/examples/widgets/doc/src/addressbook.qdoc
index 24bcee5a26..8f2512298b 100644
--- a/examples/widgets/doc/src/addressbook.qdoc
+++ b/examples/widgets/doc/src/addressbook.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/addressbook
     \title Address Book
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The address book example shows how to use proxy models to display
     different views onto data from a single model.
diff --git a/examples/widgets/doc/src/affine.qdoc b/examples/widgets/doc/src/affine.qdoc
index accbf9adfa..5aded0bd75 100644
--- a/examples/widgets/doc/src/affine.qdoc
+++ b/examples/widgets/doc/src/affine.qdoc
@@ -4,8 +4,9 @@
 /*!
     \example painting/affine
     \title Affine Transformations
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
-    \brief Demonstrates how affine transformations in QPainter works.
+    \brief Demonstrates how affine transformations in QPainter work.
 
     \brief In this example we show Qt's ability to perform affine transformations
     on painting operations.
diff --git a/examples/widgets/doc/src/basicdrawing.qdoc b/examples/widgets/doc/src/basicdrawing.qdoc
index 7413dfc823..afba853f3d 100644
--- a/examples/widgets/doc/src/basicdrawing.qdoc
+++ b/examples/widgets/doc/src/basicdrawing.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/basicdrawing
     \title Basic Drawing Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief The Basic Drawing example shows how to display basic
     graphics primitives in a variety of styles using the QPainter
diff --git a/examples/widgets/doc/src/basicgraphicslayouts.qdoc b/examples/widgets/doc/src/basicgraphicslayouts.qdoc
index ce7176bf7f..07ead4e44f 100644
--- a/examples/widgets/doc/src/basicgraphicslayouts.qdoc
+++ b/examples/widgets/doc/src/basicgraphicslayouts.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/basicgraphicslayouts
     \title Basic Graphics Layouts Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-graphicsview-layout
     \brief Demonstrates how to create basic graphics layout.
 
diff --git a/examples/widgets/doc/src/basiclayouts.qdoc b/examples/widgets/doc/src/basiclayouts.qdoc
index c55514689d..e6f1cab4d9 100644
--- a/examples/widgets/doc/src/basiclayouts.qdoc
+++ b/examples/widgets/doc/src/basiclayouts.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example layouts/basiclayouts
     \title Basic Layouts Example
+    \examplecategory {User Interface Components}
     \brief Shows how to use the standard layout managers.
 
     \e{Basic Layouts} shows how to use the standard layout managers that are
diff --git a/examples/widgets/doc/src/basicsortfiltermodel.qdoc b/examples/widgets/doc/src/basicsortfiltermodel.qdoc
index 969ee0a9d5..c0b8a5f426 100644
--- a/examples/widgets/doc/src/basicsortfiltermodel.qdoc
+++ b/examples/widgets/doc/src/basicsortfiltermodel.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/basicsortfiltermodel
     \title Basic Sort/Filter Model Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Basic Sort/Filter Model example illustrates how to use
     QSortFilterProxyModel to perform basic sorting and filtering.
diff --git a/examples/widgets/doc/src/calculator.qdoc b/examples/widgets/doc/src/calculator.qdoc
index cc015e46a0..c59d3cd161 100644
--- a/examples/widgets/doc/src/calculator.qdoc
+++ b/examples/widgets/doc/src/calculator.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/calculator
     \title Calculator Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \ingroup examples-layout
     \brief The example shows how to use signals and slots to implement the
diff --git a/examples/widgets/doc/src/calendarwidget.qdoc b/examples/widgets/doc/src/calendarwidget.qdoc
index 6a91f5ef6e..898f4bbded 100644
--- a/examples/widgets/doc/src/calendarwidget.qdoc
+++ b/examples/widgets/doc/src/calendarwidget.qdoc
@@ -3,6 +3,7 @@
 
 /*!
     \title Calendar Widget Example
+    \examplecategory {Graphics & Multimedia}
     \example widgets/calendarwidget
     \ingroup examples-widgets
     \ingroup examples-layout
diff --git a/examples/widgets/doc/src/chip.qdoc b/examples/widgets/doc/src/chip.qdoc
index a76e11950e..817fc7d6ca 100644
--- a/examples/widgets/doc/src/chip.qdoc
+++ b/examples/widgets/doc/src/chip.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/chip
     \title 40000 Chips
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-graphicsview
     \brief Visualizes a huge graphic view scene with 40000 chip items.
 
diff --git a/examples/widgets/doc/src/collidingmice-example.qdoc b/examples/widgets/doc/src/collidingmice-example.qdoc
index 4f6859406e..54c893eed7 100644
--- a/examples/widgets/doc/src/collidingmice-example.qdoc
+++ b/examples/widgets/doc/src/collidingmice-example.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/collidingmice
     \title Colliding Mice Example
+    \examplecategory {Graphics & Multimedia}
     \brief Demonstrates how to animate items on a graphics view.
     \ingroup examples-graphicsview
 
diff --git a/examples/widgets/doc/src/coloreditorfactory.qdoc b/examples/widgets/doc/src/coloreditorfactory.qdoc
index a7da4d6847..bf4a13c9e7 100644
--- a/examples/widgets/doc/src/coloreditorfactory.qdoc
+++ b/examples/widgets/doc/src/coloreditorfactory.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/coloreditorfactory
     \title Color Editor Factory Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief This example shows how to create an editor that can be used by
     a QItemDelegate.
diff --git a/examples/widgets/doc/src/combowidgetmapper.qdoc b/examples/widgets/doc/src/combowidgetmapper.qdoc
index 87a1879232..8a3e285dfe 100644
--- a/examples/widgets/doc/src/combowidgetmapper.qdoc
+++ b/examples/widgets/doc/src/combowidgetmapper.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/combowidgetmapper
     \title Combo Widget Mapper Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Combo Widget Mapper example shows how to use a custom delegate to
     map information from a model to specific widgets on a form.
diff --git a/examples/widgets/doc/src/completer.qdoc b/examples/widgets/doc/src/completer.qdoc
index a64d7e1e79..f3e4fe8f0e 100644
--- a/examples/widgets/doc/src/completer.qdoc
+++ b/examples/widgets/doc/src/completer.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/completer
     \title Completer Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets-tools
 
     \brief The Completer example shows how to provide string-completion facilities
@@ -45,7 +46,7 @@
     \snippet tools/completer/fsmodel.cpp 0
 
     As mentioned earlier, the \c data() function is reimplemented in order to
-    get it to return the entire file parth for the display role. For example,
+    get it to return the entire file path for the display role. For example,
     with a QFileSystemModel, you will see "Program Files" in the view. However, with
     \c FileSystemModel, you will see "C:\\Program Files".
 
@@ -201,7 +202,7 @@
 
     \snippet tools/completer/mainwindow.cpp 14
 
-    The \c changeMaxVisible() update the maximum number of visible items in
+    The \c changeMaxVisible() updates the maximum number of visible items in
     the completer.
 
     \snippet tools/completer/mainwindow.cpp 15
diff --git a/examples/widgets/doc/src/composition.qdoc b/examples/widgets/doc/src/composition.qdoc
index f4b4037eb8..38cd34bc6f 100644
--- a/examples/widgets/doc/src/composition.qdoc
+++ b/examples/widgets/doc/src/composition.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/composition
     \title Composition Modes
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief Demonstrates how Composition Modes work in QPainter.
 
diff --git a/examples/widgets/doc/src/concentriccircles.qdoc b/examples/widgets/doc/src/concentriccircles.qdoc
index ffdb09869f..3884261926 100644
--- a/examples/widgets/doc/src/concentriccircles.qdoc
+++ b/examples/widgets/doc/src/concentriccircles.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/concentriccircles
     \title Concentric Circles Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief Demonstrates the improved quality that antialiasing and floating point precision gives.
 
@@ -13,7 +14,7 @@
     how to do simple animations.
 
     The application's main window displays several widgets which are
-    drawn using the various combinations of precision and
+    drawn using various combinations of precision and
     anti-aliasing.
 
     \image concentriccircles-example.png
diff --git a/examples/widgets/doc/src/cuberhiwidget.qdoc b/examples/widgets/doc/src/cuberhiwidget.qdoc
index 84be1d0942..98aad32438 100644
--- a/examples/widgets/doc/src/cuberhiwidget.qdoc
+++ b/examples/widgets/doc/src/cuberhiwidget.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example rhi/cuberhiwidget
     \title Cube RHI Widget Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-widgets
     \brief Shows how to render a textured cube and integrate with QPainter and widgets, using QRhi Qt's 3D API and shading language abstraction layer.
 
diff --git a/examples/widgets/doc/src/customsortfiltermodel.qdoc b/examples/widgets/doc/src/customsortfiltermodel.qdoc
index 5ee98362ba..b6ff8e7b48 100644
--- a/examples/widgets/doc/src/customsortfiltermodel.qdoc
+++ b/examples/widgets/doc/src/customsortfiltermodel.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/customsortfiltermodel
     \title Custom Sort/Filter Model Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Custom Sort/Filter Model example illustrates how to subclass
     QSortFilterProxyModel to perform advanced sorting and filtering.
diff --git a/examples/widgets/doc/src/deform.qdoc b/examples/widgets/doc/src/deform.qdoc
index 371f1a41c7..bda32f8c41 100644
--- a/examples/widgets/doc/src/deform.qdoc
+++ b/examples/widgets/doc/src/deform.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/deform
     \title Vector Deformation
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief Demonstrates how to manipulate the elements of a QPainterPath.
 
diff --git a/examples/widgets/doc/src/diagramscene.qdoc b/examples/widgets/doc/src/diagramscene.qdoc
index 1ce869374a..cd1961368f 100644
--- a/examples/widgets/doc/src/diagramscene.qdoc
+++ b/examples/widgets/doc/src/diagramscene.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/diagramscene
     \title Diagram Scene Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-graphicsview
     \brief Demonstrate how to use the Graphics View framework.
 
@@ -12,7 +13,7 @@
     The Diagram Scene example is an application in which you can
     create a flowchart diagram. It is possible to add flowchart shapes
     and text and connect the shapes by arrows as shown in the image
-    above.  The shapes, arrows, and text can be given different
+    above. The shapes, arrows, and text can be given different
     colors, and it is possible to change the font, style, and
     underline of the text.
 
diff --git a/examples/widgets/doc/src/dragdroprobot.qdoc b/examples/widgets/doc/src/dragdroprobot.qdoc
index ca62bf73df..6b7f695219 100644
--- a/examples/widgets/doc/src/dragdroprobot.qdoc
+++ b/examples/widgets/doc/src/dragdroprobot.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/dragdroprobot
     \title Drag and Drop Robot Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-graphicsview
     \brief Demonstrates how to drag and drop items in a graphics view.
 
diff --git a/examples/widgets/doc/src/draggableicons.qdoc b/examples/widgets/doc/src/draggableicons.qdoc
index 9a0290c82f..fd4f9e69e3 100644
--- a/examples/widgets/doc/src/draggableicons.qdoc
+++ b/examples/widgets/doc/src/draggableicons.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example draganddrop/draggableicons
     \title Draggable Icons Example
+    \examplecategory {User Interface Components}
 
     \brief The Draggable Icons example shows how to drag and drop image data between widgets
     in the same application, and between different applications.
diff --git a/examples/widgets/doc/src/draggabletext.qdoc b/examples/widgets/doc/src/draggabletext.qdoc
index 3cc3560bb9..6e15e7f946 100644
--- a/examples/widgets/doc/src/draggabletext.qdoc
+++ b/examples/widgets/doc/src/draggabletext.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example draganddrop/draggabletext
     \title Draggable Text Example
+    \examplecategory {User Interface Components}
     \brief Illustrates how to drag and drop text between widgets.
 
     \brief The Draggable Text example shows how to drag and drop textual data between widgets
diff --git a/examples/widgets/doc/src/easing.qdoc b/examples/widgets/doc/src/easing.qdoc
index c9f8752b93..776d161319 100644
--- a/examples/widgets/doc/src/easing.qdoc
+++ b/examples/widgets/doc/src/easing.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example animation/easing
     \title Easing Curves Example
+    \examplecategory {Graphics & Multimedia}
 
     \brief The Easing Curves example shows how to use easing curves to
     control the speed of an animation.
diff --git a/examples/widgets/doc/src/echoplugin.qdoc b/examples/widgets/doc/src/echoplugin.qdoc
index 72fa3e5699..1dfc19df38 100644
--- a/examples/widgets/doc/src/echoplugin.qdoc
+++ b/examples/widgets/doc/src/echoplugin.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/echoplugin
     \title Echo Plugin Example
+    \examplecategory {Data Processing & I/O}
     \ingroup examples-widgets-tools
     \ingroup examples-layout
 
diff --git a/examples/widgets/doc/src/editabletreemodel.qdoc b/examples/widgets/doc/src/editabletreemodel.qdoc
index 4d2b9e2753..58cd544694 100644
--- a/examples/widgets/doc/src/editabletreemodel.qdoc
+++ b/examples/widgets/doc/src/editabletreemodel.qdoc
@@ -4,9 +4,10 @@
 /*!
     \example itemviews/editabletreemodel
     \title Editable Tree Model Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief This example shows how to implement a simple item-based tree model that can
-    be used with other classes the model/view framework.
+    be used with other classes in the model/view framework.
 
     \image itemviews-editabletreemodel.png
 
diff --git a/examples/widgets/doc/src/elasticnodes.qdoc b/examples/widgets/doc/src/elasticnodes.qdoc
index 1d155adbec..10062ff0c6 100644
--- a/examples/widgets/doc/src/elasticnodes.qdoc
+++ b/examples/widgets/doc/src/elasticnodes.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/elasticnodes
     \title Elastic Nodes Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-graphicsview
     \brief Demonstrates how to interact with graphical items in a scene.
 
diff --git a/examples/widgets/doc/src/fetchmore.qdoc b/examples/widgets/doc/src/fetchmore.qdoc
index 1e80e803d5..d8dae18f33 100644
--- a/examples/widgets/doc/src/fetchmore.qdoc
+++ b/examples/widgets/doc/src/fetchmore.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/fetchmore
     \title Fetch More Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Fetch More example shows how to add items to an item view
     model on demand.
diff --git a/examples/widgets/doc/src/flowlayout.qdoc b/examples/widgets/doc/src/flowlayout.qdoc
index 5a3316b6e4..03dfc164d7 100644
--- a/examples/widgets/doc/src/flowlayout.qdoc
+++ b/examples/widgets/doc/src/flowlayout.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example layouts/flowlayout
     \title Flow Layout Example
+    \examplecategory {User Interface Components}
     \ingroup examples-layout
     \brief Shows how to arrange widgets for different window sizes.
 
diff --git a/examples/widgets/doc/src/frozencolumn.qdoc b/examples/widgets/doc/src/frozencolumn.qdoc
index 54040bc9e1..c213ba1779 100644
--- a/examples/widgets/doc/src/frozencolumn.qdoc
+++ b/examples/widgets/doc/src/frozencolumn.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/frozencolumn
     \title Frozen Column Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief This example demonstrates how to freeze a column within a QTableView.
 
diff --git a/examples/widgets/doc/src/gallery.qdoc b/examples/widgets/doc/src/gallery.qdoc
index 5287fb5b53..36b76d8f63 100644
--- a/examples/widgets/doc/src/gallery.qdoc
+++ b/examples/widgets/doc/src/gallery.qdoc
@@ -5,6 +5,7 @@
     \example gallery
     \meta {tag} {gallery}
     \title Widgets Gallery Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Widgets Gallery example shows widgets relevant for designing UIs.
 
diff --git a/examples/widgets/doc/src/gradients.qdoc b/examples/widgets/doc/src/gradients.qdoc
index 5a951ffb95..5b84493c57 100644
--- a/examples/widgets/doc/src/gradients.qdoc
+++ b/examples/widgets/doc/src/gradients.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/gradients
     \title Gradients
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief Shows how gradients can be used with QPainter.
 
diff --git a/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc b/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
index 49301013ce..a269aac5fb 100644
--- a/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
+++ b/examples/widgets/doc/src/graphicsview-simpleanchorlayout.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example graphicsview/simpleanchorlayout
     \title Simple Anchor Layout Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-graphicsview-layout
     \brief Demonstrates anchor layout on a graphics view scene.
 
diff --git a/examples/widgets/doc/src/groupbox.qdoc b/examples/widgets/doc/src/groupbox.qdoc
index 5c565f1cb5..aa339098ab 100644
--- a/examples/widgets/doc/src/groupbox.qdoc
+++ b/examples/widgets/doc/src/groupbox.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/groupbox
     \title Group Box Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Group Box example shows how to use the different kinds of group
     boxes in Qt.
diff --git a/examples/widgets/doc/src/imagecomposition.qdoc b/examples/widgets/doc/src/imagecomposition.qdoc
index 3b192f378e..42ddab2296 100644
--- a/examples/widgets/doc/src/imagecomposition.qdoc
+++ b/examples/widgets/doc/src/imagecomposition.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/imagecomposition
     \title Image Composition Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \ingroup examples-layout
     \brief Shows how composition modes work in QPainter.
diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc
index 036572d679..66c822e421 100644
--- a/examples/widgets/doc/src/licensewizard.qdoc
+++ b/examples/widgets/doc/src/licensewizard.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example dialogs/licensewizard
     \title License Wizard Example
+    \examplecategory {User Interface Components}
     \ingroup examples-dialogs
 
     \brief The License Wizard example shows how to implement complex wizards in
diff --git a/examples/widgets/doc/src/lineedits.qdoc b/examples/widgets/doc/src/lineedits.qdoc
index c268f473e3..d11c080ce8 100644
--- a/examples/widgets/doc/src/lineedits.qdoc
+++ b/examples/widgets/doc/src/lineedits.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/lineedits
     \title Line Edits Example
+    \examplecateogry {User Interface Components}
     \ingroup examples-widgets
     \brief The Line Edits example demonstrates the many ways that QLineEdit
     can be used, and shows the effects of various properties and validators
diff --git a/examples/widgets/doc/src/menus.qdoc b/examples/widgets/doc/src/menus.qdoc
index 2bffd17b6b..db03eeec90 100644
--- a/examples/widgets/doc/src/menus.qdoc
+++ b/examples/widgets/doc/src/menus.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example mainwindows/menus
     \title Menus Example
+    \examplecategory {User Interface Components}
     \ingroup examples-mainwindow
     \ingroup examples-layout
 
diff --git a/examples/widgets/doc/src/orderform.qdoc b/examples/widgets/doc/src/orderform.qdoc
index 529ed6d24b..7ae89dfda8 100644
--- a/examples/widgets/doc/src/orderform.qdoc
+++ b/examples/widgets/doc/src/orderform.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example richtext/orderform
     \title Order Form Example
+    \examplecategory {User Interface Components}
     \ingroup examples-richtext
     \brief The Order Form example shows how to generate rich text
     documents by combining a simple template with data input by the
diff --git a/examples/widgets/doc/src/painterpaths.qdoc b/examples/widgets/doc/src/painterpaths.qdoc
index 55e78c849d..05d21cc0a2 100644
--- a/examples/widgets/doc/src/painterpaths.qdoc
+++ b/examples/widgets/doc/src/painterpaths.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/painterpaths
     \title Painter Paths Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief The Painter Paths example shows how painter paths can be
     used to beuild complex shapes for rendering.
diff --git a/examples/widgets/doc/src/pathstroke.qdoc b/examples/widgets/doc/src/pathstroke.qdoc
index 01c3771d24..cfb98bc343 100644
--- a/examples/widgets/doc/src/pathstroke.qdoc
+++ b/examples/widgets/doc/src/pathstroke.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/pathstroke
     \title Path Stroking
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief The Path Stroking example shows various types of pens that
     can be used with QPainter.
diff --git a/examples/widgets/doc/src/regularexpression.qdoc b/examples/widgets/doc/src/regularexpression.qdoc
index 8d7aa61629..f6f1e87689 100644
--- a/examples/widgets/doc/src/regularexpression.qdoc
+++ b/examples/widgets/doc/src/regularexpression.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/regularexpression
     \title QRegularExpression Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets-tools
 
     \brief The QRegularExpression example shows how regular expressions in Qt are
diff --git a/examples/widgets/doc/src/screenshot.qdoc b/examples/widgets/doc/src/screenshot.qdoc
index 1f30ce99a3..2e2b3123ef 100644
--- a/examples/widgets/doc/src/screenshot.qdoc
+++ b/examples/widgets/doc/src/screenshot.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example desktop/screenshot
     \title Taking a Screenshot
+    \examplecategory {Desktop}
     \ingroup examples-desktop
     \brief The Screenshot example shows how to take a screenshot of the
     desktop.
diff --git a/examples/widgets/doc/src/scribble.qdoc b/examples/widgets/doc/src/scribble.qdoc
index 1a87576e39..3cd7205397 100644
--- a/examples/widgets/doc/src/scribble.qdoc
+++ b/examples/widgets/doc/src/scribble.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/scribble
     \title Scribble Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Scribble example shows how to reimplement some of QWidget's
     event handlers to receive the events generated for the
diff --git a/examples/widgets/doc/src/settingseditor.qdoc b/examples/widgets/doc/src/settingseditor.qdoc
index 55226a9846..43c45008dc 100644
--- a/examples/widgets/doc/src/settingseditor.qdoc
+++ b/examples/widgets/doc/src/settingseditor.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/settingseditor
     \title Settings Editor Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets-tools
 
     \brief The Settings Editor example shows how Qt's standard settings support is used in an
diff --git a/examples/widgets/doc/src/shapedclock.qdoc b/examples/widgets/doc/src/shapedclock.qdoc
index 8e69be1db4..4bcd04683c 100644
--- a/examples/widgets/doc/src/shapedclock.qdoc
+++ b/examples/widgets/doc/src/shapedclock.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/shapedclock
     \title Translucent Background
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The example shows how to make a round window with a translucent
     background.
diff --git a/examples/widgets/doc/src/shortcuteditor.qdoc b/examples/widgets/doc/src/shortcuteditor.qdoc
index 350609c962..9999a18421 100644
--- a/examples/widgets/doc/src/shortcuteditor.qdoc
+++ b/examples/widgets/doc/src/shortcuteditor.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/shortcuteditor
     \title Shortcut Editor Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Shortcut Editor example shows how to create a basic, read-write
     hierarchical model to use with Qt's standard view and QKeySequenceEdit
diff --git a/examples/widgets/doc/src/simplerhiwidget.qdoc b/examples/widgets/doc/src/simplerhiwidget.qdoc
index 5db4f2d583..c8befb002b 100644
--- a/examples/widgets/doc/src/simplerhiwidget.qdoc
+++ b/examples/widgets/doc/src/simplerhiwidget.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example rhi/simplerhiwidget
     \title Simple RHI Widget Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-widgets
     \brief Shows how to render a triangle using QRhi, Qt's 3D API and shading language abstraction layer.
 
diff --git a/examples/widgets/doc/src/simpletreemodel.qdoc b/examples/widgets/doc/src/simpletreemodel.qdoc
index 3ab5a70151..9e7e021700 100644
--- a/examples/widgets/doc/src/simpletreemodel.qdoc
+++ b/examples/widgets/doc/src/simpletreemodel.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/simpletreemodel
     \title Simple Tree Model Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \ingroup examples-layout
     \brief The Simple Tree Model example shows how to use a hierarchical model
diff --git a/examples/widgets/doc/src/sliders.qdoc b/examples/widgets/doc/src/sliders.qdoc
index 26bfd44131..871adf0049 100644
--- a/examples/widgets/doc/src/sliders.qdoc
+++ b/examples/widgets/doc/src/sliders.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/sliders
     \title Sliders Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Sliders example shows how to use the different types of sliders
     available in Qt: QSlider, QScrollBar and QDial.
diff --git a/examples/widgets/doc/src/spinboxdelegate.qdoc b/examples/widgets/doc/src/spinboxdelegate.qdoc
index 025c502113..bd3b68aa97 100644
--- a/examples/widgets/doc/src/spinboxdelegate.qdoc
+++ b/examples/widgets/doc/src/spinboxdelegate.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/spinboxdelegate
     \title Spin Box Delegate Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Spin Box Delegate example shows how to create an editor for a custom delegate in
     the model/view framework by reusing a standard Qt editor widget.
diff --git a/examples/widgets/doc/src/spinboxes.qdoc b/examples/widgets/doc/src/spinboxes.qdoc
index 263fee91a4..eb42696c48 100644
--- a/examples/widgets/doc/src/spinboxes.qdoc
+++ b/examples/widgets/doc/src/spinboxes.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/spinboxes
     \title Spin Boxes Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Spin Boxes example shows how to use the many different types of
     spin boxes available in Qt, from a simple QSpinBox widget to more complex
diff --git a/examples/widgets/doc/src/spreadsheet.qdoc b/examples/widgets/doc/src/spreadsheet.qdoc
index 9d7c89d6ec..02d5e0a957 100644
--- a/examples/widgets/doc/src/spreadsheet.qdoc
+++ b/examples/widgets/doc/src/spreadsheet.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/spreadsheet
     \title Spreadsheet
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Spreadsheet example shows how to create a simple spreadsheet application.
 
diff --git a/examples/widgets/doc/src/standarddialogs.qdoc b/examples/widgets/doc/src/standarddialogs.qdoc
index 6770c918c8..396f1d1044 100644
--- a/examples/widgets/doc/src/standarddialogs.qdoc
+++ b/examples/widgets/doc/src/standarddialogs.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example dialogs/standarddialogs
     \title Standard Dialogs Example
+    \examplecategory {User Interface Components}
     \ingroup examples-dialogs
 
     \brief The Standard Dialogs example shows the standard dialogs that are provided by Qt.
diff --git a/examples/widgets/doc/src/stardelegate.qdoc b/examples/widgets/doc/src/stardelegate.qdoc
index 5d45577cb2..44d75e64f4 100644
--- a/examples/widgets/doc/src/stardelegate.qdoc
+++ b/examples/widgets/doc/src/stardelegate.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example itemviews/stardelegate
     \title Star Delegate Example
+    \examplecategory {User Interface Components}
     \ingroup examples-itemviews
     \brief The Star Delegate example shows how to create a delegate that
     can paint itself and that supports editing.
diff --git a/examples/widgets/doc/src/styleplugin.qdoc b/examples/widgets/doc/src/styleplugin.qdoc
index f08a8725c2..a866d096c1 100644
--- a/examples/widgets/doc/src/styleplugin.qdoc
+++ b/examples/widgets/doc/src/styleplugin.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/styleplugin
     \title Style Plugin Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets-tools
 
     \brief This example shows how to create a plugin that extends Qt with a new
diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc
index bdd13abdf3..17bcc1fa06 100644
--- a/examples/widgets/doc/src/syntaxhighlighter.qdoc
+++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example richtext/syntaxhighlighter
     \title Syntax Highlighter Example
+    \examplecategory {User Interface Components}
     \ingroup examples-richtext
     \brief The Syntax Highlighter example shows how to perform
     simple syntax highlighting.
diff --git a/examples/widgets/doc/src/tabdialog.qdoc b/examples/widgets/doc/src/tabdialog.qdoc
index f3887c94c8..fb45bbae04 100644
--- a/examples/widgets/doc/src/tabdialog.qdoc
+++ b/examples/widgets/doc/src/tabdialog.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example dialogs/tabdialog
     \title Tab Dialog Example
+    \examplecategory {User Interface Components}
     \ingroup examples-dialogs
 
     \brief The Tab Dialog example shows how to construct a tab dialog using the
diff --git a/examples/widgets/doc/src/tablet.qdoc b/examples/widgets/doc/src/tablet.qdoc
index e14e229235..9d49d8dec8 100644
--- a/examples/widgets/doc/src/tablet.qdoc
+++ b/examples/widgets/doc/src/tablet.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/tablet
     \title Tablet Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief This example shows how to use a Wacom tablet in Qt applications.
 
@@ -13,7 +14,7 @@
     generated. You need to reimplement the \l{QWidget::}{tabletEvent()} event
     handler if you want to handle tablet events. Events are generated when the
     tool (stylus) used for drawing enters and leaves the proximity of the
-    tablet (i.e., when it is close but not pressed down on it), when the tool
+    tablet (i.e., when it is closed but not pressed down on it), when the tool
     is pressed down and released from it, when the tool is moved across the
     tablet, and when one of the buttons on the tool is pressed or released.
 
@@ -31,7 +32,7 @@
     draw on the tablet as you use a pencil on paper. When you draw with the
     airbrush you get a spray of virtual paint; the finger wheel is used to
     change the density of the spray. When you draw with the art pen, you get a
-    a line whose width and endpoint angle depend on the rotation of the pen.
+    line whose width and endpoint angle depend on the rotation of the pen.
     The pressure and tilt can also be assigned to change the alpha and
     saturation values of the color and the width of the stroke.
 
diff --git a/examples/widgets/doc/src/tooltips.qdoc b/examples/widgets/doc/src/tooltips.qdoc
index 3af3768f00..6dc0d2fbae 100644
--- a/examples/widgets/doc/src/tooltips.qdoc
+++ b/examples/widgets/doc/src/tooltips.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/tooltips
     \title Tool Tips Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Tool Tips example shows how to provide static and dynamic tool
     tips for an application's widgets.
diff --git a/examples/widgets/doc/src/transformations.qdoc b/examples/widgets/doc/src/transformations.qdoc
index aabb672b86..ab54bbcb67 100644
--- a/examples/widgets/doc/src/transformations.qdoc
+++ b/examples/widgets/doc/src/transformations.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example painting/transformations
     \title Transformations Example
+    \examplecategory {Graphics & Multimedia}
     \ingroup examples-painting
     \brief The Transformations example shows how transformations
     influence the way that QPainter renders graphics primitives.
diff --git a/examples/widgets/doc/src/treemodelcompleter.qdoc b/examples/widgets/doc/src/treemodelcompleter.qdoc
index 9734c3bc7c..ae7c18f442 100644
--- a/examples/widgets/doc/src/treemodelcompleter.qdoc
+++ b/examples/widgets/doc/src/treemodelcompleter.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/treemodelcompleter
     \title Tree Model Completer Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets-tools
 
     \brief The Tree Model Completer example shows how to provide completion
diff --git a/examples/widgets/doc/src/trivialwizard.qdoc b/examples/widgets/doc/src/trivialwizard.qdoc
index 9ce22ec383..75d007f388 100644
--- a/examples/widgets/doc/src/trivialwizard.qdoc
+++ b/examples/widgets/doc/src/trivialwizard.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example dialogs/trivialwizard
     \title Trivial Wizard Example
+    \examplecategory {User Interface Components}
     \ingroup examples-dialogs
 
     \brief The Trivial Wizard example illustrates how to create a linear three-page
diff --git a/examples/widgets/doc/src/undoframework.qdoc b/examples/widgets/doc/src/undoframework.qdoc
index 6ca2b4b138..e8d895b7f0 100644
--- a/examples/widgets/doc/src/undoframework.qdoc
+++ b/examples/widgets/doc/src/undoframework.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tools/undoframework
     \title Undo Framework Example
+    \examplecategory {Data Processing & I/O}
     \ingroup examples-widgets-tools
 
     \brief This example shows how to implement undo/redo functionality
diff --git a/examples/widgets/doc/src/windowflags.qdoc b/examples/widgets/doc/src/windowflags.qdoc
index d521894a17..10b0496728 100644
--- a/examples/widgets/doc/src/windowflags.qdoc
+++ b/examples/widgets/doc/src/windowflags.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example widgets/windowflags
     \title Window Flags Example
+    \examplecategory {User Interface Components}
     \ingroup examples-widgets
     \brief The Window Flags example shows how to use the window flags
     available in Qt.
diff --git a/examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc b/examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
index 7722da680a..878da3f8aa 100644
--- a/examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
+++ b/examples/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example gestures/imagegestures
     \title Image Gestures Example
+    \examplecategory {User Interface Components}
     \brief Demonstrates the use of simple gestures in a widget.
 
     This example shows how to enable gestures for a widget and use gesture input
diff --git a/examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc b/examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc
index 3a41c5005b..fc6daa3732 100644
--- a/examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc
+++ b/examples/widgets/touch/knobs/doc/src/touch-knobs.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example touch/knobs
     \title Touch Knobs Example
+    \examplecategory {User Interface Components}
     \ingroup touchinputexamples
     \brief Shows how to create custom controls that accept touch input.
 
diff --git a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc
index d011cfd995..7979d59188 100644
--- a/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc
+++ b/examples/widgets/tutorials/notepad/gettingstartedqt.qdoc
@@ -4,6 +4,7 @@
 /*!
     \example tutorials/notepad
     \title Getting Started Programming with Qt Widgets
+    \examplecategory {User Interface Components}
     \brief A tutorial for Qt Widgets based notepad application.
 
     In this topic, we teach basic Qt knowledge by implementing a simple