summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qaction.cpp
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2014-08-30 16:24:59 +0200
committerJerome Pasion <jerome.pasion@digia.com>2014-09-11 21:45:46 +0200
commita14ec355c185c4f8857ae606990ff24d5431e1f8 (patch)
treea2ffa5583fced506336a0d4d61aba67cf7dce226 /src/widgets/kernel/qaction.cpp
parent6a666cb07306b4aae850fb2104d27a663923a4bb (diff)
Doc: Fixed broken links introduced by "OS X" doc change.
-qtdoc repo uses "OS X" instead of "Mac OS X" and this caused broken links. -more comprehensive change still needs to be done but the new name is used in the page to maintain consistency. At least within the page or class. Change-Id: I8a5650046fc0413cbb18359b743ecd30fd62e417 Task-number: QTBUG-40759 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/widgets/kernel/qaction.cpp')
-rw-r--r--src/widgets/kernel/qaction.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
index c0e3e98ae1..6713e78cfc 100644
--- a/src/widgets/kernel/qaction.cpp
+++ b/src/widgets/kernel/qaction.cpp
@@ -261,7 +261,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
/*!
\enum QAction::MenuRole
- This enum describes how an action should be moved into the application menu on Mac OS X.
+ This enum describes how an action should be moved into the application menu on OS X.
\value NoRole This action should not be put into the application menu
\value TextHeuristicRole This action should be put in the application menu based on the action's text
@@ -270,7 +270,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
\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. 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{Qt for Mac OS X - Deployment}).
+ \c{Info.plist} file in the application's bundle (See \l{Qt for OS X - Deployment}).
\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.
@@ -1247,7 +1247,7 @@ void QAction::activate(ActionEvent event)
the action is added based on its text (see QMenuBar for more information).
The menu role can only be changed before the actions are put into the menu
- bar in Mac OS X (usually just before the first application window is
+ bar in OS X (usually just before the first application window is
shown).
*/
void QAction::setMenuRole(MenuRole menuRole)