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

CMakeProjectManager: Use factories to create runconfig

Browse Source 
At the moment RC factories are ignored when creating
runconfigurations or updating them. This patch changes
the behavior so the RCs are first created/removed and
then updated to match the build targets. This way plugins
can provide custom factories and RCs for cmake projects.

Change-Id: I4a7797e7382784e33ecf016e322eab00e20c07e0
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Benjamin Zeller
2015-08-31 14:11:31 +02:00
parent 00320f5127
commit 4ffb6649ec
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -646,16 +646,14 @@ void CMakeProject::updateRunConfigurations()
// TODO Compare with updateDefaultRunConfigurations(); // TODO Compare with updateDefaultRunConfigurations();
void CMakeProject::updateRunConfigurations(Target *t) void CMakeProject::updateRunConfigurations(Target *t)
{ {
// create new and remove obsolete RCs using the factories
t->updateDefaultRunConfigurations();
// *Update* runconfigurations: // *Update* runconfigurations:
QMultiMap<QString, CMakeRunConfiguration*> existingRunConfigurations; QMultiMap<QString, CMakeRunConfiguration*> existingRunConfigurations;
QList<ProjectExplorer::RunConfiguration *> toRemove;
foreach (ProjectExplorer::RunConfiguration *rc, t->runConfigurations()) { foreach (ProjectExplorer::RunConfiguration *rc, t->runConfigurations()) {
if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc)) if (CMakeRunConfiguration* cmakeRC = qobject_cast<CMakeRunConfiguration *>(rc))
existingRunConfigurations.insert(cmakeRC->title(), cmakeRC); existingRunConfigurations.insert(cmakeRC->title(), cmakeRC);
QtSupport::CustomExecutableRunConfiguration *ceRC =
qobject_cast<QtSupport::CustomExecutableRunConfiguration *>(rc);
if (ceRC && !ceRC->isConfigured())
toRemove << rc;
} }
foreach (const CMakeBuildTarget &ct, buildTargets()) { foreach (const CMakeBuildTarget &ct, buildTargets()) {
@@ -671,27 +669,8 @@ void CMakeProject::updateRunConfigurations(Target *t)
rc->setBaseWorkingDirectory(ct.workingDirectory); rc->setBaseWorkingDirectory(ct.workingDirectory);
rc->setEnabled(true); rc->setEnabled(true);
} }
existingRunConfigurations.remove(ct.title);
} else {
// Does not exist yet
Core::Id id = CMakeRunConfigurationFactory::idFromBuildTarget(ct.title);
CMakeRunConfiguration *rc = new CMakeRunConfiguration(t, id, ct.executable,
ct.workingDirectory, ct.title);
t->addRunConfiguration(rc);
} }
} }
QMultiMap<QString, CMakeRunConfiguration *>::const_iterator it =
existingRunConfigurations.constBegin();
for ( ; it != existingRunConfigurations.constEnd(); ++it) {
CMakeRunConfiguration *rc = it.value();
// The executables for those runconfigurations aren't build by the current buildconfiguration
// We just set a disable flag and show that in the display name
rc->setEnabled(false);
// removeRunConfiguration(rc);
}
foreach (ProjectExplorer::RunConfiguration *rc, toRemove)
t->removeRunConfiguration(rc);
if (t->runConfigurations().isEmpty()) { if (t->runConfigurations().isEmpty()) {
// Oh no, no run configuration, // Oh no, no run configuration,