Mercurial > hg > svgui

diff widgets/KeyReference.cpp @ 640:c6d705bf1672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "qt5". This revision actually builds with Qt4 (late releases) or Qt5, though it will warn on configure with Qt4.
author Chris Cannam
date Tue, 14 May 2013 12:36:43 +0100
parents d632a1e87018
children dfe543438d52
line wrap: on
line diff
--- a/widgets/KeyReference.cpp	Tue Apr 16 15:17:33 2013 +0100
+++ b/widgets/KeyReference.cpp	Tue May 14 12:36:43 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);