summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/clangsupport/CMakeLists.txt2
-rw-r--r--src/plugins/clangcodemodel/clangutils.cpp2
-rw-r--r--src/plugins/clangpchmanager/projectupdater.cpp2
-rw-r--r--src/plugins/clangtools/clangtoolruncontrol.cpp16
-rw-r--r--src/plugins/clangtools/clangtoolruncontrol.h2
-rw-r--r--src/plugins/clangtools/executableinfo.cpp6
-rw-r--r--src/plugins/clangtools/executableinfo.h2
-rw-r--r--src/plugins/coreplugin/icore.cpp4
-rw-r--r--src/plugins/coreplugin/icore.h2
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp6
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.h7
-rw-r--r--src/plugins/cpptools/headerpathfilter.cpp11
-rw-r--r--src/plugins/cpptools/headerpathfilter.h6
-rw-r--r--src/shared/clang/clang_defines.pri4
14 files changed, 36 insertions, 36 deletions
diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt
index d1f38507cb..7117066ac1 100644
--- a/src/libs/clangsupport/CMakeLists.txt
+++ b/src/libs/clangsupport/CMakeLists.txt
@@ -5,7 +5,7 @@ add_qtc_library(ClangSupport
PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network
PUBLIC_DEFINES
CLANG_VERSION="${CLANG_VERSION}"
- CLANG_RESOURCE_DIR="${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include"
+ CLANG_INCLUDE_DIR="${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include"
CLANG_BINDIR="${IDE_LIBEXEC_PATH}/clang/bin"
DEFINES CLANGSUPPORT_BUILD_LIB
PUBLIC_INCLUDES
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 621900c83e..57f0170faa 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -75,7 +75,7 @@ public:
UseLanguageDefines::No,
useBuildSystemWarnings,
QString(CLANG_VERSION),
- QString(CLANG_RESOURCE_DIR))
+ QString(CLANG_INCLUDE_DIR))
{
}
diff --git a/src/plugins/clangpchmanager/projectupdater.cpp b/src/plugins/clangpchmanager/projectupdater.cpp
index e006357e0c..8c021fc3e5 100644
--- a/src/plugins/clangpchmanager/projectupdater.cpp
+++ b/src/plugins/clangpchmanager/projectupdater.cpp
@@ -332,7 +332,7 @@ ProjectUpdater::SystemAndProjectIncludeSearchPaths ProjectUpdater::createInclude
CppTools::HeaderPathFilter filter(projectPart,
CppTools::UseTweakedHeaderPaths::Yes,
CLANG_VERSION,
- CLANG_RESOURCE_DIR,
+ CLANG_INCLUDE_DIR,
projectDirectory(projectPart.project),
buildDirectory(projectPart.project));
filter.process();
diff --git a/src/plugins/clangtools/clangtoolruncontrol.cpp b/src/plugins/clangtools/clangtoolruncontrol.cpp
index 090e9d8216..ac054135de 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.cpp
+++ b/src/plugins/clangtools/clangtoolruncontrol.cpp
@@ -154,7 +154,7 @@ private:
bool m_success = false;
};
-static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos, const FilePath &clangResourceDir,
+static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos, const FilePath &clangIncludeDir,
const QString &clangVersion)
{
AnalyzeUnits unitsToAnalyze;
@@ -166,7 +166,7 @@ static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos, const FilePath &c
UseLanguageDefines::No,
UseBuildSystemWarnings::No,
clangVersion,
- clangResourceDir.toString());
+ clangIncludeDir.toString());
QStringList arguments = extraClangToolsPrependOptions();
arguments.append(optionsBuilder.build(fileInfo.kind, usePrecompiledHeaders));
arguments.append(extraClangToolsAppendOptions());
@@ -176,12 +176,12 @@ static AnalyzeUnits toAnalyzeUnits(const FileInfos &fileInfos, const FilePath &c
return unitsToAnalyze;
}
-AnalyzeUnits ClangToolRunWorker::unitsToAnalyze(const FilePath &clangResourceDir,
+AnalyzeUnits ClangToolRunWorker::unitsToAnalyze(const FilePath &clangIncludeDir,
const QString &clangVersion)
{
QTC_ASSERT(m_projectInfo.isValid(), return AnalyzeUnits());
- return toAnalyzeUnits(m_fileInfos, clangResourceDir, clangVersion);
+ return toAnalyzeUnits(m_fileInfos, clangIncludeDir, clangVersion);
}
static QDebug operator<<(QDebug debug, const Utils::Environment &environment)
@@ -288,10 +288,10 @@ void ClangToolRunWorker::start()
Utils::NormalMessageFormat);
// Collect files
- const auto clangResourceDirAndVersion =
- getClangResourceDirAndVersion(runControl()->runnable().executable);
- const AnalyzeUnits unitsToProcess = unitsToAnalyze(clangResourceDirAndVersion.first,
- clangResourceDirAndVersion.second);
+ const auto clangIncludeDirAndVersion =
+ getClangIncludeDirAndVersion(runControl()->runnable().executable);
+ const AnalyzeUnits unitsToProcess = unitsToAnalyze(clangIncludeDirAndVersion.first,
+ clangIncludeDirAndVersion.second);
qCDebug(LOG) << "Files to process:" << unitsToProcess;
m_queue.clear();
diff --git a/src/plugins/clangtools/clangtoolruncontrol.h b/src/plugins/clangtools/clangtoolruncontrol.h
index 97f667a01a..e72df21c68 100644
--- a/src/plugins/clangtools/clangtoolruncontrol.h
+++ b/src/plugins/clangtools/clangtoolruncontrol.h
@@ -93,7 +93,7 @@ private:
QList<RunnerCreator> runnerCreators();
template <class T> ClangToolRunner *createRunner();
- AnalyzeUnits unitsToAnalyze(const Utils::FilePath &clangResourceDir,
+ AnalyzeUnits unitsToAnalyze(const Utils::FilePath &clangIncludeDir,
const QString &clangVersion);
void analyzeNextFile();
diff --git a/src/plugins/clangtools/executableinfo.cpp b/src/plugins/clangtools/executableinfo.cpp
index 6e7bb1fcd4..d8ab050c20 100644
--- a/src/plugins/clangtools/executableinfo.cpp
+++ b/src/plugins/clangtools/executableinfo.cpp
@@ -203,13 +203,13 @@ static QString queryVersion(const FilePath &clangToolPath)
return {};
}
-QPair<FilePath, QString> getClangResourceDirAndVersion(const FilePath &clangToolPath)
+QPair<FilePath, QString> getClangIncludeDirAndVersion(const FilePath &clangToolPath)
{
const FilePath dynamicResourceDir = queryResourceDir(clangToolPath);
const QString dynamicVersion = queryVersion(clangToolPath);
if (dynamicResourceDir.isEmpty() || dynamicVersion.isEmpty())
- return qMakePair(FilePath::fromString(CLANG_RESOURCE_DIR), QString(CLANG_VERSION));
- return qMakePair(dynamicResourceDir, dynamicVersion);
+ return qMakePair(FilePath::fromString(CLANG_INCLUDE_DIR), QString(CLANG_VERSION));
+ return qMakePair(dynamicResourceDir + "/include", dynamicVersion);
}
} // namespace Internal
diff --git a/src/plugins/clangtools/executableinfo.h b/src/plugins/clangtools/executableinfo.h
index 95e61df456..aa297dcb5e 100644
--- a/src/plugins/clangtools/executableinfo.h
+++ b/src/plugins/clangtools/executableinfo.h
@@ -34,7 +34,7 @@
namespace ClangTools {
namespace Internal {
-QPair<Utils::FilePath, QString> getClangResourceDirAndVersion(const Utils::FilePath &clangToolPath);
+QPair<Utils::FilePath, QString> getClangIncludeDirAndVersion(const Utils::FilePath &clangToolPath);
class ClangTidyInfo
{
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp
index c048b9f641..904bba8913 100644
--- a/src/plugins/coreplugin/icore.cpp
+++ b/src/plugins/coreplugin/icore.cpp
@@ -491,11 +491,11 @@ static QString clangIncludePath(const QString &clangVersion)
\internal
*/
QString ICore::clangIncludeDirectory(const QString &clangVersion,
- const QString &clangResourceDirectory)
+ const QString &clangFallbackIncludeDir)
{
QDir dir(libexecPath() + "/clang" + clangIncludePath(clangVersion));
if (!dir.exists() || !QFileInfo(dir, "stdint.h").exists())
- dir = QDir(clangResourceDirectory);
+ dir = QDir(clangFallbackIncludeDir);
return QDir::toNativeSeparators(dir.canonicalPath());
}
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 119c9035bc..3b012018c6 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -161,7 +161,7 @@ public:
static QString clangTidyExecutable(const QString &clangBinDirectory);
static QString clazyStandaloneExecutable(const QString &clangBinDirectory);
static QString clangIncludeDirectory(const QString &clangVersion,
- const QString &clangResourceDirectory);
+ const QString &clangFallbackIncludeDir);
static QString buildCompatibilityString();
static QStatusBar *statusBar();
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();
diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h
index ee7e373312..cfaeecdea8 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.h
+++ b/src/plugins/cpptools/compileroptionsbuilder.h
@@ -45,14 +45,13 @@ CPPTOOLS_EXPORT QStringList createLanguageOptionGcc(ProjectFile::Kind fileKind,
class CPPTOOLS_EXPORT CompilerOptionsBuilder
{
public:
- CompilerOptionsBuilder(
- const ProjectPart &projectPart,
+ CompilerOptionsBuilder(const ProjectPart &projectPart,
UseSystemHeader useSystemHeader = UseSystemHeader::No,
UseTweakedHeaderPaths useTweakedHeaderPaths = UseTweakedHeaderPaths::No,
UseLanguageDefines useLanguageDefines = UseLanguageDefines::No,
UseBuildSystemWarnings useBuildSystemWarnings = UseBuildSystemWarnings::No,
const QString &clangVersion = QString(),
- const QString &clangResourceDirectory = QString());
+ const QString &clangIncludeDirectory = QString());
QStringList build(ProjectFile::Kind fileKind, UsePrecompiledHeaders usePrecompiledHeaders);
QStringList options() const { return m_options; }
@@ -112,7 +111,7 @@ private:
const UseBuildSystemWarnings m_useBuildSystemWarnings;
const QString m_clangVersion;
- const QString m_clangResourceDirectory;
+ const QString m_clangIncludeDirectory;
struct {
QStringList flags;
diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
index 5268511b52..c0a1c04cf9 100644
--- a/src/plugins/cpptools/headerpathfilter.cpp
+++ b/src/plugins/cpptools/headerpathfilter.cpp
@@ -104,14 +104,14 @@ void HeaderPathFilter::filterHeaderPath(const ProjectExplorer::HeaderPath &heade
namespace {
-QString clangIncludeDirectory(const QString &clangVersion, const QString &clangResourceDirectory)
+QString clangIncludeDirectory(const QString &clangVersion, const QString &clangFallbackIncludeDir)
{
#ifndef UNIT_TESTS
- return Core::ICore::clangIncludeDirectory(clangVersion, clangResourceDirectory);
+ return Core::ICore::clangIncludeDirectory(clangVersion, clangFallbackIncludeDir);
#else
Q_UNUSED(clangVersion)
- Q_UNUSED(clangResourceDirectory)
- return {CLANG_RESOURCE_DIR};
+ Q_UNUSED(clangFallbackIncludeDir)
+ return {CLANG_INCLUDE_DIR};
#endif
}
@@ -158,7 +158,8 @@ void HeaderPathFilter::tweakHeaderPaths()
auto split = resourceIterator(builtInHeaderPaths);
if (!clangVersion.isEmpty()) {
- const QString clangIncludePath = clangIncludeDirectory(clangVersion, clangResourceDirectory);
+ const QString clangIncludePath
+ = clangIncludeDirectory(clangVersion, clangFallbackIncludeDirectory);
builtInHeaderPaths.insert(split, HeaderPath{clangIncludePath, HeaderPathType::BuiltIn});
}
}
diff --git a/src/plugins/cpptools/headerpathfilter.h b/src/plugins/cpptools/headerpathfilter.h
index b1a22b098a..4482c230ae 100644
--- a/src/plugins/cpptools/headerpathfilter.h
+++ b/src/plugins/cpptools/headerpathfilter.h
@@ -35,12 +35,12 @@ public:
HeaderPathFilter(const ProjectPart &projectPart,
UseTweakedHeaderPaths useTweakedHeaderPaths = UseTweakedHeaderPaths::Yes,
const QString &clangVersion = {},
- const QString &clangResourceDirectory = {},
+ const QString &clangIncludeDirectory = {},
const QString &projectDirectory = {},
const QString &buildDirectory = {})
: projectPart{projectPart}
, clangVersion{clangVersion}
- , clangResourceDirectory{clangResourceDirectory}
+ , clangFallbackIncludeDirectory{clangIncludeDirectory}
, projectDirectory(ensurePathWithSlashEnding(projectDirectory))
, buildDirectory(ensurePathWithSlashEnding(buildDirectory))
, useTweakedHeaderPaths{useTweakedHeaderPaths}
@@ -67,7 +67,7 @@ public:
ProjectExplorer::HeaderPaths userHeaderPaths;
const ProjectPart &projectPart;
const QString clangVersion;
- const QString clangResourceDirectory;
+ const QString clangFallbackIncludeDirectory;
const QString projectDirectory;
const QString buildDirectory;
const UseTweakedHeaderPaths useTweakedHeaderPaths;
diff --git a/src/shared/clang/clang_defines.pri b/src/shared/clang/clang_defines.pri
index 4453c8ba6d..54e35433b8 100644
--- a/src/shared/clang/clang_defines.pri
+++ b/src/shared/clang/clang_defines.pri
@@ -1,5 +1,5 @@
DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\"
-CLANG_RESOURCE_DIR=$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)
-DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${CLANG_RESOURCE_DIR}\\\"\""
+CLANG_INCLUDE_DIR=$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)
+DEFINES += "\"CLANG_INCLUDE_DIR=\\\"$${CLANG_INCLUDE_DIR}\\\"\""
CLANG_BINDIR=$$clean_path($${LLVM_BINDIR})
DEFINES += "\"CLANG_BINDIR=\\\"$${CLANG_BINDIR}\\\"\""
View Lorry Controller Status