r20519 by craig -

[scribus-commit]

Author: craig
Date: Mon Nov  2 12:53:26 2015
New Revision: 20519

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20519
Log:
#13485: Better fix

Modified:
    trunk/Scribus/scribus/scraction.cpp

Modified: trunk/Scribus/scribus/scraction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20519&path=/trunk/Scribus/scribus/scraction.cpp
==============================================================================
--- trunk/Scribus/scribus/scraction.cpp	(original)
+++ trunk/Scribus/scribus/scraction.cpp	Mon Nov  2 12:53:26 2015
@@ -164,29 +164,20 @@
 
 void ScrAction::setToolTipFromTextAndShortcut()
 {
-	QString sct(shortcut().toString());
+	QString sct(shortcut().toString(QKeySequence::NativeText));
 	if (sct.isEmpty())
 		QAction::setToolTip("<qt>" + cleanMenuText() + "</qt>");
 	else
-	{
-		if (QSysInfo::productType()=="osx")
-			sct.replace("Ctrl","⌘");
 		QAction::setToolTip("<qt>" + cleanMenuText() + " (" + sct + ")" + "</qt>");
-	}
 }
 
 void ScrAction::setStatusTextAndShortcut(const QString& statusText)
 {
-	QString sct(shortcut().toString());
-	qDebug()<<sct;
+	QString sct(shortcut().toString(QKeySequence::NativeText));
 	if (sct.isEmpty())
 		QAction::setStatusTip(statusText);
 	else
-	{
-		if (QSysInfo::productType()=="osx")
-			sct.replace("Ctrl","⌘");
 		QAction::setStatusTip(statusText + " (" + sct + ")");
-	}
 }
 
 int ScrAction::getMenuIndex() const