feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QMakeStep: Use Utils::Guard

Browse Source 
Change-Id: I1fbc830620cb2db42ac71e3c02e1d3993197a727
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-07-22 11:02:03 +02:00
parent 5434ea417f
commit 9177649cab
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -587,10 +587,11 @@ void QMakeStep::qtVersionChanged()
void QMakeStep::qmakeBuildConfigChanged() void QMakeStep::qmakeBuildConfigChanged()
{ {
QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
bool debug = bc->qmakeBuildConfiguration() & QtVersion::DebugBuild; const bool debug = bc->qmakeBuildConfiguration() & QtVersion::DebugBuild;
m_ignoreChange = true; {
m_buildType->setValue(debug? 0 : 1); const GuardLocker locker(m_ignoreChanges);
m_ignoreChange = false; m_buildType->setValue(debug ? 0 : 1);
}
updateAbiWidgets(); updateAbiWidgets();
updateEffectiveQMakeCall(); updateEffectiveQMakeCall();
} }
@@ -674,7 +675,7 @@ void QMakeStep::abisChanged()
void QMakeStep::buildConfigurationSelected() void QMakeStep::buildConfigurationSelected()
{ {
if (m_ignoreChange) if (m_ignoreChanges.isLocked())
return; return;
QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
QtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration(); QtVersion::QmakeBuildConfigs buildConfiguration = bc->qmakeBuildConfiguration();
@@ -683,9 +684,11 @@ void QMakeStep::buildConfigurationSelected()
} else { } else {
buildConfiguration = buildConfiguration & ~QtVersion::DebugBuild; buildConfiguration = buildConfiguration & ~QtVersion::DebugBuild;
} }
m_ignoreChange = true;
bc->setQMakeBuildConfiguration(buildConfiguration); {
m_ignoreChange = false; const GuardLocker locker(m_ignoreChanges);
bc->setQMakeBuildConfiguration(buildConfiguration);
}
updateAbiWidgets(); updateAbiWidgets();
updateEffectiveQMakeCall(); updateEffectiveQMakeCall();

3
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -31,6 +31,7 @@
#include <utils/aspects.h> #include <utils/aspects.h>
#include <utils/commandline.h> #include <utils/commandline.h>
#include <utils/guard.h>
#include <memory> #include <memory>
@@ -206,7 +207,7 @@ private:
QStringList m_selectedAbis; QStringList m_selectedAbis;
Utils::OutputFormatter *m_outputFormatter = nullptr; Utils::OutputFormatter *m_outputFormatter = nullptr;
bool m_ignoreChange = false; Utils::Guard m_ignoreChanges;
QLabel *abisLabel = nullptr; QLabel *abisLabel = nullptr;
Utils::SelectionAspect *m_buildType = nullptr; Utils::SelectionAspect *m_buildType = nullptr;