From 02f50d52869b3ffe6a8dddcc110c5601b1da4025 Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Thu, 3 May 2018 11:08:54 +0200 Subject: CppTools: Rollback some changes in CompilerOptionsBuilder Make it safer in the 4.6 release. Change-Id: I75857ecc08af8febe40fd75dc94d8ab986d4b768 Reviewed-by: Nikolai Kosjar --- src/plugins/cpptools/compileroptionsbuilder.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp') diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 83bc89ab49..4059067310 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -47,7 +47,6 @@ CompilerOptionsBuilder::CompilerOptionsBuilder(const ProjectPart &projectPart, : m_projectPart(projectPart) , m_clangVersion(clangVersion) , m_clangResourceDirectory(clangResourceDirectory) - , m_languageVersion(m_projectPart.languageVersion) { } @@ -55,8 +54,10 @@ QStringList CompilerOptionsBuilder::build(CppTools::ProjectFile::Kind fileKind, { m_options.clear(); - if (fileKind == ProjectFile::CHeader || fileKind == ProjectFile::CSource) - QTC_ASSERT(m_languageVersion <= ProjectPart::LatestCVersion, return QStringList();); + if (fileKind == ProjectFile::CHeader || fileKind == ProjectFile::CSource) { + QTC_ASSERT(m_projectPart.languageVersion <= ProjectPart::LatestCVersion, + return QStringList();); + } addWordWidth(); addTargetTriple(); @@ -123,7 +124,7 @@ void CompilerOptionsBuilder::addExtraCodeModelFlags() void CompilerOptionsBuilder::enableExceptions() { - if (m_languageVersion > ProjectPart::LatestCVersion) + if (m_projectPart.languageVersion > ProjectPart::LatestCVersion) add(QLatin1String("-fcxx-exceptions")); add(QLatin1String("-fexceptions")); } @@ -293,7 +294,7 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension const ProjectPart::LanguageExtensions languageExtensions = m_projectPart.languageExtensions; const bool gnuExtensions = languageExtensions & ProjectPart::GnuExtensions; - switch (m_languageVersion) { + switch (m_projectPart.languageVersion) { case ProjectPart::C89: opts << (gnuExtensions ? QLatin1String("-std=gnu89") : QLatin1String("-std=c89")); break; @@ -478,7 +479,8 @@ QString CompilerOptionsBuilder::includeOption() const bool CompilerOptionsBuilder::excludeDefineDirective(const ProjectExplorer::Macro ¯o) const { - if (macro.key == "__cplusplus" && m_languageVersion <= ProjectPart::LatestCVersion) + // TODO: Remove in QtCreator 4.7 + if (macro.key == "__cplusplus") return true; // Ignore for all compiler toolchains since LLVM has it's own implementation for -- cgit v1.2.1