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/charactermap.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/charactermap.qdoc')
| -rw-r--r-- | examples/widgets/doc/src/charactermap.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/doc/src/charactermap.qdoc b/examples/widgets/doc/src/charactermap.qdoc index 4eb51ca678..8b980bc630 100644 --- a/examples/widgets/doc/src/charactermap.qdoc +++ b/examples/widgets/doc/src/charactermap.qdoc @@ -28,8 +28,8 @@ /*! \example widgets/charactermap \title Character Map Example - -The Character Map example shows how to create a custom widget that can +\ingroup examples-widgets +\brief The Character Map example shows how to create a custom widget that can both display its own content and respond to user input. The example displays an array of characters which the user can click on |