diff options
author | hjk <hjk@qt.io> | 2020-02-20 18:13:48 +0100 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-02-21 11:11:18 +0000 |
commit | 1714ecf8092533eaba196212d4f0feb581449ecf (patch) | |
tree | ddb46e5f7b350cae39f4ba3c0a9bd00e57093e8e /src/plugins/projectexplorer | |
parent | 8b563a63d47b3b09008c28d024ce5c14db954726 (diff) |
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>
Diffstat (limited to 'src/plugins/projectexplorer')
-rw-r--r-- | src/plugins/projectexplorer/makestep.cpp | 6 | ||||
-rw-r--r-- | src/plugins/projectexplorer/task.cpp | 8 | ||||
-rw-r--r-- | src/plugins/projectexplorer/task.h | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 5a3cf226d2..ea327fe303 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -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; } diff --git a/src/plugins/projectexplorer/task.cpp b/src/plugins/projectexplorer/task.cpp index 136d4db09a..aa39a85e3d 100644 --- a/src/plugins/projectexplorer/task.cpp +++ b/src/plugins/projectexplorer/task.cpp @@ -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); diff --git a/src/plugins/projectexplorer/task.h b/src/plugins/projectexplorer/task.h index 8d17f086fb..6055dec43e 100644 --- a/src/plugins/projectexplorer/task.h +++ b/src/plugins/projectexplorer/task.h @@ -68,7 +68,6 @@ public: Options options = AddTextMark | FlashWorthy); static Task compilerMissingTask(); - static Task buildConfigurationMissingTask(); bool isNull() const; void clear(); |