feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-04 17:34:08 +01:00
parent 5a31b0067d
commit ac54974b32
20 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/proxyaction.cpp
View File

@@ -174,6 +174,6 @@ void ProxyAction::updateToolTipWithKeySequence()
QString ProxyAction::stringWithAppendedShortcut(const QString &str, const QKeySequence &shortcut)
{
return QString("%1 <span style=\"color: gray; font-size: small\">%2</span>").arg(str).arg(
shortcut.toString(QKeySequence::NativeText));
return QString::fromLatin1("%1 <span style=\"color: gray; font-size: small\">%2</span>").
arg(str, shortcut.toString(QKeySequence::NativeText));
}