macOS: Show icons for device types in menu

When selecting a device icon for a kit, we should show the actual icons
in the menu even on macOS, even though icons in menus is not customary
there.

Task-number: QTCREATORBUG-25443
Change-Id: If0aed679b9cd3b1645bd423af70059730a522f05
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Eike Ziller
2021-04-06 14:46:44 +02:00
parent 350d1cd090
commit c0f1cd8e53

View File

@@ -307,12 +307,15 @@ void KitManagerConfigWidget::setIcon()
for (const IDeviceFactory * const factory : qAsConst(allDeviceFactories)) { for (const IDeviceFactory * const factory : qAsConst(allDeviceFactories)) {
if (factory->icon().isNull()) if (factory->icon().isNull())
continue; continue;
iconMenu.addAction(factory->icon(), tr("Default for %1").arg(factory->displayName()), QAction *action = iconMenu.addAction(factory->icon(),
[this, factory] { tr("Default for %1").arg(factory->displayName()),
m_iconButton->setIcon(factory->icon()); [this, factory] {
m_modifiedKit->setDeviceTypeForIcon(factory->deviceType()); m_iconButton->setIcon(factory->icon());
emit dirty(); m_modifiedKit->setDeviceTypeForIcon(
}); factory->deviceType());
emit dirty();
});
action->setIconVisibleInMenu(true);
} }
iconMenu.addSeparator(); iconMenu.addSeparator();
iconMenu.addAction(Utils::PathChooser::browseButtonLabel(), [this] { iconMenu.addAction(Utils::PathChooser::browseButtonLabel(), [this] {