forked from qt-creator/qt-creator
ProjectExplorer: Use a data member for BuildStep::runInGuiThread
Change-Id: Ia219fcf595c05c6f1b82f420454bd906c6870ee7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -127,6 +127,8 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl) :
|
||||
{
|
||||
setDisplayName(tr("Qbs Build"));
|
||||
setQbsConfiguration(QVariantMap());
|
||||
setRunInGuiThread(true);
|
||||
|
||||
// setQbsConfiguration(other->qbsConfiguration(PreserveVariables));
|
||||
}
|
||||
|
||||
@@ -184,11 +186,6 @@ ProjectExplorer::BuildStepConfigWidget *QbsBuildStep::createConfigWidget()
|
||||
return new QbsBuildStepConfigWidget(this);
|
||||
}
|
||||
|
||||
bool QbsBuildStep::runInGuiThread() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void QbsBuildStep::cancel()
|
||||
{
|
||||
if (m_parsingProject)
|
||||
|
||||
@@ -64,7 +64,6 @@ public:
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
bool runInGuiThread() const override;
|
||||
void cancel() override;
|
||||
|
||||
QVariantMap qbsConfiguration(VariableHandling variableHandling) const;
|
||||
|
||||
@@ -52,6 +52,7 @@ QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl) :
|
||||
ProjectExplorer::BuildStep(bsl, Constants::QBS_CLEANSTEP_ID)
|
||||
{
|
||||
setDisplayName(tr("Qbs Clean"));
|
||||
setRunInGuiThread(true);
|
||||
}
|
||||
|
||||
QbsCleanStep::~QbsCleanStep()
|
||||
@@ -107,11 +108,6 @@ ProjectExplorer::BuildStepConfigWidget *QbsCleanStep::createConfigWidget()
|
||||
return new QbsCleanStepConfigWidget(this);
|
||||
}
|
||||
|
||||
bool QbsCleanStep::runInGuiThread() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void QbsCleanStep::cancel()
|
||||
{
|
||||
if (m_job)
|
||||
|
||||
@@ -51,7 +51,6 @@ public:
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
bool runInGuiThread() const override;
|
||||
void cancel() override;
|
||||
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
|
||||
@@ -61,6 +61,7 @@ QbsInstallStep::QbsInstallStep(ProjectExplorer::BuildStepList *bsl) :
|
||||
ProjectExplorer::BuildStep(bsl, Constants::QBS_INSTALLSTEP_ID)
|
||||
{
|
||||
setDisplayName(tr("Qbs Install"));
|
||||
setRunInGuiThread(true);
|
||||
|
||||
const QbsBuildConfiguration * const bc = buildConfig();
|
||||
connect(bc, &QbsBuildConfiguration::qbsConfigurationChanged,
|
||||
@@ -112,11 +113,6 @@ ProjectExplorer::BuildStepConfigWidget *QbsInstallStep::createConfigWidget()
|
||||
return new QbsInstallStepConfigWidget(this);
|
||||
}
|
||||
|
||||
bool QbsInstallStep::runInGuiThread() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
void QbsInstallStep::cancel()
|
||||
{
|
||||
if (m_job)
|
||||
|
||||
@@ -51,7 +51,6 @@ public:
|
||||
|
||||
ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
|
||||
|
||||
bool runInGuiThread() const override;
|
||||
void cancel() override;
|
||||
|
||||
bool fromMap(const QVariantMap &map) override;
|
||||
|
||||
Reference in New Issue
Block a user