diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-17 18:16:13 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-17 18:16:13 (GMT) |
| commit | 42e342d1b3924206c7fa4175cb064dc2bbe0f00c (patch) | |
| tree | 12f01bb114f956dd257507f0106c39d5a5247a12 /src/gui/widgets/qmenubar.cpp | |
| parent | 7332e42363eb93f1de032319439a7250e16b3b12 (diff) | |
| parent | f37c1ea90b4265f1e2b2e7de9bbb0a021ca230d6 (diff) | |
| download | Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.zip Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.gz Qt-42e342d1b3924206c7fa4175cb064dc2bbe0f00c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 640ac5b..2989f94 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -590,8 +590,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \class QMenuBar \brief The QMenuBar class provides a horizontal menu bar. - \ingroup application - \mainclass + \ingroup mainwindow-classes A menu bar consists of a list of pull-down menu items. You add menu items with addMenu(). For example, asuming that \c menubar @@ -715,7 +714,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \section1 Examples The \l{mainwindows/menus}{Menus} example shows how to use QMenuBar - and QMenu. The other \l{Qt Examples#Main Windows}{main window + and QMenu. The other \l{Main Window Examples}{main window application examples} also provide menus using these classes. \sa QMenu, QShortcut, QAction, |