Commit 5cc37491 authored by Christian Kandeler's avatar Christian Kandeler

QbsProjectManager: Do not expose the "check timestamps" option.

The functionality it offers is not essential, and it has side-effects
that can lead to bugs if users turn it on for no particular reason.

Change-Id: Iaed660c649de46e7f81d3a1c3311693ed0820d50
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 62da66a0
...@@ -114,12 +114,6 @@ ...@@ -114,12 +114,6 @@
\li Select \gui {Keep going} to continue building when \li Select \gui {Keep going} to continue building when
errors occur, if possible. errors occur, if possible.
\li Select \gui {Check timestamps} to retrieve the
timestamps from the file system instead of using the
ones stored in the build graph. You only need this
option if you made changes to the build directory
manually, which is not recommended.
\endlist \endlist
\endlist \endlist
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
static const char QBS_CONFIG[] = "Qbs.Configuration"; static const char QBS_CONFIG[] = "Qbs.Configuration";
static const char QBS_DRY_RUN[] = "Qbs.DryRun"; static const char QBS_DRY_RUN[] = "Qbs.DryRun";
static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing"; static const char QBS_KEEP_GOING[] = "Qbs.DryKeepGoing";
static const char QBS_CHECK_TIMESTAMPS[] = "Qbs.CheckTimestamps";
static const char QBS_MAXJOBCOUNT[] = "Qbs.MaxJobs"; static const char QBS_MAXJOBCOUNT[] = "Qbs.MaxJobs";
// -------------------------------------------------------------------- // --------------------------------------------------------------------
...@@ -71,7 +70,6 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) : ...@@ -71,7 +70,6 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) :
{ {
setDisplayName(tr("Qbs Build")); setDisplayName(tr("Qbs Build"));
setQbsConfiguration(QVariantMap()); setQbsConfiguration(QVariantMap());
m_qbsBuildOptions.setForceTimestampCheck(true);
} }
QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildStep *other) : QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildStep *other) :
...@@ -182,11 +180,6 @@ bool QbsBuildStep::keepGoing() const ...@@ -182,11 +180,6 @@ bool QbsBuildStep::keepGoing() const
return m_qbsBuildOptions.keepGoing(); return m_qbsBuildOptions.keepGoing();
} }
bool QbsBuildStep::checkTimestamps() const
{
return m_qbsBuildOptions.forceTimestampCheck();
}
int QbsBuildStep::maxJobs() const int QbsBuildStep::maxJobs() const
{ {
if (m_qbsBuildOptions.maxJobCount() > 0) if (m_qbsBuildOptions.maxJobCount() > 0)
...@@ -202,7 +195,6 @@ bool QbsBuildStep::fromMap(const QVariantMap &map) ...@@ -202,7 +195,6 @@ bool QbsBuildStep::fromMap(const QVariantMap &map)
setQbsConfiguration(map.value(QLatin1String(QBS_CONFIG)).toMap()); setQbsConfiguration(map.value(QLatin1String(QBS_CONFIG)).toMap());
m_qbsBuildOptions.setDryRun(map.value(QLatin1String(QBS_DRY_RUN)).toBool()); m_qbsBuildOptions.setDryRun(map.value(QLatin1String(QBS_DRY_RUN)).toBool());
m_qbsBuildOptions.setKeepGoing(map.value(QLatin1String(QBS_KEEP_GOING)).toBool()); m_qbsBuildOptions.setKeepGoing(map.value(QLatin1String(QBS_KEEP_GOING)).toBool());
m_qbsBuildOptions.setForceTimestampCheck(map.value(QLatin1String(QBS_CHECK_TIMESTAMPS)).toBool());
m_qbsBuildOptions.setMaxJobCount(map.value(QLatin1String(QBS_MAXJOBCOUNT)).toInt()); m_qbsBuildOptions.setMaxJobCount(map.value(QLatin1String(QBS_MAXJOBCOUNT)).toInt());
return true; return true;
} }
...@@ -213,7 +205,6 @@ QVariantMap QbsBuildStep::toMap() const ...@@ -213,7 +205,6 @@ QVariantMap QbsBuildStep::toMap() const
map.insert(QLatin1String(QBS_CONFIG), m_qbsConfiguration); map.insert(QLatin1String(QBS_CONFIG), m_qbsConfiguration);
map.insert(QLatin1String(QBS_DRY_RUN), m_qbsBuildOptions.dryRun()); map.insert(QLatin1String(QBS_DRY_RUN), m_qbsBuildOptions.dryRun());
map.insert(QLatin1String(QBS_KEEP_GOING), m_qbsBuildOptions.keepGoing()); map.insert(QLatin1String(QBS_KEEP_GOING), m_qbsBuildOptions.keepGoing());
map.insert(QLatin1String(QBS_CHECK_TIMESTAMPS), m_qbsBuildOptions.forceTimestampCheck());
map.insert(QLatin1String(QBS_MAXJOBCOUNT), m_qbsBuildOptions.maxJobCount()); map.insert(QLatin1String(QBS_MAXJOBCOUNT), m_qbsBuildOptions.maxJobCount());
return map; return map;
} }
...@@ -351,14 +342,6 @@ void QbsBuildStep::setKeepGoing(bool kg) ...@@ -351,14 +342,6 @@ void QbsBuildStep::setKeepGoing(bool kg)
emit qbsBuildOptionsChanged(); emit qbsBuildOptionsChanged();
} }
void QbsBuildStep::setCheckTimestamps(bool ts)
{
if (m_qbsBuildOptions.forceTimestampCheck() == ts)
return;
m_qbsBuildOptions.setForceTimestampCheck(ts);
emit qbsBuildOptionsChanged();
}
void QbsBuildStep::setMaxJobs(int jobcount) void QbsBuildStep::setMaxJobs(int jobcount)
{ {
if (m_qbsBuildOptions.maxJobCount() == jobcount) if (m_qbsBuildOptions.maxJobCount() == jobcount)
...@@ -441,8 +424,6 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) : ...@@ -441,8 +424,6 @@ QbsBuildStepConfigWidget::QbsBuildStepConfigWidget(QbsBuildStep *step) :
this, SLOT(changeBuildVariant(int))); this, SLOT(changeBuildVariant(int)));
connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool))); 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->checkTimestampCheckBox, SIGNAL(toggled(bool)),
this, SLOT(changeCheckTimestamps(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->propertyEdit, SIGNAL(propertiesChanged()), this, SLOT(changeProperties())); connect(m_ui->propertyEdit, SIGNAL(propertiesChanged()), this, SLOT(changeProperties()));
connect(m_ui->qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)), connect(m_ui->qmlDebuggingLibraryCheckBox, SIGNAL(toggled(bool)),
...@@ -467,7 +448,6 @@ void QbsBuildStepConfigWidget::updateState() ...@@ -467,7 +448,6 @@ void QbsBuildStepConfigWidget::updateState()
if (!m_ignoreChange) { if (!m_ignoreChange) {
m_ui->dryRunCheckBox->setChecked(m_step->dryRun()); m_ui->dryRunCheckBox->setChecked(m_step->dryRun());
m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing()); m_ui->keepGoingCheckBox->setChecked(m_step->keepGoing());
m_ui->checkTimestampCheckBox->setChecked(m_step->checkTimestamps());
m_ui->jobSpinBox->setValue(m_step->maxJobs()); m_ui->jobSpinBox->setValue(m_step->maxJobs());
updatePropertyEdit(m_step->qbsConfiguration()); updatePropertyEdit(m_step->qbsConfiguration());
m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->isQmlDebuggingEnabled()); m_ui->qmlDebuggingLibraryCheckBox->setChecked(m_step->isQmlDebuggingEnabled());
...@@ -486,8 +466,6 @@ void QbsBuildStepConfigWidget::updateState() ...@@ -486,8 +466,6 @@ void QbsBuildStepConfigWidget::updateState()
command += QLatin1String("--dry-run "); command += QLatin1String("--dry-run ");
if (m_step->keepGoing()) if (m_step->keepGoing())
command += QLatin1String("--keep-going "); command += QLatin1String("--keep-going ");
if (m_step->checkTimestamps())
command += QLatin1String("--check-timestamps ");
command += QString::fromLatin1("--jobs %1 ").arg(m_step->maxJobs()); command += QString::fromLatin1("--jobs %1 ").arg(m_step->maxJobs());
command += QString::fromLatin1("%1 profile:%2").arg(buildVariant, m_step->profile()); command += QString::fromLatin1("%1 profile:%2").arg(buildVariant, m_step->profile());
...@@ -566,13 +544,6 @@ void QbsBuildStepConfigWidget::changeKeepGoing(bool kg) ...@@ -566,13 +544,6 @@ void QbsBuildStepConfigWidget::changeKeepGoing(bool kg)
m_ignoreChange = false; m_ignoreChange = false;
} }
void QbsBuildStepConfigWidget::changeCheckTimestamps(bool ts)
{
m_ignoreChange = true;
m_step->setCheckTimestamps(ts);
m_ignoreChange = false;
}
void QbsBuildStepConfigWidget::changeJobCount(int count) void QbsBuildStepConfigWidget::changeJobCount(int count)
{ {
m_ignoreChange = true; m_ignoreChange = true;
......
...@@ -66,7 +66,6 @@ public: ...@@ -66,7 +66,6 @@ public:
bool dryRun() const; bool dryRun() const;
bool keepGoing() const; bool keepGoing() const;
bool checkTimestamps() const;
int maxJobs() const; int maxJobs() const;
QString buildVariant() const; QString buildVariant() const;
...@@ -96,7 +95,6 @@ private: ...@@ -96,7 +95,6 @@ private:
void setDryRun(bool dr); void setDryRun(bool dr);
void setKeepGoing(bool kg); void setKeepGoing(bool kg);
void setCheckTimestamps(bool ts);
void setMaxJobs(int jobcount); void setMaxJobs(int jobcount);
void parseProject(); void parseProject();
...@@ -141,7 +139,6 @@ private slots: ...@@ -141,7 +139,6 @@ private slots:
void changeBuildVariant(int); void changeBuildVariant(int);
void changeDryRun(bool dr); void changeDryRun(bool dr);
void changeKeepGoing(bool kg); void changeKeepGoing(bool kg);
void changeCheckTimestamps(bool ts);
void changeJobCount(int count); void changeJobCount(int count);
void changeProperties(); void changeProperties();
......
...@@ -180,16 +180,6 @@ ...@@ -180,16 +180,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="checkTimestampCheckBox">
<property name="toolTip">
<string>Instead of using the file timestamps that are stored in the build graph, retrieve the timestamps from the file system.</string>
</property>
<property name="text">
<string>Check timestamps</string>
</property>
</widget>
</item>
<item> <item>
<spacer name="checkBoxSpacer"> <spacer name="checkBoxSpacer">
<property name="orientation"> <property name="orientation">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment