diff options
| author | Versus Void <chaoskeeper@mail.ru> | 2016-08-24 16:10:02 +0300 |
|---|---|---|
| committer | Versus Void <chaoskeeper@mail.ru> | 2016-09-06 13:14:37 +0000 |
| commit | 5cd77137bcc41d38b8d1ea955945fc6fb220e87d (patch) | |
| tree | afa05a75c52af38fda6e479f0f4b966611c25744 /src/plugins/cpptools/builtineditordocumentparser.cpp | |
| parent | f491ece833b0818814213da7a5134d346009dcc5 (diff) | |
| download | qt-creator-5cd77137bcc41d38b8d1ea955945fc6fb220e87d.tar.gz | |
CppTools: Fix loading of .config files
.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>
Diffstat (limited to 'src/plugins/cpptools/builtineditordocumentparser.cpp')
| -rw-r--r-- | src/plugins/cpptools/builtineditordocumentparser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/builtineditordocumentparser.cpp b/src/plugins/cpptools/builtineditordocumentparser.cpp index 8ab6a89101..0258a53709 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.cpp +++ b/src/plugins/cpptools/builtineditordocumentparser.cpp @@ -88,6 +88,8 @@ void BuiltinEditorDocumentParser::updateHelper(const QFutureInterface<void> &fut configFile += part->toolchainDefines; configFile += overwrittenToolchainDefines(*part.data()); configFile += part->projectDefines; + if (!part->projectConfigFile.isEmpty()) + configFile += ProjectPart::readProjectConfigFile(part); headerPaths = part->headerPaths; projectConfigFile = part->projectConfigFile; if (baseConfig.usePrecompiledHeaders) @@ -193,8 +195,6 @@ void BuiltinEditorDocumentParser::updateHelper(const QFutureInterface<void> &fut sourceProcessor.setHeaderPaths(state.headerPaths); sourceProcessor.setLanguageFeatures(features); sourceProcessor.run(configurationFileName); - if (!state.projectConfigFile.isEmpty()) - sourceProcessor.run(state.projectConfigFile); if (baseConfig.usePrecompiledHeaders) { foreach (const QString &precompiledHeader, state.precompiledHeaders) sourceProcessor.run(precompiledHeader); |