From 6198ba217f3a9b31d44375b26f3635f15fc01b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 10 Dec 2020 16:22:09 +0100 Subject: macOS: Disable WA_QuitOnClose on menu item widget container Otherwise it will prevent quitting of the application when the last window is closed, on account of (seemingly) being a top level window. Pick-to: 5.15 6.0 Change-Id: Ib79615dd1e9394c96d39c8f9851005b4c073c165 Reviewed-by: Alexandru Croitor --- src/widgets/widgets/qmenu_mac.mm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/widgets') diff --git a/src/widgets/widgets/qmenu_mac.mm b/src/widgets/widgets/qmenu_mac.mm index d6e09d9512..a367cba8bb 100644 --- a/src/widgets/widgets/qmenu_mac.mm +++ b/src/widgets/widgets/qmenu_mac.mm @@ -114,7 +114,9 @@ void QMenu::setAsDockMenu() void QMenuPrivate::moveWidgetToPlatformItem(QWidget *widget, QPlatformMenuItem* item) { auto *container = new QWidget; + container->setObjectName("MenuItemWidgetContainer"); container->setAttribute(Qt::WA_TranslucentBackground); + container->setAttribute(Qt::WA_QuitOnClose, false); QObject::connect(platformMenu, SIGNAL(destroyed()), container, SLOT(deleteLater())); container->resize(widget->sizeHint()); widget->setParent(container); -- cgit v1.2.3