diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-05-14 11:40:40 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-05-15 07:26:22 +0000 |
commit | 9b74948a617eb48c2c1131632edba7f96ec052ed (patch) | |
tree | aedcc9f43d51e2b01b4fed6d7f7816bee6d1cfdd /src/plugins/clangtools/clangtoolsprojectsettings.h | |
parent | 2522275b69f14ad0378ddbf42004c0b7104f3d73 (diff) |
ClangTools: Allow selecting diagnostic config for project
When starting the Clazy/Tidy tool, allow to select the diagnostic
configuration for the run.
As a side effect, fix a race condition where the runner could end up
with no diagnostic config (removed during run) - copy the diagnostic
config instead of referencing/querying it by the id.
Change-Id: Iedafa8f31a3bbd233d65818fe8de16add1e4d443
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/clangtools/clangtoolsprojectsettings.h')
-rw-r--r-- | src/plugins/clangtools/clangtoolsprojectsettings.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/clangtools/clangtoolsprojectsettings.h b/src/plugins/clangtools/clangtoolsprojectsettings.h index d29c0405d7..659a7b5648 100644 --- a/src/plugins/clangtools/clangtoolsprojectsettings.h +++ b/src/plugins/clangtools/clangtoolsprojectsettings.h @@ -27,6 +27,7 @@ #include <QObject> +#include <coreplugin/id.h> #include <projectexplorer/project.h> #include <utils/fileutils.h> @@ -74,6 +75,12 @@ public: ClangToolsProjectSettings(ProjectExplorer::Project *project); ~ClangToolsProjectSettings() override; + bool useGlobalSettings() const; + void setUseGlobalSettings(bool useGlobalSettings); + + Core::Id diagnosticConfig() const; + void setDiagnosticConfig(const Core::Id &diagnosticConfig); + QSet<Utils::FileName> selectedDirs() const { return m_selectedDirs; } void setSelectedDirs(const QSet<Utils::FileName> &value) { m_selectedDirs = value; } @@ -93,6 +100,8 @@ private: void store(); ProjectExplorer::Project *m_project; + bool m_useGlobalSettings = true; + Core::Id m_diagnosticConfig; QSet<Utils::FileName> m_selectedDirs; QSet<Utils::FileName> m_selectedFiles; SuppressedDiagnosticsList m_suppressedDiagnostics; |