diff --git a/src/project_manager/ros_colcon_step.cpp b/src/project_manager/ros_colcon_step.cpp index 568b69d5..75456132 100644 --- a/src/project_manager/ros_colcon_step.cpp +++ b/src/project_manager/ros_colcon_step.cpp @@ -51,7 +51,6 @@ const char ROS_COLCON_STEP_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("ROSProjectManager const char ROS_COLCON_STEP[] = "ROSProjectManager.ROSColconStep.Target"; const char ROS_COLCON_STEP_ARGUMENTS_KEY[] = "ROSProjectManager.ROSColconStep.ColconArguments"; const char ROS_COLCON_STEP_CMAKE_ARGUMENTS_KEY[] = "ROSProjectManager.ROSColconStep.CMakeArguments"; -const char ROS_COLCON_STEP_MAKE_ARGUMENTS_KEY[] = "ROSProjectManager.ROSColconStep.MakeArguments"; ROSColconStep::ROSColconStep(BuildStepList *parent, const Utils::Id id) : AbstractProcessStep(parent, id) @@ -147,7 +146,6 @@ void ROSColconStep::toMap(Utils::Store &map) const map.insert(ROS_COLCON_STEP, m_target); map.insert(ROS_COLCON_STEP_ARGUMENTS_KEY, m_colconArguments); map.insert(ROS_COLCON_STEP_CMAKE_ARGUMENTS_KEY, m_cmakeArguments); - map.insert(ROS_COLCON_STEP_MAKE_ARGUMENTS_KEY, m_makeArguments); } void ROSColconStep::fromMap(const Utils::Store &map) @@ -155,7 +153,6 @@ void ROSColconStep::fromMap(const Utils::Store &map) m_target = (BuildTargets)map.value(ROS_COLCON_STEP).toInt(); m_colconArguments = map.value(ROS_COLCON_STEP_ARGUMENTS_KEY).toString(); m_cmakeArguments = map.value(ROS_COLCON_STEP_CMAKE_ARGUMENTS_KEY).toString(); - m_makeArguments = map.value(ROS_COLCON_STEP_MAKE_ARGUMENTS_KEY).toString(); BuildStep::fromMap(map); } @@ -190,9 +187,6 @@ QString ROSColconStep::allArguments(ROSUtils::BuildType buildType, bool includeD break; } - if (!m_makeArguments.isEmpty()) - args << QString("--make-args %1").arg(m_makeArguments); - return args.join(" "); } @@ -250,7 +244,6 @@ ROSColconStepWidget::ROSColconStepWidget(ROSColconStep *makeStep) m_ui->colconArgumentsLineEdit->setText(m_makeStep->m_colconArguments); m_ui->cmakeArgumentsLineEdit->setText(m_makeStep->m_cmakeArguments); - m_ui->makeArgumentsLineEdit->setText(m_makeStep->m_makeArguments); updateDetails(); @@ -260,9 +253,6 @@ ROSColconStepWidget::ROSColconStepWidget(ROSColconStep *makeStep) connect(m_ui->cmakeArgumentsLineEdit, &QLineEdit::textEdited, this, &ROSColconStepWidget::updateDetails); - connect(m_ui->makeArgumentsLineEdit, &QLineEdit::textEdited, - this, &ROSColconStepWidget::updateDetails); - connect(m_makeStep, SIGNAL(enabledChanged()), this, SLOT(enabledChanged())); @@ -294,7 +284,6 @@ void ROSColconStepWidget::updateDetails() { m_makeStep->m_colconArguments = m_ui->colconArgumentsLineEdit->text(); m_makeStep->m_cmakeArguments = m_ui->cmakeArgumentsLineEdit->text(); - m_makeStep->m_makeArguments = m_ui->makeArgumentsLineEdit->text(); ROSBuildConfiguration *bc = m_makeStep->rosBuildConfiguration(); ROSUtils::WorkspaceInfo workspaceInfo = ROSUtils::getWorkspaceInfo(bc->project()->projectDirectory(), bc->rosBuildSystem(), bc->project()->distribution()); diff --git a/src/project_manager/ros_colcon_step.h b/src/project_manager/ros_colcon_step.h index cc02c336..e43b9e6b 100644 --- a/src/project_manager/ros_colcon_step.h +++ b/src/project_manager/ros_colcon_step.h @@ -74,7 +74,6 @@ class ROSColconStep : public ProjectExplorer::AbstractProcessStep BuildTargets m_target; QString m_colconArguments; QString m_cmakeArguments; - QString m_makeArguments; QRegularExpression m_percentProgress; }; diff --git a/src/project_manager/ros_colcon_step.ui b/src/project_manager/ros_colcon_step.ui index 5872fb47..f7a9ba2f 100644 --- a/src/project_manager/ros_colcon_step.ui +++ b/src/project_manager/ros_colcon_step.ui @@ -7,12 +7,12 @@ 0 0 545 - 105 + 79 - QFormLayout::ExpandingFieldsGrow + QFormLayout::FieldGrowthPolicy::ExpandingFieldsGrow 9 @@ -53,22 +53,6 @@ - - - - - 0 - 0 - - - - Make Arguments: - - - - - -