From ea1a92484ac99057b06130a012164bf9788650e9 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@digia.com>
Date: Wed, 27 Nov 2013 15:17:51 +0100
Subject: C++: split defines into project-defined and toolchain-defined.

So we can ignore possibly problematic toolchain-defines, while can still
unconditionally apply project-defines.

Change-Id: I7cb96f35a963d080011fe888ef71bfc098dd33ef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
 src/plugins/cpptools/cppmodelmanagerinterface.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins/cpptools/cppmodelmanagerinterface.h')

diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h
index 49a9eea066..ce29718b02 100644
--- a/src/plugins/cpptools/cppmodelmanagerinterface.h
+++ b/src/plugins/cpptools/cppmodelmanagerinterface.h
@@ -106,7 +106,8 @@ public:
     QString projectFile;
     ProjectExplorer::Project *project;
     QList<ProjectFile> files;
-    QByteArray defines;
+    QByteArray projectDefines;
+    QByteArray toolchainDefines;
     QStringList includePaths;
     QStringList frameworkPaths;
     QStringList precompiledHeaders;
-- 
cgit v1.2.1