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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
This commit is contained in:
Eike Ziller
2012-03-15 15:01:54 +01:00
parent c0e50601ac 10cdeb8748
commit e5e3f91ed2
67 changed files with 283 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
View File

@@ -212,7 +212,7 @@ QModelIndex DataModel::indexForObject(const Function *function) const
static QString noWrap(const QString &str)
{
QString escapedStr = str;
return escapedStr.replace("-", "‑");
return escapedStr.replace(QLatin1Char('-'), "‑");
}
QVariant DataModel::data(const QModelIndex &index, int role) const