diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 11 | ||||
-rw-r--r-- | src/plugins/ios/iosbuildstep.cpp | 2 | ||||
-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 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 2 |
6 files changed, 1 insertions, 29 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 47c4eb61399..0d938eb0cab 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -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()); diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index 9e54b8086bc..dc192365720 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -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) diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 5a3cf226d2f..ea327fe303c 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 136d4db09a9..aa39a85e3d5 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 8d17f086fb3..6055dec43e7 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(); diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 38e076fc8d9..dbf1ed25691 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -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(); |