summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/compileroptionsbuilder.cpp
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2016-10-17 15:12:05 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2016-10-18 13:02:28 +0000
commit1fd5cd4dbcc892c68fa8e3f415293a500d291f93 (patch)
treeac2ab6c646626928bb25313795081e611d50ce6e /src/plugins/cpptools/compileroptionsbuilder.cpp
parent4fbdbdb1ee382a582035a4e9256ca2b7d4f3b943 (diff)
downloadqt-creator-1fd5cd4dbcc892c68fa8e3f415293a500d291f93.tar.gz
Clang: Use compiler specific undefine option
libclang generated: warning: /U__cpp_aggregate_nsdmi: 'linker' input unused [-Wunused-command-line-argument] warning: /U__cpp_alias_templates: 'linker' input unused [-Wunused-command-line-argument] ... It needs -U. Change-Id: Ibbd2f97e6f806215e3008803f57608b9b6b4c641 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 6f2991fea0..f3b89c27f6 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -342,7 +342,7 @@ void CompilerOptionsBuilder::undefineCppLanguageFeatureMacrosForMsvc2015()
// Undefine the language feature macros that are pre-defined in clang-cl 3.8.0,
// but not in MSVC2015's cl.exe.
foreach (const QString &macroName, languageFeatureMacros())
- m_options.append(QLatin1String("/U") + macroName);
+ m_options.append(undefineOption() + macroName);
}
}
@@ -364,6 +364,11 @@ QString CompilerOptionsBuilder::defineOption() const
return QLatin1String("-D");
}
+QString CompilerOptionsBuilder::undefineOption() const
+{
+ return QLatin1String("-U");
+}
+
static bool isGccOrMinGwToolchain(const Core::Id &toolchainType)
{
return toolchainType == ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID