diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-08-25 12:42:04 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-25 12:42:04 +0200 |
| commit | 00ced26f4774427d4c10ac616cf9fd217ed42674 (patch) | |
| tree | 900b146c4a9fa026ac5a820b4c711080959ed87a /src/plugins/cpptools/compileroptionsbuilder.cpp | |
| parent | d65ef60ea24a25e636f5a51b51192abbc883da12 (diff) | |
| parent | fff3b4183349f84f9f68dc7712fdd73c6b2111e7 (diff) | |
| download | qt-creator-00ced26f4774427d4c10ac616cf9fd217ed42674.tar.gz | |
Merge remote-tracking branch 'origin/4.13' into master
Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
Diffstat (limited to 'src/plugins/cpptools/compileroptionsbuilder.cpp')
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index c990c27665..5964267206 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -28,8 +28,6 @@ #include "cppmodelmanager.h" #include "headerpathfilter.h" -#include <baremetal/baremetalconstants.h> - #include <coreplugin/icore.h> #include <projectexplorer/headerpath.h> @@ -385,8 +383,11 @@ void CompilerOptionsBuilder::addProjectMacros() { static const int useMacros = qEnvironmentVariableIntValue("QTC_CLANG_USE_TOOLCHAIN_MACROS"); - if (m_projectPart.toolchainType == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID || useMacros) + if (m_projectPart.toolchainType == ProjectExplorer::Constants::CUSTOM_TOOLCHAIN_TYPEID + || m_projectPart.toolchainType.name().contains("BareMetal") + || useMacros) { addMacros(m_projectPart.toolChainMacros); + } addMacros(m_projectPart.projectMacros); } |