diff options
| author | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-19 11:57:27 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <gareth.stockwell@sosco.com> | 2009-08-19 11:57:27 (GMT) |
| commit | d9e03376f9f82e5664dfd2446ff4c05e35ffb535 (patch) | |
| tree | 711f77f7d307c05a3ae310b1fd59bbce74bd8eab /src/gui/widgets/qmenubar.cpp | |
| parent | 98d4c657803d5f1956560bd9b62e73f15c05e8fd (diff) | |
| parent | ca0b5b503e8865c0eedeea86aa132291281fc49f (diff) | |
| download | Qt-d9e03376f9f82e5664dfd2446ff4c05e35ffb535.zip Qt-d9e03376f9f82e5664dfd2446ff4c05e35ffb535.tar.gz Qt-d9e03376f9f82e5664dfd2446ff4c05e35ffb535.tar.bz2 | |
Merged in DummyPlayer changes
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index a0a2f57..82b3769 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -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, |