From 32094eeb181ada88b1a6a4446a080bc8bd145618 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 16 Jan 2017 10:00:10 +0100 Subject: [PATCH] CppTools: Remove excess call to ProjectPart::updateLanguageFeatures It is already called by BaseProjectPartBuilder::createProjectPart(). Besides ProjectInfo::finish() should not modify the project parts. Change-Id: I4dc8276c94574a01432b7f98b9284e3bdf1b9f0b Reviewed-by: David Schulz --- src/plugins/cpptools/cppmodelmanager_test.cpp | 2 ++ src/plugins/cpptools/projectinfo.cpp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index 4db38959c39..fb65fe93f0d 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -833,6 +833,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() part1->qtVersion = ProjectPart::NoQt; part1->precompiledHeaders.append(pch1File); part1->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part1->updateLanguageFeatures(); ProjectPart::Ptr part2(new ProjectPart); part2->projectFile = QLatin1String("project2.projectfile"); @@ -841,6 +842,7 @@ void CppToolsPlugin::test_modelmanager_precompiled_headers() part2->qtVersion = ProjectPart::NoQt; part2->precompiledHeaders.append(pch2File); part2->headerPaths = { HeaderPath(testDataDirectory.includeDir(false), HeaderPath::IncludePath) }; + part2->updateLanguageFeatures(); ProjectInfo pi = ProjectInfo(project); pi.appendProjectPart(part1); diff --git a/src/plugins/cpptools/projectinfo.cpp b/src/plugins/cpptools/projectinfo.cpp index c3f62e4f336..919cbbbc9f2 100644 --- a/src/plugins/cpptools/projectinfo.cpp +++ b/src/plugins/cpptools/projectinfo.cpp @@ -112,8 +112,6 @@ void ProjectInfo::finish() QSet uniqueHeaderPaths; foreach (const ProjectPart::Ptr &part, m_projectParts) { - part->updateLanguageFeatures(); - // Update header paths foreach (const ProjectPartHeaderPath &headerPath, part->headerPaths) { const int count = uniqueHeaderPaths.count();