summaryrefslogtreecommitdiffstats
path: root/src/controls/qtmenuitem.cpp
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-03-01 11:17:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-01 12:39:16 +0100
commit784f04c9fde300e62398d116f3072f66ca3b64bf (patch)
tree94ea39ac787bbbe31938648a925d51e3b7d5bcc0 /src/controls/qtmenuitem.cpp
parent850124ff583414bef8ec969e34f6667740509781 (diff)
Menus: Doc, manual test fixes
Change-Id: I98c4c6aa39f9a947f0610ac976ed74447252d06b Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/qtmenuitem.cpp')
-rw-r--r--src/controls/qtmenuitem.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/controls/qtmenuitem.cpp b/src/controls/qtmenuitem.cpp
index bf2248d16..e7878f25c 100644
--- a/src/controls/qtmenuitem.cpp
+++ b/src/controls/qtmenuitem.cpp
@@ -232,7 +232,11 @@ void QtMenuText::setIconName(const QString &iconName)
/*!
\qmlproperty string MenuItem::text
- Text for the menu item. Accelerators are supported with the usual \& convention.
+ Text for the menu item.
+
+ Mnemonics are supported by prefixing the shortcut letter with \&.
+ For instance, \c "\&Open" will bind the \c Alt-O shortcut to the
+ \c "Open" menu item. Note that not all platforms support mnemonics.
*/
/*!
@@ -316,7 +320,7 @@ void QtMenuText::setIconName(const QString &iconName)
/*!
\qmlproperty Action MenuItem::action
- The action bound to this menu item. Setting this property to an valid
+ The action bound to this menu item. Setting this property to a valid
\l Action will override all the menu item's properties except \l text.
In addition, the menu item \c triggered() and \c toggled() signals will not be emitted.