diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-30 21:11:09 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-30 21:11:13 +0100 |
commit | e2d7c49923c946eacb4ea635b78f1a06eeffd5c6 (patch) | |
tree | 58cc98de3bad24e9937d36f260ebcf3d44ac4294 /src/controls/MenuBar.qml | |
parent | b834f742994e5dce69c3fdc161099f2ed20deff9 (diff) | |
parent | 4998538c94ed8cb029b8849a60b3f7528eae8311 (diff) | |
download | qtquickcontrols-e2d7c49923c946eacb4ea635b78f1a06eeffd5c6.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 5.6.0
Change-Id: Ideb3ff546c83f52df6fa6a61fa7f91c628c43021
Diffstat (limited to 'src/controls/MenuBar.qml')
-rw-r--r-- | src/controls/MenuBar.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml index a16635ff..cb31ed71 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -247,6 +247,8 @@ MenuBarPrivate { } } + Keys.forwardTo: d.openedMenuIndex !== -1 ? [root.menus[d.openedMenuIndex].__contentItem] : [] + Row { id: row x: d.style ? d.style.padding.left : 0 |