Mercurial > hg > svgui
diff widgets/KeyReference.cpp @ 663:1a0fdad4af4d tonioni
Merge from the default branch
author | Chris Cannam |
---|---|
date | Fri, 12 Jul 2013 13:25:22 +0100 |
parents | d632a1e87018 |
children | dfe543438d52 |
line wrap: on
line diff
--- a/widgets/KeyReference.cpp Thu Jun 20 13:47:36 2013 +0100 +++ b/widgets/KeyReference.cpp Fri Jul 12 13:25:22 2013 +0100 @@ -49,7 +49,7 @@ QString name = action->text(); if (overrideName != "") name = overrideName; - QString shortcut = action->shortcut(); + QString shortcut = action->shortcut().toString(); QString tip = action->statusTip(); registerShortcut(name, shortcut, tip);