summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2012-09-28 15:58:58 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-26 14:53:09 +0200
commit356f3c89b83704591e3c37cf8c322b52d6840763 (patch)
tree05b381f1d5c4086516fa42947ab7937b422fd34e /src/widgets
parenta3941c2f6ef31986bd315fa41bc4df7330a89109 (diff)
Fix syncing of visibility and enabled for menus on Cocoa
Fixed menu handling on Cocoa so if a menu is enabled/disabled or made visible or not then it will keep this in sync with the appropriate native menu entry. Change-Id: If269185fcf065fb1b2f60d6ef8c27c107eb4509f Reviewed-by: Pasi Matilainen <pasi.matilainen@digia.com> Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/widgets/qmenubar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp
index e53dc2cac2..f6665cba9a 100644
--- a/src/widgets/widgets/qmenubar.cpp
+++ b/src/widgets/widgets/qmenubar.cpp
@@ -1285,6 +1285,8 @@ void QMenuBar::actionEvent(QActionEvent *e)
}
} else if (menu) {
menu->setText(e->action()->text());
+ menu->setVisible(e->action()->isVisible());
+ menu->setEnabled(e->action()->isEnabled());
d->platformMenuBar->syncMenu(menu);
}
}