From ed6330af2f6ba5ad9c71b9db82603fe0ff7f0534 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 17 Jun 2015 14:19:21 +0200 Subject: Android: fix hw menu button to open the options menu Change-Id: I9cc08b64521f414b50598aead3957347ff30528a Task-number: QTBUG-45131 Reviewed-by: Christian Stromme --- src/controls/ApplicationWindow.qml | 2 +- src/controls/Styles/Android/ApplicationWindowStyle.qml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 542cfe4e..4c30664d 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -231,7 +231,7 @@ Window { } Binding { target: menuBar; property: "__parentWindow"; value: root } - Keys.forwardTo: menuBar ? [menuBar.__contentItem] : [] + Keys.forwardTo: menuBar ? [menuBar.__contentItem, __panel] : [] ContentItem { id: contentArea diff --git a/src/controls/Styles/Android/ApplicationWindowStyle.qml b/src/controls/Styles/Android/ApplicationWindowStyle.qml index c54735ba..550d31a3 100644 --- a/src/controls/Styles/Android/ApplicationWindowStyle.qml +++ b/src/controls/Styles/Android/ApplicationWindowStyle.qml @@ -96,6 +96,8 @@ QtObject { height: visibleChildren.length > 0 ? implicitHeight : 0 } + Keys.onMenuPressed: proxyMenu.popup() + Item { id: menuBarArea visible: false -- cgit v1.2.3