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:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
This commit is contained in:
Eike Ziller
2012-09-26 10:01:04 +02:00
parent 996122b7e9 471f44aae3
commit a55d47544a
145 changed files with 4530 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/project.cpp
View File

@@ -153,13 +153,7 @@ void Project::addTarget(Target *t)
QTC_ASSERT(!target(t->kit()), return);
Q_ASSERT(t->project() == this);
// Check that we don't have a configuration with the same displayName
QString targetDisplayName = t->displayName();
QStringList displayNames;
foreach (const Target *target, d->m_targets)
displayNames << target->displayName();
targetDisplayName = makeUnique(targetDisplayName, displayNames);
t->setDefaultDisplayName(targetDisplayName);
t->setDefaultDisplayName(t->displayName());
// add it
d->m_targets.push_back(t);
@@ -243,9 +237,10 @@ Target *Project::target(Kit *k) const
return 0;
}
bool Project::supportsKit(Kit *k) const
bool Project::supportsKit(Kit *k, QString *errorMessage) const
{
Q_UNUSED(k);
Q_UNUSED(errorMessage);
return true;
}