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/genericprojectmanager/genericproject.cpp | |
| 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/genericprojectmanager/genericproject.cpp')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index fc9f05e23e..d12f2f2497 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -265,7 +265,7 @@ void GenericProject::refresh(RefreshOptions options) } part->cxxVersion = CppTools::ProjectPart::CXX11; // assume C++11 - part->defines += m_defines; + part->projectDefines += m_defines; // ### add _defines. |