summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/compileroptionsbuilder.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2019-01-09 13:56:00 +0100
committerNikolai Kosjar <nikolai.kosjar@qt.io>2019-01-11 07:20:52 +0000
commit7109e8f050a01f9ca9a971d1338a67150a412acf (patch)
tree75e0facd2ad64904acde21fa03db45c6b5e739c7 /src/plugins/cpptools/compileroptionsbuilder.cpp
parent591cc5a8c486ca1d7cc902b14965b69c6f39b4b2 (diff)
downloadqt-creator-7109e8f050a01f9ca9a971d1338a67150a412acf.tar.gz
Clang: Minor cleanups in CompilerOptionsBuilder
Change-Id: Iaf5af70136bceed52d19622c01d9d7147e5abeea Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 1914ce7197..61f8242537 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -110,8 +110,8 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind,
addTargetTriple();
addExtraCodeModelFlags();
- updateLanguageOption(fileKind);
- addOptionsForLanguage(/*checkForBorlandExtensions*/ true);
+ updateFileLanguage(fileKind);
+ addLanguageVersionAndExtensions();
addToolchainAndProjectMacros();
undefineClangVersionMacrosForMsvc();
@@ -316,7 +316,7 @@ void CompilerOptionsBuilder::addMacros(const ProjectExplorer::Macros &macros)
m_options.append(options);
}
-void CompilerOptionsBuilder::updateLanguageOption(ProjectFile::Kind fileKind)
+void CompilerOptionsBuilder::updateFileLanguage(ProjectFile::Kind fileKind)
{
const bool objcExt = m_projectPart.languageExtensions
& ProjectExplorer::LanguageExtension::ObjectiveC;
@@ -332,7 +332,7 @@ void CompilerOptionsBuilder::updateLanguageOption(ProjectFile::Kind fileKind)
m_options[langOptIndex + 1] = options[1];
}
-void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtensions)
+void CompilerOptionsBuilder::addLanguageVersionAndExtensions()
{
using ProjectExplorer::LanguageExtension;
using ProjectExplorer::LanguageVersion;
@@ -381,7 +381,7 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension
if (languageExtensions & LanguageExtension::OpenMP)
options << "-fopenmp";
- if (checkForBorlandExtensions && (languageExtensions & LanguageExtension::Borland))
+ if (languageExtensions & LanguageExtension::Borland)
options << "-fborland-extensions";
m_options.append(options);