diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-projects-qbs.qdoc index 0bd3788ef07..18c63e7a16d 100644 --- a/doc/src/projects/creator-projects-qbs.qdoc +++ b/doc/src/projects/creator-projects-qbs.qdoc @@ -107,10 +107,6 @@ \list - \li Select \uicontrol {Dry run} to test building without - executing commands or making permanent - changes to the build graph. - \li Select \uicontrol {Keep going} to continue building when errors occur, if possible. diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 83ed54c0515..0e73925a5f6 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -223,7 +223,7 @@ public: bool dryRun() const { if (m_qbsBuildStep) - return m_qbsBuildStep->dryRun(); + return false; if (m_qbsCleanStep) return m_qbsCleanStep->dryRun(); return m_qbsInstallStep->dryRun(); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 84b9b539159..71f95943a5c 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -170,11 +170,6 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config) emit qbsConfigurationChanged(); } -bool QbsBuildStep::dryRun() const -{ - return m_qbsBuildOptions.dryRun(); -} - bool QbsBuildStep::keepGoing() const { return m_qbsBuildOptions.keepGoing(); @@ -353,14 +348,6 @@ QString QbsBuildStep::profile() const return qbsConfiguration().value(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY)).toString(); } -void QbsBuildStep::setDryRun(bool dr) -{ - if (m_qbsBuildOptions.dryRun() == dr) - return; - m_qbsBuildOptions.setDryRun(dr); - emit qbsBuildOptionsChanged(); -} - void QbsBuildStep::setKeepGoing(bool kg) { if (m_qbsBuildOptions.keepGoing() == kg) @@ -482,7 +469,6 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) : connect(m_ui->buildVariantComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(changeBuildVariant(int))); - connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool))); connect(m_ui->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool))); connect(m_ui->jobSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeJobCount(int))); connect(m_ui->showCommandLinesCheckBox, &QCheckBox::toggled, this, @@ -516,7 +502,6 @@ QString QbsBuildStepConfigWidget::displayName() const void QbsBuildStepConfigWidget::updateState() { if (!m_ignoreChange) { - m_ui->dryRunCheckBox->setChecked(m_step->dryRun()); m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing()); m_ui->jobSpinBox->setValue(m_step->maxJobs()); m_ui->showCommandLinesCheckBox->setChecked(m_step->showCommandLines()); @@ -593,13 +578,6 @@ void QbsBuildStepConfigWidget::changeBuildVariant(int idx) m_ignoreChange = false; } -void QbsBuildStepConfigWidget::changeDryRun(bool dr) -{ - m_ignoreChange = true; - m_step->setDryRun(dr); - m_ignoreChange = false; -} - void QbsBuildStepConfigWidget::changeShowCommandLines(bool show) { m_ignoreChange = true; diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index 3a14b8bbb19..c6f0b3f9597 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -62,7 +62,6 @@ public: QVariantMap qbsConfiguration() const; void setQbsConfiguration(const QVariantMap &config); - bool dryRun() const; bool keepGoing() const; bool showCommandLines() const; bool install() const; @@ -94,7 +93,6 @@ private: void setBuildVariant(const QString &variant); QString profile() const; - void setDryRun(bool dr); void setKeepGoing(bool kg); void setMaxJobs(int jobcount); void setShowCommandLines(bool show); @@ -142,7 +140,6 @@ private slots: void updatePropertyEdit(const QVariantMap &data); void changeBuildVariant(int); - void changeDryRun(bool dr); void changeShowCommandLines(bool show); void changeKeepGoing(bool kg); void changeJobCount(int count); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui index b6469bc539e..4a782753b3a 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui +++ b/src/plugins/qbsprojectmanager/qbsbuildstepconfigwidget.ui @@ -6,7 +6,7 @@ 0 0 - 723 + 730 247 @@ -153,16 +153,6 @@ - - - - No commands will be executed and no permanent changes to the build graph will be done. - - - Dry run - - -