summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qaction.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-08-13 01:05:02 +0200
committerLiang Qi <liang.qi@qt.io>2016-08-13 01:05:02 +0200
commit6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch)
tree545dac994ef985cc91d92fa77da21581b6762c86 /src/widgets/kernel/qaction.cpp
parentd04982dc84d66bec92b4b3767538676cf925ef17 (diff)
parentd9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/widgets/kernel/qaction.cpp')
-rw-r--r--src/widgets/kernel/qaction.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp
index 718ecffcc9..81cf9ea754 100644
--- a/src/widgets/kernel/qaction.cpp
+++ b/src/widgets/kernel/qaction.cpp
@@ -255,7 +255,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 OS X.
+ This enum describes how an action should be moved into the application menu on \macos.
\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
@@ -264,7 +264,7 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map)
\value AboutQtRole This action 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 OS X - Deployment}).
+ \c{Info.plist} file in the application's bundle (See \l{Qt for macOS - 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.
@@ -1237,12 +1237,12 @@ void QAction::activate(ActionEvent event)
\brief the action's menu role
\since 4.2
- This indicates what role the action serves in the application menu on Mac
- OS X. By default all actions have the TextHeuristicRole, which means that
+ This indicates what role the action serves in the application menu on
+ \macos. By default all actions have the TextHeuristicRole, which means that
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 OS X (usually just before the first application window is
+ bar in \macos (usually just before the first application window is
shown).
*/
void QAction::setMenuRole(MenuRole menuRole)