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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Change-Id: I7bd186df0bfae7906e980e9c2c811f8dcf29750d
This commit is contained in:
Eike Ziller
2023-03-02 10:17:58 +01:00
parent 0020129afe 00c79cc1b7
commit 87ede95b5c
49 changed files with 936 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -364,11 +364,15 @@ static FilePath getClangHeadersPath(const FilePath &clangdFilePath)
const QVersionNumber version = Utils::clangdVersion(clangdFilePath);
QTC_ASSERT(!version.isNull(), return {});
static const QStringList libDirs{"lib", "lib64"};
const QStringList versionStrings{QString::number(version.majorVersion()), version.toString()};
for (const QString &libDir : libDirs) {
const FilePath includePath = clangdFilePath.absolutePath().parentDir().pathAppended(libDir)
.pathAppended("clang").pathAppended(version.toString()).pathAppended("include");
if (includePath.exists())
return includePath;
for (const QString &versionString : versionStrings) {
const FilePath includePath = clangdFilePath.absolutePath().parentDir()
.pathAppended(libDir).pathAppended("clang")
.pathAppended(versionString).pathAppended("include");
if (includePath.exists())
return includePath;
}
}
QTC_CHECK(false);
return {};