Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 3 insertions, 8 deletions

diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.cpp b/src/plugins/cpptools/cppmodelmanagerinterface.cpp
index 31f1b55e18..3992c44bf5 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.cpp
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.cpp
@@ -161,13 +161,7 @@ void ProjectPart::evaluateToolchain(const ToolChain *tc,
         else
             includePaths << header.path();
 
-    const QByteArray macros = tc->predefinedMacros(cxxflags);
-    if (!macros.isEmpty()) {
-        if (!defines.isEmpty())
-            defines += '\n';
-        defines += macros;
-        defines += '\n';
-    }
+    toolchainDefines = tc->predefinedMacros(cxxflags);
 }
 
 static CppModelManagerInterface *g_instance = 0;
@@ -235,5 +229,6 @@ void CppModelManagerInterface::ProjectInfo::appendProjectPart(const ProjectPart:
     // Update defines
     if (!m_defines.isEmpty())
         m_defines.append('\n');
-    m_defines.append(part->defines);
+    m_defines.append(part->toolchainDefines);
+    m_defines.append(part->projectDefines);
 }