diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-28 19:26:46 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-28 19:26:46 (GMT) |
| commit | 4ed9d39a31d07a9b7ec826287e228321ab05338c (patch) | |
| tree | 29331386ea525ee9d71d6467d252dd2b480a5636 /doc | |
| parent | 4722183a17ac0074a82a16983a51689642af802b (diff) | |
| parent | c3cdff4ea4d03e8d14f31b10a4d7e80ba0c397c2 (diff) | |
| download | Qt-4ed9d39a31d07a9b7ec826287e228321ab05338c.zip Qt-4ed9d39a31d07a9b7ec826287e228321ab05338c.tar.gz Qt-4ed9d39a31d07a9b7ec826287e228321ab05338c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/frameworks-technologies/richtext.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/painting-and-printing/coordsys.qdoc | 1 | ||||
| -rw-r--r-- | doc/src/widgets-and-layouts/stylesheet.qdoc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc index 7a5a6a6..089f84d 100644 --- a/doc/src/frameworks-technologies/richtext.qdoc +++ b/doc/src/frameworks-technologies/richtext.qdoc @@ -37,6 +37,7 @@ \ingroup frameworks-technologies \ingroup qt-basic-concepts + \ingroup best-practices \nextpage Rich Text Document Structure diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc index a8febae..252159e 100644 --- a/doc/src/painting-and-printing/coordsys.qdoc +++ b/doc/src/painting-and-printing/coordsys.qdoc @@ -29,6 +29,7 @@ \page coordsys.html \title Coordinate System \ingroup qt-graphics + \ingroup best-practices \brief Information about the coordinate system used by the paint system. diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc index 60d8cbd..be845c4 100644 --- a/doc/src/widgets-and-layouts/stylesheet.qdoc +++ b/doc/src/widgets-and-layouts/stylesheet.qdoc @@ -32,6 +32,7 @@ \ingroup frameworks-technologies \ingroup qt-basic-concepts + \ingroup qt-gui-concepts \previouspage {Styles and Style Aware Widgets}{Styles} \contentspage Widgets and Layouts |