From 1e91ad56bc8795cd2aa99ec1c016f491d2d6e37e Mon Sep 17 00:00:00 2001 From: Benjamin Nauck Date: Wed, 18 Dec 2024 16:16:15 +0100 Subject: [PATCH] Move where icons in menus attribute is set Without this, icons are not visible on macOS --- src/Gui/Application.cpp | 4 ++++ src/Gui/StartupProcess.cpp | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 17da60bd30..dec82e9aa0 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -2283,6 +2283,10 @@ void Application::runApplication() MainWindow mw; mw.setProperty("QuitOnClosed", true); + // https://forum.freecad.org/viewtopic.php?f=3&t=15540 + // Needs to be set after app is created to override platform defaults (qt commit a2aa1f81a81) + QApplication::setAttribute(Qt::AA_DontShowIconsInMenus, false); + #ifdef FC_DEBUG // redirect Coin messages to FreeCAD SoDebugError::setHandlerCallback(messageHandlerCoin, 0); #endif diff --git a/src/Gui/StartupProcess.cpp b/src/Gui/StartupProcess.cpp index a8658e7450..0e1a011209 100644 --- a/src/Gui/StartupProcess.cpp +++ b/src/Gui/StartupProcess.cpp @@ -107,8 +107,6 @@ void StartupProcess::setupApplication() // compression for tablet events here to solve that. QCoreApplication::setAttribute(Qt::AA_CompressTabletEvents); #endif - // https://forum.freecad.org/viewtopic.php?f=3&t=15540 - QApplication::setAttribute(Qt::AA_DontShowIconsInMenus, false); } void StartupProcess::execute()