diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:08:29 +0100 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:12:44 +0100 |
commit | 0dc61c4216697a2c4066d4735b4be941e869e514 (patch) | |
tree | 8a3876897fc5144cc2f9b28223ff9548944a8775 /examples/widgets/doc/src/icons.qdoc | |
parent | b98b11fa036ea301d1483df6f533ec55be727d9d (diff) | |
parent | a769a212e0c22283fc05d3f49c252f8e2a62ba3f (diff) |
Merge branch 'newdocs'
Added prepare_docs to qt_build_config.prf (it was added
directly in configure in the source branch)
Conflicts:
configure
tools/configure/configureapp.cpp
Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
Diffstat (limited to 'examples/widgets/doc/src/icons.qdoc')
-rw-r--r-- | examples/widgets/doc/src/icons.qdoc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/examples/widgets/doc/src/icons.qdoc b/examples/widgets/doc/src/icons.qdoc index d39f104bf1..0ba18d4a26 100644 --- a/examples/widgets/doc/src/icons.qdoc +++ b/examples/widgets/doc/src/icons.qdoc @@ -28,11 +28,13 @@ /*! \example widgets/icons \title Icons Example + \ingroup examples-widgets + \brief The Icons example shows how QIcon can generate pixmaps reflecting + an icon's state, mode and size. - The Icons example shows how QIcon can generate pixmaps reflecting - an icon's state, mode and size. These pixmaps are generated from - the set of pixmaps made available to the icon, and are used by Qt - widgets to show an icon representing a particular action. + These pixmaps are generated from the set of pixmaps made available to the + icon, and are used by Qt widgets to show an icon representing a particular + action. \image icons-example.png Screenshot of the Icons example |