feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.13' into master

Browse Source 
Change-Id: Ib60df85a85fc1c94d8cc0dc23ea9fcdb4822bcab
This commit is contained in:
Eike Ziller
2020-08-25 12:42:04 +02:00
parent d65ef60ea2 fff3b41833
commit 00ced26f47
32 changed files with 328 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cpptools/compileroptionsbuilder.cpp
View File

@@ -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);
}