forked from qt-creator/qt-creator
Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration. Some further tweaks are probably necessary. This is a rather big change, though it should work. :)
This commit is contained in:
@@ -29,7 +29,6 @@
|
||||
|
||||
#include "qmlproject.h"
|
||||
#include "qmlprojectconstants.h"
|
||||
#include "qmlmakestep.h"
|
||||
|
||||
#include <projectexplorer/toolchain.h>
|
||||
#include <projectexplorer/persistentsettings.h>
|
||||
@@ -242,15 +241,6 @@ QStringList QmlProject::targets() const
|
||||
return targets;
|
||||
}
|
||||
|
||||
QmlMakeStep *QmlProject::makeStep() const
|
||||
{
|
||||
foreach (ProjectExplorer::BuildStep *bs, buildSteps()) {
|
||||
if (QmlMakeStep *ms = qobject_cast<QmlMakeStep *>(bs))
|
||||
return ms;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
bool QmlProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &reader)
|
||||
{
|
||||
Project::restoreSettingsImpl(reader);
|
||||
@@ -260,11 +250,6 @@ bool QmlProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader &
|
||||
addRunConfiguration(runConf);
|
||||
}
|
||||
|
||||
if (buildSteps().isEmpty()) {
|
||||
QmlMakeStep *makeStep = new QmlMakeStep(this);
|
||||
insertBuildStep(0, makeStep);
|
||||
}
|
||||
|
||||
refresh(Everything);
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user