From 485bcc4b6119dd8bb6793741709686b229a6cbed Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 18 Feb 2021 14:38:17 +0100 Subject: [PATCH] ClangCodeModel: Change default set of warnings ... to "warnings from build system". It seems appropriate to respect the project settings by default. Change-Id: I397c252409a012f4663f3752c5c097fa0e658da4 Reviewed-by: Christian Stenger --- src/plugins/cpptools/cppcodemodelsettings.cpp | 2 +- src/plugins/cpptools/cpptoolsconstants.h | 1 + src/plugins/cpptools/cpptoolsreuse.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/cppcodemodelsettings.cpp b/src/plugins/cpptools/cppcodemodelsettings.cpp index 98d9a1098db..feb1c7f09ad 100644 --- a/src/plugins/cpptools/cppcodemodelsettings.cpp +++ b/src/plugins/cpptools/cppcodemodelsettings.cpp @@ -37,7 +37,7 @@ using namespace CppTools; static Utils::Id initialClangDiagnosticConfigId() -{ return Constants::CPP_CLANG_DIAG_CONFIG_QUESTIONABLE; } +{ return Constants::CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM; } static CppCodeModelSettings::PCHUsage initialPchUsage() { return CppCodeModelSettings::PchUse_BuildSystem; } diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index bae185d090e..7ee83c1f707 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -60,6 +60,7 @@ const char CPPTOOLS_SKIP_INDEXING_BIG_FILES[] = "SkipIndexingBigFiles"; const char CPPTOOLS_INDEXER_FILE_SIZE_LIMIT[] = "IndexerFileSizeLimit"; const char CPP_CLANG_DIAG_CONFIG_QUESTIONABLE[] = "Builtin.Questionable"; +const char CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM[] = "Builtin.BuildSystem"; const char CPP_CODE_STYLE_SETTINGS_ID[] = "A.Cpp.Code Style"; const char CPP_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "Code Style"); diff --git a/src/plugins/cpptools/cpptoolsreuse.cpp b/src/plugins/cpptools/cpptoolsreuse.cpp index b618fea8a7d..5294f1314b5 100644 --- a/src/plugins/cpptools/cpptoolsreuse.cpp +++ b/src/plugins/cpptools/cpptoolsreuse.cpp @@ -361,7 +361,7 @@ static void addBuiltinConfigs(ClangDiagnosticConfigsModel &model) // Warning flags from build system config = ClangDiagnosticConfig(); - config.setId("Builtin.BuildSystem"); + config.setId(Constants::CPP_CLANG_DIAG_CONFIG_BUILDSYSTEM); config.setDisplayName(QCoreApplication::translate("ClangDiagnosticConfigsModel", "Build-system warnings")); config.setIsReadOnly(true);