From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 25 Nov 2017 18:00:06 +0000 Subject: copy 1.2 branch to trunk git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/shortcutitem.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/Ui/qsui/shortcutitem.cpp') diff --git a/src/plugins/Ui/qsui/shortcutitem.cpp b/src/plugins/Ui/qsui/shortcutitem.cpp index 8e3412e10..2502b8bd0 100644 --- a/src/plugins/Ui/qsui/shortcutitem.cpp +++ b/src/plugins/Ui/qsui/shortcutitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2015 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,7 +24,7 @@ ShortcutItem::ShortcutItem(QTreeWidgetItem *parent, int type) : QTreeWidgetItem(parent, QStringList() << ActionManager::instance()->action(type)->text().remove("&") - << ActionManager::instance()->action(type)->shortcut()) + << ActionManager::instance()->action(type)->shortcut().toString()) { m_action = ActionManager::instance()->action(type); setIcon(0, m_action->icon()); -- cgit v1.2.3-13-gbd6f