From b97d4c2f80cceae7674cbd6744dac3618226e40b Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Wed, 31 Oct 2018 12:06:08 +0100 Subject: [PATCH] Clang: Check that file kind matches the language version It was checked that pure C header and source files had proper language version but not another way around. Change-Id: I1eaf41f342731bdbe30ee73e81144334d0f15d19 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/compileroptionsbuilder.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 62abc4dd179..3c88cce384f 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -65,6 +65,11 @@ QStringList CompilerOptionsBuilder::build(CppTools::ProjectFile::Kind fileKind, return QStringList();); } + if (fileKind == ProjectFile::CXXHeader || fileKind == ProjectFile::CXXSource) { + QTC_ASSERT(m_projectPart.languageVersion > ProjectExplorer::LanguageVersion::LatestC, + return QStringList();); + } + add("-c"); addWordWidth();