summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2014-10-09 14:10:04 +0200
committerShawn Rutledge <shawn.rutledge@digia.com>2014-10-10 13:52:40 +0200
commit0647f24c7ddd73b1c4e273a71497f852573b4911 (patch)
tree19034390cabcfe0eca9cc8dc58acb46918a148bb
parent74a20b77a67ec4d5a8be0f59302075d34151dc05 (diff)
QMenu: ensure that a menu item's icon can be removed dynamically
Task-number: QTBUG-41348 Change-Id: Iad3b7f000ebce51530f5e196868aefffad2e1eab Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/widgets/widgets/qmenu.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index f2aefe6ea9..0fd645a4d3 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -2980,6 +2980,8 @@ static void copyActionToPlatformItem(const QAction *action, QPlatformMenuItem* i
QStyleOption opt;
item->setIconSize(qApp->style()->pixelMetric(QStyle::PM_SmallIconSize, &opt, 0));
}
+ } else {
+ item->setIcon(QIcon());
}
item->setVisible(action->isVisible());
item->setShortcut(action->shortcut());