ProjectExplorer: Remove Task::buildConfigurationMissingTask()

It should not be possible to trigger the condition. Except for MakeStep
the function is only called from real BuildSteps, that always live in
a BuildConfiguration.

A MakeStep could live in a DeployConfiguration, but that belongs to
a Target. That target always has a BuildConfiguration in case the
project type requires one. So not having a BuildConfiguration can only
happen when the project type doesn't require one, but then the
situation is not an error that should be notified as a Task.

Change-Id: I2a5d90fdadd3916d3dae6a0fdc6e6ab2010a8111
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-02-20 18:13:48 +01:00
parent 8b563a63d4
commit 1714ecf809
6 changed files with 1 additions and 29 deletions

View File

@@ -131,15 +131,10 @@ bool CMakeBuildStep::fromMap(const QVariantMap &map)
return BuildStep::fromMap(map);
}
bool CMakeBuildStep::init()
{
bool canInit = true;
CMakeBuildConfiguration *bc = cmakeBuildConfiguration();
if (!bc) {
emit addTask(Task::buildConfigurationMissingTask());
canInit = false;
}
if (bc && !bc->isEnabled()) {
emit addTask(BuildSystemTask(Task::Error,
tr("CMakeProjectManager::CMakeBuildStep")));
@@ -528,12 +523,6 @@ QRadioButton *CMakeBuildStepConfigWidget::itemWidget(QListWidgetItem *item)
void CMakeBuildStepConfigWidget::updateDetails()
{
BuildConfiguration *bc = m_buildStep->buildConfiguration();
if (!bc) {
setSummaryText(tr("<b>No build configuration found on this kit.</b>"));
return;
}
ProcessParameters param;
param.setMacroExpander(m_buildStep->macroExpander());
param.setEnvironment(m_buildStep->buildEnvironment());

View File

@@ -175,8 +175,6 @@ IosBuildStep::IosBuildStep(BuildStepList *parent, Id id)
bool IosBuildStep::init()
{
BuildConfiguration *bc = buildConfiguration();
if (!bc)
emit addTask(Task::buildConfigurationMissingTask());
ToolChain *tc = ToolChainKitAspect::cxxToolChain(target()->kit());
if (!tc)

View File

@@ -81,15 +81,11 @@ void MakeStep::setAvailableBuildTargets(const QStringList &buildTargets)
bool MakeStep::init()
{
BuildConfiguration *bc = buildConfiguration();
if (!bc)
emit addTask(Task::buildConfigurationMissingTask());
const CommandLine make = effectiveMakeCommand(Execution);
if (make.executable().isEmpty())
emit addTask(makeCommandMissingTask());
if (!bc || make.executable().isEmpty()) {
if (make.executable().isEmpty()) {
emitFaultyConfigurationMessage();
return false;
}

View File

@@ -81,14 +81,6 @@ Task Task::compilerMissingTask()
.arg(Core::Constants::IDE_DISPLAY_NAME));
}
Task Task::buildConfigurationMissingTask()
{
return BuildSystemTask(Task::Error,
tr("%1 needs a build configuration set up to build. "
"Configure a build configuration in the project settings.")
.arg(Core::Constants::IDE_DISPLAY_NAME));
}
void Task::setMark(TextEditor::TextMark *mark)
{
QTC_ASSERT(mark, return);

View File

@@ -68,7 +68,6 @@ public:
Options options = AddTextMark | FlashWorthy);
static Task compilerMissingTask();
static Task buildConfigurationMissingTask();
bool isNull() const;
void clear();

View File

@@ -65,8 +65,6 @@ QmakeMakeStep::QmakeMakeStep(BuildStepList *bsl, Core::Id id)
bool QmakeMakeStep::init()
{
const auto bc = static_cast<QmakeBuildConfiguration *>(buildConfiguration());
if (!bc)
emit addTask(Task::buildConfigurationMissingTask());
const Utils::CommandLine unmodifiedMake = effectiveMakeCommand(Execution);
const Utils::FilePath makeExecutable = unmodifiedMake.executable();