History

Merge branch 'master' into tony/remove-joint-states

Anthony J. Thibault committed 10 years ago

Commit 11bfed42 parents 549a8f7 85b826618 files · +956 −90Browse files

Showing the changes to interface/src/Menu.cpp (1 of 18 files). Show all

Unified · Split

interface/src/Menu.cpp+1−0
@@ -944,6 +944,7 @@ void Menu::addMenuItem(const MenuItemProperties& properties) { · 943 unmodified lines
944 QShortcut* shortcut = NULL;944 QShortcut* shortcut = NULL;
945 if (!properties.shortcutKeySequence.isEmpty()) {945 if (!properties.shortcutKeySequence.isEmpty()) {
946 shortcut = new QShortcut(properties.shortcutKeySequence, this);946 shortcut = new QShortcut(properties.shortcutKeySequence, this);
947 shortcut->setContext(Qt::WidgetWithChildrenShortcut);
947 }948 }
948 949
949 // check for positioning requests950 // check for positioning requests