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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: I2a3d92a14e4dd16897d19f7d8a8c7b0ec30d14a5
This commit is contained in:
Eike Ziller
2024-02-19 14:44:54 +01:00
parent 737bf48a0c 04d7f63186
commit 8826a8b47b
196 changed files with 6735 additions and 3421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -207,11 +207,11 @@ static BaseClientInterface *clientInterface(Project *project, const Utils::FileP
"--clang-tidy=0"}};
if (settings.workerThreadLimit() != 0)
cmd.addArg("-j=" + QString::number(settings.workerThreadLimit()));
if (indexingEnabled && settings.clangdVersion() >= QVersionNumber(15)) {
if (indexingEnabled && Utils::clangdVersion(clangdExePath) >= QVersionNumber(15)) {
cmd.addArg("--background-index-priority="
+ ClangdSettings::priorityToString(indexingPriority));
}
if (settings.clangdVersion() >= QVersionNumber(16))
if (Utils::clangdVersion(clangdExePath) >= QVersionNumber(16))
cmd.addArg("--rename-file-limit=0");
if (!jsonDbDir.isEmpty())
cmd.addArg("--compile-commands-dir=" + clangdExePath.withNewMappedPath(jsonDbDir).path());