diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-05-28 14:11:51 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-05-28 14:11:51 (GMT) |
| commit | 9c2b421bfd8a68895f3797ca629bdc6bef506d46 (patch) | |
| tree | 7eeca76ae8053aa44ddf6baa1c82ceb1e3f77782 /doc/src/windows-and-dialogs/mainwindow.qdoc | |
| parent | 0f61bdd677c204c41b56158b0a38880856e43c28 (diff) | |
| parent | 60c12264b0ff01bb4888323b3acda0bc581021a7 (diff) | |
| download | Qt-9c2b421bfd8a68895f3797ca629bdc6bef506d46.zip Qt-9c2b421bfd8a68895f3797ca629bdc6bef506d46.tar.gz Qt-9c2b421bfd8a68895f3797ca629bdc6bef506d46.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/windows-and-dialogs/mainwindow.qdoc')
| -rw-r--r-- | doc/src/windows-and-dialogs/mainwindow.qdoc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc index c1e66d9..db9a636 100644 --- a/doc/src/windows-and-dialogs/mainwindow.qdoc +++ b/doc/src/windows-and-dialogs/mainwindow.qdoc @@ -49,7 +49,6 @@ \title Window and Dialog Widgets \brief Windows and Dialogs in Qt. \ingroup qt-gui-concepts - \ingroup frameworks-technologies A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window. Usually, windows have a frame and a title bar, although it is also possible to create @@ -81,7 +80,7 @@ \section1 Main Windows and Dialogs - \l{The Application Main Window} provides the framework for building the + The \l{Application Main Window} provides the framework for building the application's main user interface, and are created by subclassing QMainWindow. QMainWindow has its own layout to which you can add a \l{QMenuBar}{menu bar}, \l{QToolBar}{tool bars}, \l{QDockWidget}{dockable widgets} and a |