diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-11-24 10:03:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-11-24 10:03:38 +0100 |
| commit | 4c8db5e9b7a2290b7bb926f215717464703aa59b (patch) | |
| tree | ef2e421e3d51e87b8614e359df2350701def58f1 /src/plugins/cpptools/cppmodelmanager.cpp | |
| parent | 3f12a33bcbcd7f9a2d4b91e371c95e8c13474279 (diff) | |
| parent | b43e22b8f40ad19ead26c6e9c1d2f3ca070afd06 (diff) | |
Merge remote-tracking branch 'origin/4.5'
Change-Id: I32715e2fdbb14e4fccc4c58d3fd6052d7c1127f3
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index c889ac8b9e8..e41c8f81451 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -525,8 +525,6 @@ ProjectExplorer::Macros CppModelManager::internalDefinedMacros() const for (const ProjectPart::Ptr &part : pinfo.projectParts()) { addUnique(part->toolChainMacros, macros, alreadyIn); addUnique(part->projectMacros, macros, alreadyIn); - if (!part->projectConfigFile.isEmpty()) - macros += ProjectExplorer::Macro::toMacros(ProjectPart::readProjectConfigFile(part)); } } return macros; |