summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qmenubar.cpp
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-03-01 15:28:31 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-02 23:16:25 +0100
commit95d83cb1b68cc4a415d5d80859b4e74472ad7112 (patch)
tree9f6fa892ee78f584224320a195f03419c0fdbc21 /src/widgets/widgets/qmenubar.cpp
parent15e136d4e116c1513c106dfbb75e1953a7f3463c (diff)
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I519bf9c29b14092e3ab6067612f42bf749eeedf5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmenubar.cpp')
-rw-r--r--src/widgets/widgets/qmenubar.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index 16e486e77f..11f6592cc9 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -621,17 +621,17 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
\table
- \row \o \inlineimage plastique-menubar.png A menu bar shown in the
+ \row \li \inlineimage plastique-menubar.png A menu bar shown in the
Plastique widget style.
- \o The \l{QPlastiqueStyle}{Plastique widget style}, like most
+ \li The \l{QPlastiqueStyle}{Plastique widget style}, like most
other styles, handles the \gui{Help} menu in the same way as it
handles any other menu.
- \row \o \inlineimage motif-menubar.png A menu bar shown in the
+ \row \li \inlineimage motif-menubar.png A menu bar shown in the
Motif widget style.
- \o The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus
+ \li The \l{QMotifStyle}{Motif widget style} treats \gui{Help} menus
in a special way, placing them at right-hand end of the menu bar.
\endtable
@@ -652,18 +652,18 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
the strings looked for and where the entry is placed if matched:
\table
- \header \i String matches \i Placement \i Notes
- \row \i about.*
- \i Application Menu | About <application name>
- \i The application name is fetched from the \c {Info.plist} file
+ \header \li String matches \li Placement \li Notes
+ \row \li about.*
+ \li Application Menu | About <application name>
+ \li The application name is fetched from the \c {Info.plist} file
(see note below). If this entry is not found no About item
will appear in the Application Menu.
- \row \i config, options, setup, settings or preferences
- \i Application Menu | Preferences
- \i If this entry is not found the Settings item will be disabled
- \row \i quit or exit
- \i Application Menu | Quit <application name>
- \i If this entry is not found a default Quit item will be
+ \row \li config, options, setup, settings or preferences
+ \li Application Menu | Preferences
+ \li If this entry is not found the Settings item will be disabled
+ \row \li quit or exit
+ \li Application Menu | Quit <application name>
+ \li If this entry is not found a default Quit item will be
created to call QApplication::quit()
\endtable
@@ -676,12 +676,12 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
\snippet doc/src/snippets/code/src_gui_widgets_qmenubar.cpp 1
- \bold{Note:} Do \e{not} call QMainWindow::menuBar() to create the
+ \b{Note:} Do \e{not} call QMainWindow::menuBar() to create the
shared menu bar, because that menu bar will have the QMainWindow
as its parent. That menu bar would only be displayed for the
parent QMainWindow.
- \bold{Note:} The text used for the application name in the menu
+ \b{Note:} The text used for the application name in the menu
bar is obtained from the value set in the \c{Info.plist} file in
the application's bundle. See \l{Deploying an Application on
Mac OS X} for more information.