diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-12-07 08:53:11 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-12-07 08:53:11 +0100 |
| commit | e5c2ee922a6cdac5252885a6f7938e1597fe042e (patch) | |
| tree | aaf53359d0183fbfa76ca9f570aa765e7a2b8154 /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | 9d708f776fc0368b1150b4986318fb316a04336b (diff) | |
| parent | 3e9d7d290c278b8043b7eb6d346c69c27173a506 (diff) | |
| download | qt-creator-e5c2ee922a6cdac5252885a6f7938e1597fe042e.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: I743ea39480cc5c7b6febcd2e93713d15a3ae6d9c
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 349affe69f..8f561772eb 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -504,7 +504,8 @@ static QByteArray msCompatibilityVersionFromDefines(const ProjectExplorer::Macro void CompilerOptionsBuilder::addMsvcCompatibilityVersion() { - if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) { + if (m_projectPart.toolchainType == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID + || m_projectPart.toolchainType == ProjectExplorer::Constants::CLANG_CL_TOOLCHAIN_TYPEID) { const ProjectExplorer::Macros macros = m_projectPart.toolChainMacros + m_projectPart.projectMacros; const QByteArray msvcVersion = msCompatibilityVersionFromDefines(macros); |