summaryrefslogtreecommitdiff
path: root/src/controls/qquickmenu.cpp
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-09-05 17:29:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-13 14:56:38 +0200
commit4eb3400843cafcedffa47fb8a272704bca4e9473 (patch)
tree6541694bca4cca47ea8fa8b4cc8db38fb3ead11a /src/controls/qquickmenu.cpp
parent82081e737038262c82c2e408d412fc80a607bf9f (diff)
downloadqtquickcontrols-4eb3400843cafcedffa47fb8a272704bca4e9473.tar.gz
Menu: Enable mnemonic menu navigation
We also added a new mnemonic specific shortcut context matcher. This prevents two menu items with the same mnemonic but within different menus to be reported as ambiguous. Task-number: QTBUG-33030 ChangeLog: Added mnemonic navigation for menus Change-Id: I192c9aacba4d15851fe65bf9201251962fe976d5 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/controls/qquickmenu.cpp')
-rw-r--r--src/controls/qquickmenu.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index 2dbaf952..f65d7044 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -401,8 +401,10 @@ void QQuickMenu::__popup(qreal x, qreal y, int atItemIndex)
void QQuickMenu::setMenuContentItem(QQuickItem *item)
{
- if (m_menuContentItem != item)
+ if (m_menuContentItem != item) {
m_menuContentItem = item;
+ emit menuContentItemChanged();
+ }
}
void QQuickMenu::setPopupVisible(bool v)