Mercurial > hg > svgui
comparison 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 |
comparison
equal
deleted
inserted
replaced
660:8663a831838f | 663:1a0fdad4af4d |
---|---|
47 KeyReference::registerShortcut(QAction *action, QString overrideName) | 47 KeyReference::registerShortcut(QAction *action, QString overrideName) |
48 { | 48 { |
49 QString name = action->text(); | 49 QString name = action->text(); |
50 if (overrideName != "") name = overrideName; | 50 if (overrideName != "") name = overrideName; |
51 | 51 |
52 QString shortcut = action->shortcut(); | 52 QString shortcut = action->shortcut().toString(); |
53 QString tip = action->statusTip(); | 53 QString tip = action->statusTip(); |
54 | 54 |
55 registerShortcut(name, shortcut, tip); | 55 registerShortcut(name, shortcut, tip); |
56 } | 56 } |
57 | 57 |