diff options
| author | Aleksei Nikiforov <darktemplar@basealt.ru> | 2019-02-25 18:06:11 +0300 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2019-02-27 22:17:24 +0100 |
| commit | 8b0a9db87d776dbdb2cbbd1fd79ede13e2504321 (patch) | |
| tree | 86e194eebff4881bdc249ea4361928469c9c08b0 | |
| parent | e0e3064e43dd21f9d91805718618625ac4fb29d7 (diff) | |
tdf#120824 KDE5: fix visible/enabled state for menu
Change-Id: I003703f0bc2e1697124e068a68bfb2e24c33cd1a
Reviewed-on: https://gerrit.libreoffice.org/68351
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit ea6b4b743d397f40029291954af6d37d9059042b)
Reviewed-on: https://gerrit.libreoffice.org/68412
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | vcl/qt5/Qt5Menu.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx index 8fee56a9cf70..049d90b7b4da 100644 --- a/vcl/qt5/Qt5Menu.cxx +++ b/vcl/qt5/Qt5Menu.cxx @@ -157,15 +157,19 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos) pAction->setChecked(bChecked); } - pAction->setEnabled(pSalMenuItem->mbEnabled); - pAction->setVisible(pSalMenuItem->mbVisible); - connect(pAction, &QAction::triggered, this, [pSalMenuItem] { slotMenuTriggered(pSalMenuItem); }); } } } + QAction* pAction = pSalMenuItem->getAction(); + if (pAction) + { + pAction->setEnabled(pSalMenuItem->mbEnabled); + pAction->setVisible(pSalMenuItem->mbVisible); + } + return pQMenu; } |