Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix QAction::setVisible() regression since d504e5d4ad

Browse source 
also update the documentation about group state change that was made with
d504e5d4ad
This commit is contained in:
Ivailo Monev 2020-01-26 22:52:37 +00:00
parent eada44b207
commit 7de3b1c8f1
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/kernel/qaction.cpp
View file

@ -1059,7 +1059,7 @@ void QAction::setVisible(bool b)
return; return;
QAPP_CHECK("setVisible"); QAPP_CHECK("setVisible");
d->visible = b; d->visible = b;
d->enabled = b && d->enabled && (!d->group || d->group->isEnabled()) ; d->enabled = b && (!d->group || d->group->isEnabled()) ;
#ifndef QT_NO_SHORTCUT #ifndef QT_NO_SHORTCUT
d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap); d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap);
#endif #endif

5
src/gui/kernel/qactiongroup.cpp
View file

@ -278,8 +278,7 @@ bool QActionGroup::isExclusive() const
\property QActionGroup::enabled \property QActionGroup::enabled
\brief whether the action group is enabled \brief whether the action group is enabled
Each action in the group will be enabled or disabled unless it Each action in the group will be enabled or disabled.
has been explicitly disabled.
\sa QAction::setEnabled() \sa QAction::setEnabled()
*/ */
@ -313,7 +312,7 @@ QAction *QActionGroup::checkedAction() const
\brief whether the action group is visible \brief whether the action group is visible
Each action in the action group will match the visible state of Each action in the action group will match the visible state of
this group unless it has been explicitly hidden. this group.
\sa QAction::setEnabled() \sa QAction::setEnabled()
*/ */