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

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
This commit is contained in:
Eike Ziller
2012-11-30 16:38:22 +01:00
parent 61c3de01a8 de4fd54c76
commit d719eebfdc
54 changed files with 15167 additions and 5902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/kit.cpp
View File

@@ -207,7 +207,11 @@ static QString candidateName(const QString &name, const QString &postfix)
{
if (name.contains(postfix))
return QString();
return name + QLatin1Char('-') + postfix;
QString candidate = name;
if (!candidate.isEmpty())
candidate.append(QLatin1Char('-'));
candidate.append(postfix);
return candidate;
}
void Kit::setDisplayName(const QString &name)
@@ -216,6 +220,7 @@ void Kit::setDisplayName(const QString &name)
QList<KitInformation *> kitInfo = km->kitInformation();
QStringList nameList;
nameList << QString(); // Disallow empty kit names!
foreach (Kit *k, km->kits()) {
if (k == this)
continue;