diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-11-23 17:21:35 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-11-24 08:40:56 +0000 |
| commit | ec86bf8ca61c3afff9922a0f7c4751bd68e31357 (patch) | |
| tree | 77b5e81acf8938da0373dff41b2ce97efa5ae772 /src/plugins/cpptools/cppprojectinfogenerator.cpp | |
| parent | 283069f4af28634cfc873b5ba5e741297a9a5ae1 (diff) | |
| download | qt-creator-ec86bf8ca61c3afff9922a0f7c4751bd68e31357.tar.gz | |
CppTools: Fix initial macro parsing for generic project
The extra macros in the config files are being read in
CppModelManager::internalDefinedMacros(), but they also affect the language
features in ProjectPart::updateLanguageFeatures().
Task-number: QTCREATORBUG-1478
Change-Id: Ic197b0b7d4cc6e6a74637da0c710b0630daae25c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppprojectinfogenerator.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppprojectinfogenerator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppprojectinfogenerator.cpp b/src/plugins/cpptools/cppprojectinfogenerator.cpp index 2be82ea6b4..4a76052c66 100644 --- a/src/plugins/cpptools/cppprojectinfogenerator.cpp +++ b/src/plugins/cpptools/cppprojectinfogenerator.cpp @@ -190,6 +190,8 @@ static ProjectPart::Ptr projectPartFromRawProjectPart(const RawProjectPart &rawP part->buildTargetType = rawProjectPart.buildTargetType; part->qtVersion = rawProjectPart.qtVersion; part->projectMacros = rawProjectPart.projectMacros; + if (!part->projectConfigFile.isEmpty()) + part->projectMacros += ProjectExplorer::Macro::toMacros(ProjectPart::readProjectConfigFile(part)); part->headerPaths = rawProjectPart.headerPaths; part->precompiledHeaders = rawProjectPart.precompiledHeaders; part->selectedForBuilding = rawProjectPart.selectedForBuilding; |