QbsProjectManager: Remove "dry run" build option.

The way this option works is not IDE-compatible, since the build process
changes the build graph and relies on the changes being transient simply
by not storing the build graph afterwards. This is fine for the command-
line tool, but Qt Creator keeps the build graph open and subsequent
"real" builds will finish immediately even when nothing has actually
been built yet.
Perhaps it would be possible to do the implementation differently, but
having the "dry run" option in Qt Creator is not valuable enough to
justify that effort.

Change-Id: Ic99ddef63555f6029c5857d2cfd8dc48d8a72914
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2016-01-22 11:56:23 +01:00
parent e3a3792fd6
commit 47b8ee09e2
5 changed files with 2 additions and 41 deletions

View File

@@ -107,10 +107,6 @@
\list \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 \li Select \uicontrol {Keep going} to continue building when
errors occur, if possible. errors occur, if possible.

View File

@@ -223,7 +223,7 @@ public:
bool dryRun() const { bool dryRun() const {
if (m_qbsBuildStep) if (m_qbsBuildStep)
return m_qbsBuildStep->dryRun(); return false;
if (m_qbsCleanStep) if (m_qbsCleanStep)
return m_qbsCleanStep->dryRun(); return m_qbsCleanStep->dryRun();
return m_qbsInstallStep->dryRun(); return m_qbsInstallStep->dryRun();

View File

@@ -170,11 +170,6 @@ void QbsBuildStep::setQbsConfiguration(const QVariantMap &config)
emit qbsConfigurationChanged(); emit qbsConfigurationChanged();
} }
bool QbsBuildStep::dryRun() const
{
return m_qbsBuildOptions.dryRun();
}
bool QbsBuildStep::keepGoing() const bool QbsBuildStep::keepGoing() const
{ {
return m_qbsBuildOptions.keepGoing(); return m_qbsBuildOptions.keepGoing();
@@ -353,14 +348,6 @@ QString QbsBuildStep::profile() const
return qbsConfiguration().value(QLatin1String(Constants::QBS_CONFIG_PROFILE_KEY)).toString(); 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) void QbsBuildStep::setKeepGoing(bool kg)
{ {
if (m_qbsBuildOptions.keepGoing() == kg) if (m_qbsBuildOptions.keepGoing() == kg)
@@ -482,7 +469,6 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
connect(m_ui->buildVariantComboBox, SIGNAL(currentIndexChanged(int)), connect(m_ui->buildVariantComboBox, SIGNAL(currentIndexChanged(int)),
this, SLOT(changeBuildVariant(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->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool)));
connect(m_ui->jobSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeJobCount(int))); connect(m_ui->jobSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changeJobCount(int)));
connect(m_ui->showCommandLinesCheckBox, &QCheckBox::toggled, this, connect(m_ui->showCommandLinesCheckBox, &QCheckBox::toggled, this,
@@ -516,7 +502,6 @@ QString QbsBuildStepConfigWidget::displayName() const
void QbsBuildStepConfigWidget::updateState() void QbsBuildStepConfigWidget::updateState()
{ {
if (!m_ignoreChange) { if (!m_ignoreChange) {
m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing()); m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing());
m_ui->jobSpinBox->setValue(m_step->maxJobs()); m_ui->jobSpinBox->setValue(m_step->maxJobs());
m_ui->showCommandLinesCheckBox->setChecked(m_step->showCommandLines()); m_ui->showCommandLinesCheckBox->setChecked(m_step->showCommandLines());
@@ -593,13 +578,6 @@ void QbsBuildStepConfigWidget::changeBuildVariant(int idx)
m_ignoreChange = false; m_ignoreChange = false;
} }
void QbsBuildStepConfigWidget::changeDryRun(bool dr)
{
m_ignoreChange = true;
m_step->setDryRun(dr);
m_ignoreChange = false;
}
void QbsBuildStepConfigWidget::changeShowCommandLines(bool show) void QbsBuildStepConfigWidget::changeShowCommandLines(bool show)
{ {
m_ignoreChange = true; m_ignoreChange = true;

View File

@@ -62,7 +62,6 @@ public:
QVariantMap qbsConfiguration() const; QVariantMap qbsConfiguration() const;
void setQbsConfiguration(const QVariantMap &config); void setQbsConfiguration(const QVariantMap &config);
bool dryRun() const;
bool keepGoing() const; bool keepGoing() const;
bool showCommandLines() const; bool showCommandLines() const;
bool install() const; bool install() const;
@@ -94,7 +93,6 @@ private:
void setBuildVariant(const QString &variant); void setBuildVariant(const QString &variant);
QString profile() const; QString profile() const;
void setDryRun(bool dr);
void setKeepGoing(bool kg); void setKeepGoing(bool kg);
void setMaxJobs(int jobcount); void setMaxJobs(int jobcount);
void setShowCommandLines(bool show); void setShowCommandLines(bool show);
@@ -142,7 +140,6 @@ private slots:
void updatePropertyEdit(const QVariantMap &data); void updatePropertyEdit(const QVariantMap &data);
void changeBuildVariant(int); void changeBuildVariant(int);
void changeDryRun(bool dr);
void changeShowCommandLines(bool show); void changeShowCommandLines(bool show);
void changeKeepGoing(bool kg); void changeKeepGoing(bool kg);
void changeJobCount(int count); void changeJobCount(int count);

View File

@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>723</width> <width>730</width>
<height>247</height> <height>247</height>
</rect> </rect>
</property> </property>
@@ -153,16 +153,6 @@
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="dryRunCheckBox">
<property name="toolTip">
<string>No commands will be executed and no permanent changes to the build graph will be done.</string>
</property>
<property name="text">
<string>Dry run</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="keepGoingCheckBox"> <widget class="QCheckBox" name="keepGoingCheckBox">
<property name="toolTip"> <property name="toolTip">