forked from qt-creator/qt-creator
ClangTools: Add UI for specifying executables
Add a new group box "Executables" for this. Hide the UI for clazy-standalone unless QTC_USE_CLAZY_STANDALONE_PATH is set as there is no released version with the needed -export-fixes option. Rename the previous group box from "General" to "Run Options". Change-Id: Ia9daf66c40d3a7eea98b31d9c086886d29466490 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
@@ -38,6 +38,8 @@
|
||||
static const char simultaneousProcessesKey[] = "simultaneousProcesses";
|
||||
static const char buildBeforeAnalysisKey[] = "buildBeforeAnalysis";
|
||||
static const char diagnosticConfigIdKey[] = "diagnosticConfigId";
|
||||
static const char clangTidyExecutableKey[] = "clangTidyExecutable";
|
||||
static const char clazyStandaloneExecutableKey[] = "clazyStandaloneExecutable";
|
||||
|
||||
namespace ClangTools {
|
||||
namespace Internal {
|
||||
@@ -106,6 +108,36 @@ void ClangToolsSettings::updateSavedBuildBeforeAnalysiIfRequired()
|
||||
emit buildBeforeAnalysisChanged(m_savedBuildBeforeAnalysis);
|
||||
}
|
||||
|
||||
QString ClangToolsSettings::savedClazyStandaloneExecutable() const
|
||||
{
|
||||
return m_savedClazyStandaloneExecutable;
|
||||
}
|
||||
|
||||
QString ClangToolsSettings::savedClangTidyExecutable() const
|
||||
{
|
||||
return m_savedClangTidyExecutable;
|
||||
}
|
||||
|
||||
QString ClangToolsSettings::clazyStandaloneExecutable() const
|
||||
{
|
||||
return m_clazyStandaloneExecutable;
|
||||
}
|
||||
|
||||
void ClangToolsSettings::setClazyStandaloneExecutable(const QString &path)
|
||||
{
|
||||
m_clazyStandaloneExecutable = path;
|
||||
}
|
||||
|
||||
QString ClangToolsSettings::clangTidyExecutable() const
|
||||
{
|
||||
return m_clangTidyExecutable;
|
||||
}
|
||||
|
||||
void ClangToolsSettings::setClangTidyExecutable(const QString &path)
|
||||
{
|
||||
m_clangTidyExecutable = path;
|
||||
}
|
||||
|
||||
void ClangToolsSettings::readSettings()
|
||||
{
|
||||
QSettings *settings = Core::ICore::settings();
|
||||
@@ -118,6 +150,11 @@ void ClangToolsSettings::readSettings()
|
||||
|
||||
m_buildBeforeAnalysis = settings->value(QString(buildBeforeAnalysisKey), true).toBool();
|
||||
|
||||
m_savedClangTidyExecutable = m_clangTidyExecutable
|
||||
= settings->value(QLatin1String(clangTidyExecutableKey)).toString();
|
||||
m_savedClazyStandaloneExecutable = m_clazyStandaloneExecutable
|
||||
= settings->value(QLatin1String(clazyStandaloneExecutableKey)).toString();
|
||||
|
||||
m_diagnosticConfigId = Core::Id::fromSetting(settings->value(QString(diagnosticConfigIdKey)));
|
||||
if (!m_diagnosticConfigId.isValid())
|
||||
m_diagnosticConfigId = "Builtin.TidyAndClazy";
|
||||
@@ -135,10 +172,14 @@ void ClangToolsSettings::writeSettings()
|
||||
settings->beginGroup(QString(Constants::SETTINGS_ID));
|
||||
settings->setValue(QString(simultaneousProcessesKey), m_simultaneousProcesses);
|
||||
settings->setValue(QString(buildBeforeAnalysisKey), m_buildBeforeAnalysis);
|
||||
settings->setValue(QString(clangTidyExecutableKey), m_clangTidyExecutable);
|
||||
settings->setValue(QString(clazyStandaloneExecutableKey), m_clazyStandaloneExecutable);
|
||||
settings->setValue(QString(diagnosticConfigIdKey), m_diagnosticConfigId.toSetting());
|
||||
|
||||
m_savedSimultaneousProcesses = m_simultaneousProcesses;
|
||||
m_savedDiagnosticConfigId = m_diagnosticConfigId;
|
||||
m_savedClangTidyExecutable = m_clangTidyExecutable;
|
||||
m_savedClazyStandaloneExecutable = m_clazyStandaloneExecutable;
|
||||
updateSavedBuildBeforeAnalysiIfRequired();
|
||||
|
||||
settings->endGroup();
|
||||
|
||||
Reference in New Issue
Block a user