diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:33:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:34:00 +0200 |
| commit | be487bdb038cb01fa938adde9997e2761900e29d (patch) | |
| tree | 870d3652807c8e9e4bbcc190be72dc4c730316a4 /src/controls/ApplicationWindow.qml | |
| parent | 8c3b19bc0afe94de49e008e7292a8aeed9cc4cfa (diff) | |
| parent | 3ffd2e4ee3229e714eed497c1ae3a3bbbcabe8cf (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie81aa6abe8a4acbd201e4938f0cb693a8b3aa567
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 40334f887..fa2d1b51d 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -232,7 +232,7 @@ Window { } Binding { target: menuBar; property: "__parentWindow"; value: root } - Keys.forwardTo: menuBar ? [menuBar.__contentItem] : [] + Keys.forwardTo: menuBar ? [menuBar.__contentItem, __panel] : [] ContentItem { id: contentArea |