diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-05 17:29:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 14:56:38 +0200 |
| commit | 4eb3400843cafcedffa47fb8a272704bca4e9473 (patch) | |
| tree | 6541694bca4cca47ea8fa8b4cc8db38fb3ead11a /src/controls/qquickmenuitem.cpp | |
| parent | 82081e737038262c82c2e408d412fc80a607bf9f (diff) | |
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/qquickmenuitem.cpp')
| -rw-r--r-- | src/controls/qquickmenuitem.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 2fda7e008..4d276ac11 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -84,6 +84,13 @@ void QQuickMenuBase::setVisible(bool v) } } +QObject *QQuickMenuBase::parentMenuOrMenuBar() const +{ + if (!m_parentMenu) + return parent(); + return m_parentMenu; +} + QQuickMenu *QQuickMenuBase::parentMenu() const { return m_parentMenu; |