Merge remote-tracking branch 'origin/11.0'

Conflicts:
	doc/qtdesignstudio/src/views/qtquick-designer.qdoc

Change-Id: I5d7ea23e356add0cbb2ad01ceb5e433377dc51c2

src/plugins/qmakeprojectmanager/qmakestep.cpp

@@ -511,9 +511,9 @@ QWidget *QMakeStep::createConfigWidget()
             widget, [this] { qtVersionChanged(); });
 
     connect(abisListWidget, &QListWidget::itemChanged, this, [this] {
-        abisChanged();
-        if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
-            BuildManager::buildLists({bc->cleanSteps()});
+        if (m_ignoreChanges.isLocked())
+            return;
+        handleAbiWidgetChange();
     });
 
     connect(widget, &QObject::destroyed, this, [this] {
@@ -655,6 +655,8 @@ void QMakeStep::askForRebuild(const QString &title)
 
 void QMakeStep::updateAbiWidgets()
 {
+    const GuardLocker locker(m_ignoreChanges);
+
     if (!abisLabel)
         return;
 
@@ -703,7 +705,7 @@ void QMakeStep::updateAbiWidgets()
             item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
             item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked);
         }
-        abisChanged();
+        handleAbiWidgetChange();
     }
 }
 
@@ -712,6 +714,13 @@ 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) {