summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-12-10 16:22:09 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-12-10 16:45:23 +0100
commit6198ba217f3a9b31d44375b26f3635f15fc01b3d (patch)
tree280c1d5f21abd67d1810e0ae7678771b0d446a4c /src/widgets
parent126c5c501a305ee43c5e51261421266f09ed3bb4 (diff)
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/widgets/qmenu_mac.mm2
1 files changed, 2 insertions, 0 deletions
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);