diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index a089248d039..3e82ba85209 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -581,7 +581,15 @@ QStringList createClangOptions(const ProjectPart &projectPart, const QString &fi LibClangOptionsBuilder optionsBuilder(projectPart, fileOptions.useBuildSystemWarnings()); const QStringList projectPartOptions = optionsBuilder.build(CppEditor::ProjectFile::Unsupported, UsePrecompiledHeaders::No); - return projectPartOptions + fileOptions.options(); + + // FIXME: Sanitize FileOptionsBuilder instead. + QStringList fileArgs = fileOptions.options(); + if (projectPartOptions.contains("-TP")) + fileArgs.removeAll("/TP"); + if (projectPartOptions.contains("-TC")) + fileArgs.removeAll("/TC"); + + return projectPartOptions + fileArgs; } ClangDiagnosticConfig warningsConfigForProject(Project *project)