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

CppTools: Ensure that parse contexts are backed up by a toolchain

Browse Source 
Otherwise empty parse contexts (e.g. not having any include paths...)
will be created that are not useful.

Fixes: QTCREATORBUG-22421
Change-Id: I5c9172aee38503d8b48762416e17e7047679bf2e
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-05-09 10:24:57 +02:00
parent c8f0d3f008
commit e3def98c00
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/cpptools/cppprojectinfogenerator.cpp
View File

@@ -89,10 +89,13 @@ QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(const RawProj
rawProjectPart.files, rawProjectPart.files,
rawProjectPart.fileClassifier); rawProjectPart.fileClassifier);
if (cat.hasParts()) { if (!cat.hasParts())
const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart, return result;
m_projectUpdateInfo.project);
const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart,
m_projectUpdateInfo.project);
if (m_projectUpdateInfo.cxxToolChain) {
if (cat.hasCxxSources()) { if (cat.hasCxxSources()) {
result << createProjectPart(rawProjectPart, result << createProjectPart(rawProjectPart,
part, part,
@@ -101,7 +104,6 @@ QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(const RawProj
Language::Cxx, Language::Cxx,
LanguageExtension::None); LanguageExtension::None);
} }
if (cat.hasObjcxxSources()) { if (cat.hasObjcxxSources()) {
result << createProjectPart(rawProjectPart, result << createProjectPart(rawProjectPart,
part, part,
@@ -110,7 +112,9 @@ QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(const RawProj
Language::Cxx, Language::Cxx,
LanguageExtension::ObjectiveC); LanguageExtension::ObjectiveC);
} }
}
if (m_projectUpdateInfo.cToolChain) {
if (cat.hasCSources()) { if (cat.hasCSources()) {
result << createProjectPart(rawProjectPart, result << createProjectPart(rawProjectPart,
part, part,
@@ -129,6 +133,7 @@ QVector<ProjectPart::Ptr> ProjectInfoGenerator::createProjectParts(const RawProj
LanguageExtension::ObjectiveC); LanguageExtension::ObjectiveC);
} }
} }
return result; return result;
} }