diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-06-30 12:37:16 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-06-30 12:46:50 (GMT) |
| commit | 1fc1eafc9bc5e8e7e69c04b9fac93d45a74ebfbf (patch) | |
| tree | f2fc5eb6c1f1b226145f80fd188aa0bf34c08e2c | |
| parent | 4be64775a5b3964e611e7fdb334edd33b1ef6b9b (diff) | |
| download | Qt-1fc1eafc9bc5e8e7e69c04b9fac93d45a74ebfbf.zip Qt-1fc1eafc9bc5e8e7e69c04b9fac93d45a74ebfbf.tar.gz Qt-1fc1eafc9bc5e8e7e69c04b9fac93d45a74ebfbf.tar.bz2 | |
Doc: About menu on the Mac gets the application name from Info.plist.
Task-number: 256818
Reviewed-by: Trenton Schulz
| -rw-r--r-- | src/gui/kernel/qaction.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index a7f458f..26baad5 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -249,7 +249,9 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) as described in the QMenuBar documentation. \value ApplicationSpecificRole This action should be put in the application menu with an application specific role \value AboutQtRole This action matches handles the "About Qt" menu item. - \value AboutRole This action should be placed where the "About" menu item is in the application menu. + \value AboutRole This action should be placed where the "About" menu item is in the application menu. The text of + the menu item will be set to "About <application name>". The application name is fetched from the + \c{Info.plist} file in the application's bundle (See \l{Deploying an Application on Mac OS X}). \value PreferencesRole This action should be placed where the "Preferences..." menu item is in the application menu. \value QuitRole This action should be placed where the Quit menu item is in the application menu. */ diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index f58ea50..741916a 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -661,8 +661,9 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \header \i String matches \i Placement \i Notes \row \i about.* \i Application Menu | About <application name> - \i If this entry is not found no About item will appear in - the Application Menu + \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. \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 |