diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:48 +0200 |
| commit | 63d832bcae98104bf071096605fc27a59a52254c (patch) | |
| tree | ba2fd42487c5889aad0b80aaddb0f304a690b561 /src/controls/qquickmenuitem.cpp | |
| parent | 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (diff) | |
| parent | a21a33fe79e82a7bd3471612b46106ac1343648f (diff) | |
| download | qtquickcontrols-63d832bcae98104bf071096605fc27a59a52254c.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
Diffstat (limited to 'src/controls/qquickmenuitem.cpp')
| -rw-r--r-- | src/controls/qquickmenuitem.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 5fd1c6c5..0702d398 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -676,7 +676,12 @@ void QQuickMenuItem::setEnabled(bool enabled) void QQuickMenuItem::trigger() { + QPointer<QQuickMenu> menu(parentMenu()); + if (menu) + menu->prepareItemTrigger(this); action()->trigger(this); + if (menu) + menu->concludeItemTrigger(this); } QT_END_NAMESPACE |