diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:28:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:28:09 +0200 |
| commit | cb6ccf9fee26c5a2b7f3946b7ffc05430b7be3ff (patch) | |
| tree | 6de74ca46c389328696831bcc74cd5aff6756fee /src/controls/Private/EditMenu_base.qml | |
| parent | ded73ee2ae8aa333894ab11ce2297e755ec03f3e (diff) | |
| parent | de9145dcd904068256e28e130fdfda2e8014efe8 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/controls/qquickmenupopupwindow_p.h
Change-Id: Ic935bb56f5df70645eea30c890759f5980d68fe4
Diffstat (limited to 'src/controls/Private/EditMenu_base.qml')
| -rw-r--r-- | src/controls/Private/EditMenu_base.qml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/Private/EditMenu_base.qml b/src/controls/Private/EditMenu_base.qml index c242e596e..e44ff5992 100644 --- a/src/controls/Private/EditMenu_base.qml +++ b/src/controls/Private/EditMenu_base.qml @@ -160,9 +160,11 @@ Item { input.activate() if (control.menu) { - getMenuInstance().__dismissMenu(); + var menu = getMenuInstance(); + menu.__dismissMenu(); + menu.__destroyAllMenuPopups(); var menuPos = mapToItem(null, mouse.x, mouse.y) - getMenuInstance().__popup(Qt.rect(menuPos.x, menuPos.y, 0, 0), -1, MenuPrivate.EditMenu); + menu.__popup(Qt.rect(menuPos.x, menuPos.y, 0, 0), -1, MenuPrivate.EditMenu); } } } |