diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
| commit | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (patch) | |
| tree | f0ac9ead3755b886975dada5c977e969600526fd /doc/src/widgets-and-layouts/layout.qdoc | |
| parent | cd1b5d933575fb801ad3014f3d7fd7c268a362d1 (diff) | |
| parent | 1970e2d46656db8178636e06c82287f536b626c7 (diff) | |
| download | Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.zip Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.gz Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/widgets-and-layouts/layout.qdoc')
| -rw-r--r-- | doc/src/widgets-and-layouts/layout.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/widgets-and-layouts/layout.qdoc b/doc/src/widgets-and-layouts/layout.qdoc index 798a7a1..d2687ea 100644 --- a/doc/src/widgets-and-layouts/layout.qdoc +++ b/doc/src/widgets-and-layouts/layout.qdoc @@ -37,9 +37,9 @@ \brief A tour of the standard layout managers and an introduction to custom layouts. - \previouspage Widget Classes + \previouspage Widgets and Layouts \contentspage Widgets and Layouts - \nextpage {Implementing Styles and Style Aware Widgets}{Styles} + \nextpage {Styles and Style Aware Widgets}{Styles} \ingroup frameworks-technologies |