diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-05 15:02:30 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-05 15:02:30 (GMT) |
| commit | 12f9af3d569210e928d1d5e3a174c53a97dd3372 (patch) | |
| tree | a2c4ab87deeb87cd5256a1df9e1b80df3be61094 /src/gui/widgets/qmenubar.cpp | |
| parent | ced7ed0bc745618e1b0618a17b112f983dd4a9c6 (diff) | |
| parent | 906f77bcfd4358f35155075b6d5fd8a383adadba (diff) | |
| download | Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.zip Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.tar.gz Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index 0e14385..9caadb7 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -667,7 +667,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \i Application Menu | About <application name> \i 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. + 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 |