From 5cd77137bcc41d38b8d1ea955945fc6fb220e87d Mon Sep 17 00:00:00 2001 From: Versus Void Date: Wed, 24 Aug 2016 16:10:02 +0300 Subject: 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 --- src/plugins/cpptools/builtineditordocumentparser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/cpptools/builtineditordocumentparser.cpp') 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 &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 &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); -- cgit v1.2.1