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

Clang: Add compiler name to each compilation database entry

Browse Source 
In all examples there's a compiler as a first argument.

Change-Id: I37ec4073254d68f29357e9b2447a035a1b15e02f
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-09-13 15:16:29 +02:00
parent 4669563836
commit 641c9f7db9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,11 +330,13 @@ static QJsonObject createFileObject(CompilerOptionsBuilder &optionsBuilder,
const ProjectFile &projFile, const ProjectFile &projFile,
const ::Utils::FileName &buildDir) const ::Utils::FileName &buildDir)
{ {
optionsBuilder.updateLanguageOption(ProjectFile::classify(projFile.path)); const ProjectFile::Kind kind = ProjectFile::classify(projFile.path);
optionsBuilder.updateLanguageOption(kind);
QJsonObject fileObject; QJsonObject fileObject;
fileObject["file"] = projFile.path; fileObject["file"] = projFile.path;
QJsonArray args = QJsonArray::fromStringList(optionsBuilder.options()); QJsonArray args = QJsonArray::fromStringList(optionsBuilder.options());
args.prepend(kind == ProjectFile::CXXSource ? "clang++" : "clang");
args.append(QDir::toNativeSeparators(projFile.path)); args.append(QDir::toNativeSeparators(projFile.path));
fileObject["arguments"] = args; fileObject["arguments"] = args;
fileObject["directory"] = buildDir.toString(); fileObject["directory"] = buildDir.toString();