diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-11 11:50:37 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-11 11:50:37 (GMT) |
| commit | c6ed32dc7e9c8a566f376d1baa7e616a1019f9af (patch) | |
| tree | 95ce43172963aa266630d8836ccb6b23dde78991 /doc/src/widgets-and-layouts/widgets.qdoc | |
| parent | 9986c3f0c0681c7ea8bc8e5cfea5662880db6654 (diff) | |
| parent | 5fa15620d09df1164cc28aa9b1e646a61f87e909 (diff) | |
| download | Qt-c6ed32dc7e9c8a566f376d1baa7e616a1019f9af.zip Qt-c6ed32dc7e9c8a566f376d1baa7e616a1019f9af.tar.gz Qt-c6ed32dc7e9c8a566f376d1baa7e616a1019f9af.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/widgets-and-layouts/widgets.qdoc')
| -rw-r--r-- | doc/src/widgets-and-layouts/widgets.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc index f2475c2..fbce744 100644 --- a/doc/src/widgets-and-layouts/widgets.qdoc +++ b/doc/src/widgets-and-layouts/widgets.qdoc @@ -29,7 +29,6 @@ \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 @@ -68,7 +67,7 @@ \section1 Widget Styles - \l{Styles & Style Aware Widgets}{Styles} draw on behalf of + \l{Styles and Style Aware Widgets}{Styles} draw on behalf of widgets and encapsulate the look and feel of a GUI. Qt's built-in widgets use the QStyle class to perform nearly all of their drawing, ensuring that they look exactly like the equivalent native widgets. |