From d65ef60ea24a25e636f5a51b51192abbc883da12 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 24 Aug 2020 10:46:58 +0200 Subject: clang: Fix include/resource dir confusion The getClangResourceDirAndVersion() function in ClangTools could return the actual resource dir or the include dir, depending on the input. This mistake happened because of misleading names spread all around the code. Now the function returns what it says, and the other names are accurate as well. Change-Id: I0a8600857ee7b9fafb16256e0d1ad203ac3273d2 Reviewed-by: David Schulz --- src/plugins/cpptools/compileroptionsbuilder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp') diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 935a12f528..c990c27665 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -105,14 +105,14 @@ CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart, UseLanguageDefines useLanguageDefines, UseBuildSystemWarnings useBuildSystemWarnings, const QString &clangVersion, - const QString &clangResourceDirectory) + const QString &clangIncludeDirectory) : m_projectPart(projectPart) , m_useSystemHeader(useSystemHeader) , m_useTweakedHeaderPaths(useTweakedHeaderPaths) , m_useLanguageDefines(useLanguageDefines) , m_useBuildSystemWarnings(useBuildSystemWarnings) , m_clangVersion(clangVersion) - , m_clangResourceDirectory(clangResourceDirectory) + , m_clangIncludeDirectory(clangIncludeDirectory) { } @@ -332,7 +332,7 @@ void CompilerOptionsBuilder::addHeaderPathOptions() HeaderPathFilter filter{m_projectPart, m_useTweakedHeaderPaths, m_clangVersion, - m_clangResourceDirectory}; + m_clangIncludeDirectory}; filter.process(); -- cgit v1.2.1