diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-05 09:29:31 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-05 09:29:31 (GMT) |
| commit | 26388778c817448c2cd560781e6bf69457a641a5 (patch) | |
| tree | 11e77cf6368ed47084ec43e2dd96fcc0ccce57d3 /doc | |
| parent | ab66b692dd2729f8b59410b65940934926e5ee04 (diff) | |
| parent | d524da81ee257a6bd67d32d0bc870280a7d5b8a4 (diff) | |
| download | Qt-26388778c817448c2cd560781e6bf69457a641a5.zip Qt-26388778c817448c2cd560781e6bf69457a641a5.tar.gz Qt-26388778c817448c2cd560781e6bf69457a641a5.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/overviews.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/widgets-and-layouts/widgets.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/windows-and-dialogs/dialogs.qdoc | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc index a1773a3..b72df98 100644 --- a/doc/src/overviews.qdoc +++ b/doc/src/overviews.qdoc @@ -29,6 +29,7 @@ \page overviews.html \title All Overviews and HOWTOs + \ingroup qt-basic-concepts \generatelist overviews */ diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index 18b8be1..f2475c2 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,6 +29,7 @@ \page widgets-and-layouts.html \title Widgets and Layouts \ingroup qt-gui-concepts + \ingroup qt-basic-concepts \brief The primary elements for designing user interfaces in Qt. \section1 Widgets diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 6316dc9..74df2aa 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -27,11 +27,13 @@ /*! \group standard-dialogs + \ingroup qt-basic-concepts \title Standard Dialog Classes */ /*! \group dialog-classes + \ingroup qt-basic-concepts \title Classes for Building Dialogs */ |