feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/qmldesignerprojectmanager.cpp

Change-Id: I5106bb632c2a3a144287097137be45b0894b9ee4
This commit is contained in:
Eike Ziller
2022-07-04 08:29:53 +02:00
parent 1ce044ef7a 4180e1b84f
commit 91fb0cf123
272 changed files with 3873 additions and 1333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/plugins/cppeditor/cppcodemodelsettings.cpp
View File

@@ -314,16 +314,38 @@ QVersionNumber ClangdSettings::clangdVersion(const FilePath &clangdFilePath)
return it->second;
}
FilePath ClangdSettings::clangdIncludePath() const
static FilePath getClangHeadersPathFromClang(const FilePath &clangdFilePath)
{
QTC_ASSERT(useClangd(), return {});
FilePath clangdPath = clangdFilePath();
QTC_ASSERT(!clangdPath.isEmpty() && clangdPath.exists(), return {});
const QVersionNumber version = clangdVersion();
const FilePath clangFilePath = clangdFilePath.absolutePath().pathAppended("clang")
.withExecutableSuffix();
if (!clangFilePath.exists())
return {};
QtcProcess clang;
clang.setCommand({clangFilePath, {"-print-resource-dir"}});
clang.start();
if (!clang.waitForFinished())
return {};
const FilePath resourceDir = FilePath::fromUserInput(QString::fromLocal8Bit(
clang.readAllStandardOutput().trimmed()));
if (resourceDir.isEmpty() || !resourceDir.exists())
return {};
const FilePath includeDir = resourceDir.pathAppended("include");
if (!includeDir.exists())
return {};
return includeDir;
}
static FilePath getClangHeadersPath(const FilePath &clangdFilePath)
{
const FilePath headersPath = getClangHeadersPathFromClang(clangdFilePath);
if (!headersPath.isEmpty())
return headersPath;
const QVersionNumber version = ClangdSettings::clangdVersion(clangdFilePath);
QTC_ASSERT(!version.isNull(), return {});
static const QStringList libDirs{"lib", "lib64"};
for (const QString &libDir : libDirs) {
const FilePath includePath = clangdPath.absolutePath().parentDir().pathAppended(libDir)
const FilePath includePath = clangdFilePath.absolutePath().parentDir().pathAppended(libDir)
.pathAppended("clang").pathAppended(version.toString()).pathAppended("include");
if (includePath.exists())
return includePath;
@@ -332,6 +354,21 @@ FilePath ClangdSettings::clangdIncludePath() const
return {};
}
FilePath ClangdSettings::clangdIncludePath() const
{
QTC_ASSERT(useClangd(), return {});
FilePath clangdPath = clangdFilePath();
QTC_ASSERT(!clangdPath.isEmpty() && clangdPath.exists(), return {});
static QHash<FilePath, FilePath> headersPathCache;
const auto it = headersPathCache.constFind(clangdPath);
if (it != headersPathCache.constEnd())
return *it;
const FilePath headersPath = getClangHeadersPath(clangdPath);
if (!headersPath.isEmpty())
headersPathCache.insert(clangdPath, headersPath);
return headersPath;
}
FilePath ClangdSettings::clangdUserConfigFilePath()
{
return FilePath::fromString(