forked from qt-creator/qt-creator
QmakeProjectManager: Do not run the clean steps spuriously
Amends c732667838
.
Fixes: QTCREATORBUG-29451
Fixes: QTCREATORBUG-29481
Change-Id: Ib79977d49ec7650f025887ec956efde45a8efb7c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
@@ -512,7 +512,9 @@ QWidget *QMakeStep::createConfigWidget()
|
||||
connect(abisListWidget, &QListWidget::itemChanged, this, [this] {
|
||||
if (m_ignoreChanges.isLocked())
|
||||
return;
|
||||
handleAbiWidgetChange();
|
||||
updateAbiWidgets();
|
||||
if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
|
||||
BuildManager::buildLists({bc->cleanSteps()});
|
||||
});
|
||||
|
||||
connect(widget, &QObject::destroyed, this, [this] {
|
||||
@@ -704,7 +706,7 @@ void QMakeStep::updateAbiWidgets()
|
||||
item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
|
||||
item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked);
|
||||
}
|
||||
handleAbiWidgetChange();
|
||||
abisChanged();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -713,13 +715,6 @@ void QMakeStep::updateEffectiveQMakeCall()
|
||||
m_effectiveCall->setValue(effectiveQMakeCall());
|
||||
}
|
||||
|
||||
void QMakeStep::handleAbiWidgetChange()
|
||||
{
|
||||
abisChanged();
|
||||
if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
|
||||
BuildManager::buildLists({bc->cleanSteps()});
|
||||
}
|
||||
|
||||
void QMakeStep::recompileMessageBoxFinished(int button)
|
||||
{
|
||||
if (button == QMessageBox::Yes) {
|
||||
|
@@ -155,7 +155,6 @@ private:
|
||||
|
||||
void updateAbiWidgets();
|
||||
void updateEffectiveQMakeCall();
|
||||
void handleAbiWidgetChange();
|
||||
|
||||
Utils::CommandLine m_qmakeCommand;
|
||||
Utils::CommandLine m_makeCommand;
|
||||
|
Reference in New Issue
Block a user