feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: Fix loading of .config files

Browse Source 
.config file wasn't considered during creation of injected configuration
file thus disabling code processing inside #ifdef blocks.

Task-number: QTCREATORBUG-16236
Change-Id: I50f21622ec1b246aaa80e4832fd826f1b61d8e96
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Versus Void
2016-08-24 16:10:02 +03:00
parent f491ece833
commit 5cd77137bc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cpptools/builtineditordocumentparser.cpp
View File

@@ -88,6 +88,8 @@ void BuiltinEditorDocumentParser::updateHelper(const QFutureInterface<void> &fut
configFile += part->toolchainDefines; configFile += part->toolchainDefines;
configFile += overwrittenToolchainDefines(*part.data()); configFile += overwrittenToolchainDefines(*part.data());
configFile += part->projectDefines; configFile += part->projectDefines;
if (!part->projectConfigFile.isEmpty())
configFile += ProjectPart::readProjectConfigFile(part);
headerPaths = part->headerPaths; headerPaths = part->headerPaths;
projectConfigFile = part->projectConfigFile; projectConfigFile = part->projectConfigFile;
if (baseConfig.usePrecompiledHeaders) if (baseConfig.usePrecompiledHeaders)
@@ -193,8 +195,6 @@ void BuiltinEditorDocumentParser::updateHelper(const QFutureInterface<void> &fut
sourceProcessor.setHeaderPaths(state.headerPaths); sourceProcessor.setHeaderPaths(state.headerPaths);
sourceProcessor.setLanguageFeatures(features); sourceProcessor.setLanguageFeatures(features);
sourceProcessor.run(configurationFileName); sourceProcessor.run(configurationFileName);
if (!state.projectConfigFile.isEmpty())
sourceProcessor.run(state.projectConfigFile);
if (baseConfig.usePrecompiledHeaders) { if (baseConfig.usePrecompiledHeaders) {
foreach (const QString &precompiledHeader, state.precompiledHeaders) foreach (const QString &precompiledHeader, state.precompiledHeaders)
sourceProcessor.run(precompiledHeader); sourceProcessor.run(precompiledHeader);