Android/Qmake: Execute clean on architecture changes

Change-Id: Id0e1465e7ec7f6675cbf9d986352e811e6d31bec
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
BogDan Vatra
2019-11-20 15:50:42 +01:00
committed by Alessandro Portale
parent 35321d82e4
commit 7e8e6bcba1

View File

@@ -600,7 +600,17 @@ QMakeStepConfigWidget::QMakeStepConfigWidget(QMakeStep *step)
connect(step->qmakeBuildConfiguration(), &QmakeBuildConfiguration::qmakeBuildConfigurationChanged, connect(step->qmakeBuildConfiguration(), &QmakeBuildConfiguration::qmakeBuildConfigurationChanged,
this, &QMakeStepConfigWidget::qmakeBuildConfigChanged); this, &QMakeStepConfigWidget::qmakeBuildConfigChanged);
connect(step->target(), &Target::kitChanged, this, &QMakeStepConfigWidget::qtVersionChanged); connect(step->target(), &Target::kitChanged, this, &QMakeStepConfigWidget::qtVersionChanged);
connect(m_ui->abisListWidget, &QListWidget::itemChanged, this, &QMakeStepConfigWidget::abisChanged); connect(m_ui->abisListWidget, &QListWidget::itemChanged, this, [this]{
abisChanged();
QmakeBuildConfiguration *bc = m_step->qmakeBuildConfiguration();
if (!bc)
return;
QList<ProjectExplorer::BuildStepList *> stepLists;
const Core::Id clean = ProjectExplorer::Constants::BUILDSTEPS_CLEAN;
stepLists << bc->stepList(clean);
BuildManager::buildLists(stepLists, {ProjectExplorerPlugin::displayNameForStepId(clean)});
});
auto chooser = new Core::VariableChooser(m_ui->qmakeAdditonalArgumentsLineEdit); auto chooser = new Core::VariableChooser(m_ui->qmakeAdditonalArgumentsLineEdit);
chooser->addMacroExpanderProvider([step] { return step->macroExpander(); }); chooser->addMacroExpanderProvider([step] { return step->macroExpander(); });
chooser->addSupportedWidget(m_ui->qmakeAdditonalArgumentsLineEdit); chooser->addSupportedWidget(m_ui->qmakeAdditonalArgumentsLineEdit);