diff options
Diffstat (limited to 'src/plugins/cpptools/projectinfo.cpp')
-rw-r--r-- | src/plugins/cpptools/projectinfo.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/cpptools/projectinfo.cpp b/src/plugins/cpptools/projectinfo.cpp index 1ca95e3e9c..e0dbee363f 100644 --- a/src/plugins/cpptools/projectinfo.cpp +++ b/src/plugins/cpptools/projectinfo.cpp @@ -160,13 +160,10 @@ void ProjectInfo::finish() m_sourceFiles.insert(file.path); // Update defines - m_defines.append(part->toolchainDefines); - m_defines.append(part->projectDefines); - if (!part->projectConfigFile.isEmpty()) { - m_defines.append('\n'); - m_defines += ProjectPart::readProjectConfigFile(part); - m_defines.append('\n'); - } + m_defines.append(part->toolChainMacros); + m_defines.append(part->projectMacros); + if (!part->projectConfigFile.isEmpty()) + m_defines += ProjectExplorer::Macro::toMacros(ProjectPart::readProjectConfigFile(part)); } } |