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

6
src/libs/utils/savedaction.cpp
View File

@@ -193,7 +193,7 @@ QString SavedAction::toString() const
return QLatin1String("value: ") + m_value.toString()
+ QLatin1String(" defaultvalue: ") + m_defaultValue.toString()
+ QLatin1String(" settingskey: ") + m_settingsGroup
+ '/' + m_settingsKey;
+ QLatin1Char('/') + m_settingsKey;
}
/*!
@@ -219,8 +219,8 @@ QAction *SavedAction::updatedAction(const QString &text0)
if (!m_textPattern.isEmpty()) {
if (text.isEmpty()) {
text = m_textPattern;
text.remove("\"%1\"");
text.remove("%1");
text.remove(QLatin1String("\"%1\""));
text.remove(QLatin1String("%1"));
enabled = false;
} else {
text = m_textPattern.arg(text0);