From 9177649cabc2aa8f023cc318237eabe72040565f Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 22 Jul 2022 11:02:03 +0200
Subject: [PATCH] QMakeStep: Use Utils::Guard

Change-Id: I1fbc830620cb2db42ac71e3c02e1d3993197a727
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 src/plugins/qmakeprojectmanager/qmakestep.cpp | 19 +++++++++++--------
 src/plugins/qmakeprojectmanager/qmakestep.h   |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 55c7ba01f19..4139328768c 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -587,10 +587,11 @@ void QMakeStep::qtVersionChanged()
 void QMakeStep::qmakeBuildConfigChanged()
 {
     QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
-    bool debug = bc->qmakeBuildConfiguration() & QtVersion::DebugBuild;
-    m_ignoreChange = true;
-    m_buildType->setValue(debug? 0 : 1);
-    m_ignoreChange = false;
+    const bool debug = bc->qmakeBuildConfiguration() & QtVersion::DebugBuild;
+    {
+        const GuardLocker locker(m_ignoreChanges);
+        m_buildType->setValue(debug ? 0 : 1);
+    }
     updateAbiWidgets();
     updateEffectiveQMakeCall();
 }
@@ -674,7 +675,7 @@ void QMakeStep::abisChanged()
 
 void QMakeStep::buildConfigurationSelected()
 {
-    if (m_ignoreChange)
+    if (m_ignoreChanges.isLocked())
         return;
     QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
     QtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
@@ -683,9 +684,11 @@ void QMakeStep::buildConfigurationSelected()
     } else {
         buildConfiguration = buildConfiguration & ~QtVersion::DebugBuild;
     }
-    m_ignoreChange = true;
-    bc->setQMakeBuildConfiguration(buildConfiguration);
-    m_ignoreChange = false;
+
+    {
+        const GuardLocker locker(m_ignoreChanges);
+        bc->setQMakeBuildConfiguration(buildConfiguration);
+    }
 
     updateAbiWidgets();
     updateEffectiveQMakeCall();
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index 0679110f1e7..ec6eea94404 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -31,6 +31,7 @@
 
 #include <utils/aspects.h>
 #include <utils/commandline.h>
+#include <utils/guard.h>
 
 #include <memory>
 
@@ -206,7 +207,7 @@ private:
     QStringList m_selectedAbis;
     Utils::OutputFormatter *m_outputFormatter = nullptr;
 
-    bool m_ignoreChange = false;
+    Utils::Guard m_ignoreChanges;
 
     QLabel *abisLabel = nullptr;
     Utils::SelectionAspect *m_buildType = nullptr;