QmakeProjectManager: Do not run the clean steps spuriously

Amends c73266783875e49dbb4722ff673119c8213f993e.

Fixes: QTCREATORBUG-29451
Fixes: QTCREATORBUG-29481
Change-Id: Ib79977d49ec7650f025887ec956efde45a8efb7c
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

2 files changed, 4 insertions, 10 deletions

diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 93e13f71f0..2c2f5695c9 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -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) {
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index d977eedd90..f72c48d461 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -155,7 +155,6 @@ private:
 
     void updateAbiWidgets();
     void updateEffectiveQMakeCall();
-    void handleAbiWidgetChange();
 
     Utils::CommandLine m_qmakeCommand;
     Utils::CommandLine m_makeCommand;