diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-11-27 15:17:51 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-12-10 11:42:41 +0100 |
| commit | ea1a92484ac99057b06130a012164bf9788650e9 (patch) | |
| tree | 555ed9654ad86286241affc0421492c0b9c02e5e /src/plugins/cpptools/cppmodelmanagerinterface.h | |
| parent | 18313bdb3306e1f26965bd6f488eb48b57511674 (diff) | |
| download | qt-creator-ea1a92484ac99057b06130a012164bf9788650e9.tar.gz | |
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>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.h')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.h | 3 |
1 files changed, 2 insertions, 1 deletions
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; |