summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-17 14:19:21 +0200
committerChristian Stromme <christian.stromme@theqtcompany.com>2015-08-19 15:28:44 +0000
commited6330af2f6ba5ad9c71b9db82603fe0ff7f0534 (patch)
tree2664f043905c039e87ac952eae64a5cce04faae2
parent3d88c2b2356dd1b871626d3a28dd761bf1feb9f0 (diff)
downloadqtquickcontrols-ed6330af2f6ba5ad9c71b9db82603fe0ff7f0534.tar.gz
Android: fix hw menu button to open the options menu
Change-Id: I9cc08b64521f414b50598aead3957347ff30528a Task-number: QTBUG-45131 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-rw-r--r--src/controls/ApplicationWindow.qml2
-rw-r--r--src/controls/Styles/Android/ApplicationWindowStyle.qml2
2 files changed, 3 insertions, 1 deletions
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