forked from qt-creator/qt-creator
QmakeKitAspectWidget: Use Utils::Guard
Change-Id: I312ba87cb7e198dbbbdca1b8f9c114bb3deb2b19 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -34,6 +34,7 @@
|
|||||||
#include <qtsupport/qtkitinformation.h>
|
#include <qtsupport/qtkitinformation.h>
|
||||||
|
|
||||||
#include <utils/algorithm.h>
|
#include <utils/algorithm.h>
|
||||||
|
#include <utils/guard.h>
|
||||||
#include <utils/layoutbuilder.h>
|
#include <utils/layoutbuilder.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
|
|
||||||
@@ -72,19 +73,18 @@ private:
|
|||||||
|
|
||||||
void refresh() override
|
void refresh() override
|
||||||
{
|
{
|
||||||
if (!m_ignoreChange)
|
if (!m_ignoreChanges.isLocked())
|
||||||
m_lineEdit->setText(QDir::toNativeSeparators(QmakeKitAspect::mkspec(m_kit)));
|
m_lineEdit->setText(QDir::toNativeSeparators(QmakeKitAspect::mkspec(m_kit)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void mkspecWasChanged(const QString &text)
|
void mkspecWasChanged(const QString &text)
|
||||||
{
|
{
|
||||||
m_ignoreChange = true;
|
const GuardLocker locker(m_ignoreChanges);
|
||||||
QmakeKitAspect::setMkspec(m_kit, text, QmakeKitAspect::MkspecSource::User);
|
QmakeKitAspect::setMkspec(m_kit, text, QmakeKitAspect::MkspecSource::User);
|
||||||
m_ignoreChange = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QLineEdit *m_lineEdit = nullptr;
|
QLineEdit *m_lineEdit = nullptr;
|
||||||
bool m_ignoreChange = false;
|
Guard m_ignoreChanges;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user